Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TIMOB-12012] Revert fixes from PR 2839 #3575

Merged
merged 1 commit into from
Dec 11, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion apidoc/Titanium/Database/ResultSet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ properties:
summary: The number of columns in this result set.
type: Number
permission: read-only
platforms: [android, iphone, ipad]
platforms: [android]

- name: rowCount
summary: The number of rows in this result set.
Expand Down
2 changes: 1 addition & 1 deletion iphone/Classes/TiDatabaseResultSetProxy.m
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ -(id)fieldName:(id)args
return nil;
}

-(NSNumber*)fieldCount
-(NSNumber*)fieldCount:(id)unused
{
if (results!=nil)
{
Expand Down