Skip to content

Commit

Permalink
Merge pull request #37 from mekjaer/add-empty-row
Browse files Browse the repository at this point in the history
addRow renamed to addEmptyRow
  • Loading branch information
mekjaer committed Feb 27, 2014
2 parents 9e602b9 + 1d04690 commit 7fb70cc
Show file tree
Hide file tree
Showing 35 changed files with 822 additions and 179 deletions.
16 changes: 12 additions & 4 deletions TightDbObjcDyn/TightDbObjcDyn.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@

/* Begin PBXBuildFile section */
4D79966018BDFC3E009EB0C0 /* table_macros.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D79965F18BDFC3E009EB0C0 /* table_macros.h */; };
4DB1DEFB18BF70AE005A7234 /* dynamic_table.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB1DEF818BF70AE005A7234 /* dynamic_table.m */; };
4DB1DEFC18BF70AE005A7234 /* functional.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB1DEF918BF70AE005A7234 /* functional.m */; };
4DB1DEFD18BF70AE005A7234 /* typed_table.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB1DEFA18BF70AE005A7234 /* typed_table.m */; };
E918909D177B677900653D7A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E918909C177B677900653D7A /* Cocoa.framework */; };
E91890AF177B677900653D7A /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E91890AE177B677900653D7A /* SenTestingKit.framework */; };
E91890B0177B677900653D7A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E918909C177B677900653D7A /* Cocoa.framework */; };
Expand Down Expand Up @@ -41,7 +44,6 @@
E91890FD177B71E400653D7A /* shared_group.m in Sources */ = {isa = PBXBuildFile; fileRef = E91890EF177B71E400653D7A /* shared_group.m */; };
E91890FE177B71E400653D7A /* subtable.m in Sources */ = {isa = PBXBuildFile; fileRef = E91890F0177B71E400653D7A /* subtable.m */; };
E91890FF177B71E400653D7A /* table_delete_all.m in Sources */ = {isa = PBXBuildFile; fileRef = E91890F1177B71E400653D7A /* table_delete_all.m */; };
E9189100177B71E400653D7A /* table.m in Sources */ = {isa = PBXBuildFile; fileRef = E91890F2177B71E400653D7A /* table.m */; };
E9189101177B71E400653D7A /* template.m in Sources */ = {isa = PBXBuildFile; fileRef = E91890F3177B71E400653D7A /* template.m */; };
E9189102177B71E400653D7A /* tutorial.m in Sources */ = {isa = PBXBuildFile; fileRef = E91890F4177B71E400653D7A /* tutorial.m */; };
/* End PBXBuildFile section */
Expand All @@ -58,6 +60,9 @@

/* Begin PBXFileReference section */
4D79965F18BDFC3E009EB0C0 /* table_macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = table_macros.h; path = ../../src/tightdb/objc/table_macros.h; sourceTree = "<group>"; };
4DB1DEF818BF70AE005A7234 /* dynamic_table.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = dynamic_table.m; path = ../../src/tightdb/objc/test/dynamic_table.m; sourceTree = "<group>"; };
4DB1DEF918BF70AE005A7234 /* functional.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = functional.m; path = ../../src/tightdb/objc/test/functional.m; sourceTree = "<group>"; };
4DB1DEFA18BF70AE005A7234 /* typed_table.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = typed_table.m; path = ../../src/tightdb/objc/test/typed_table.m; sourceTree = "<group>"; };
E9189099177B677900653D7A /* TightDbObjcDyn.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = TightDbObjcDyn.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
E918909C177B677900653D7A /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
E918909F177B677900653D7A /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -96,7 +101,6 @@
E91890EF177B71E400653D7A /* shared_group.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = shared_group.m; path = ../../src/tightdb/objc/test/shared_group.m; sourceTree = "<group>"; };
E91890F0177B71E400653D7A /* subtable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = subtable.m; path = ../../src/tightdb/objc/test/subtable.m; sourceTree = "<group>"; };
E91890F1177B71E400653D7A /* table_delete_all.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = table_delete_all.m; path = ../../src/tightdb/objc/test/table_delete_all.m; sourceTree = "<group>"; };
E91890F2177B71E400653D7A /* table.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = table.m; path = ../../src/tightdb/objc/test/table.m; sourceTree = "<group>"; };
E91890F3177B71E400653D7A /* template.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = template.m; path = ../../src/tightdb/objc/test/template.m; sourceTree = "<group>"; };
E91890F4177B71E400653D7A /* tutorial.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = tutorial.m; path = ../../src/tightdb/objc/test/tutorial.m; sourceTree = "<group>"; };
/* End PBXFileReference section */
Expand Down Expand Up @@ -199,6 +203,9 @@
E91890B4177B677900653D7A /* TightDbObjcDynTests */ = {
isa = PBXGroup;
children = (
4DB1DEF818BF70AE005A7234 /* dynamic_table.m */,
4DB1DEF918BF70AE005A7234 /* functional.m */,
4DB1DEFA18BF70AE005A7234 /* typed_table.m */,
E91890E7177B71E400653D7A /* data_type.mm */,
E91890E8177B71E400653D7A /* enumerator.m */,
E91890E9177B71E400653D7A /* err_handling.mm */,
Expand All @@ -210,7 +217,6 @@
E91890EF177B71E400653D7A /* shared_group.m */,
E91890F0177B71E400653D7A /* subtable.m */,
E91890F1177B71E400653D7A /* table_delete_all.m */,
E91890F2177B71E400653D7A /* table.m */,
E91890F3177B71E400653D7A /* template.m */,
E91890F4177B71E400653D7A /* tutorial.m */,
E91890B5177B677900653D7A /* Supporting Files */,
Expand Down Expand Up @@ -370,8 +376,10 @@
E91890FC177B71E400653D7A /* query.m in Sources */,
E91890FD177B71E400653D7A /* shared_group.m in Sources */,
E91890FE177B71E400653D7A /* subtable.m in Sources */,
4DB1DEFC18BF70AE005A7234 /* functional.m in Sources */,
4DB1DEFD18BF70AE005A7234 /* typed_table.m in Sources */,
E91890FF177B71E400653D7A /* table_delete_all.m in Sources */,
E9189100177B71E400653D7A /* table.m in Sources */,
4DB1DEFB18BF70AE005A7234 /* dynamic_table.m in Sources */,
E9189101177B71E400653D7A /* template.m in Sources */,
E9189102177B71E400653D7A /* tutorial.m in Sources */,
);
Expand Down
4 changes: 4 additions & 0 deletions changes.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2014-02-27
==========
! BREAKING CHANGE: addRow renamed to addEmptyRow

2013-11-08
==========
* Adding support for one-line installer (suppressing output and don't die too hard).
4 changes: 2 additions & 2 deletions doc/ref/data/dyn_table_ref.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,10 @@ CATEGORIES :
DESCR : The cursor.

- g_dyn_table_add_empty_row:
NAME : addRow
NAME : addEmptyRow
SUMMARY : *objc_typed_table_add_empty_row_summary
DESCR : *objc_typed_table_add_empty_row_descr
SIGNATURE: -(TightdbCursor *)addRow
SIGNATURE: -(TightdbCursor *)addEmptyRow
RETURN:
TYPES : TightdbCursor *
DESCR : Returns a dynamic cursor at the added row.
Expand Down
6 changes: 3 additions & 3 deletions doc/ref/data/typed_table_ref.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#UNIMPLEMENTED columns(), front(), back(), insert_empty_row(), lookup(), findAll()
# via table Propery, get_sorted_view(), where(), distinct()
#INCONSISTENCY add.., addRow, vs. add_empty_row, and number of rows cannot be specified
#INCONSISTENCY add.., number of rows cannot be specified
#INCONSISTENCY popBack(), find_first_* ->> find* ("first" is omitted)

ID : class_typed_table
Expand Down Expand Up @@ -192,13 +192,13 @@ CATEGORIES:
DESCR :

- g_typed_table_add_empty_row:
NAME : addRow
NAME : addEmptyRow
SUMMARY : &objc_typed_table_add_empty_row_summary
Adds an empty row and returns a cursor. You can use the cursor to get or set the values.
DESCR : &objc_typed_table_add_empty_row_descr
This method adds one empty row at the end of the table.
Default values (e.g. 0 or "") will be inserted for all the columns in the row.
SIGNATURE: -(TableName_Cursor *)addRow;
SIGNATURE: -(TableName_Cursor *)addEmptyRow;
RETURN:
TYPES : TableName_Cursor *
DESCR : Returns a typed cursor at the added row. Note that <code>TableName</code> is replaced with the name of your typed table.
Expand Down
8 changes: 4 additions & 4 deletions doc/ref/examples/ex_objc_query_dynamic_intro.m
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,31 @@ int main()

/* Row 0 */

cursor = [table addRow];
cursor = [table addEmptyRow];

[cursor setInt:23 inColumn:AGE];
[cursor setString:@"Joe" inColumn:NAME];
[cursor setBool:YES inColumn:HIRED];

/* Row 1 */

cursor = [table addRow];
cursor = [table addEmptyRow];

[cursor setInt:32 inColumn:AGE];
[cursor setString:@"Simon" inColumn:NAME];
[cursor setBool:YES inColumn:HIRED];

/* Row 2 */

cursor = [table addRow];
cursor = [table addEmptyRow];

[cursor setInt:12 inColumn:AGE];
[cursor setString:@"Steve" inColumn:NAME];
[cursor setBool:NO inColumn:HIRED];

/* Row 3 */

cursor = [table addRow];
cursor = [table addEmptyRow];

[cursor setInt:59 inColumn:AGE];
[cursor setString:@"Nick" inColumn:NAME];
Expand Down
8 changes: 4 additions & 4 deletions doc/ref/examples/ex_objc_table_dynamic_intro.m
Original file line number Diff line number Diff line change
Expand Up @@ -22,28 +22,28 @@ int main()

/* Row 0 */

cursor = [table addRow];
cursor = [table addEmptyRow];

[cursor setInt:23 inColumn:AGE];
[cursor setString:@"Joe" inColumn:NAME];

/* Row 1 */

cursor = [table addRow];
cursor = [table addEmptyRow];

[cursor setInt:32 inColumn:AGE];
[cursor setString:@"Simon" inColumn:NAME];

/* Row 2 */

cursor = [table addRow];
cursor = [table addEmptyRow];

[cursor setInt:12 inColumn:AGE];
[cursor setString:@"Steve" inColumn:NAME];

/* Row 3 */

cursor = [table addRow];
cursor = [table addEmptyRow];

[cursor setInt:100 inColumn:AGE];
[cursor setString:@"Nick" inColumn:NAME];
Expand Down
6 changes: 3 additions & 3 deletions doc/ref/examples/ex_objc_table_typed_intro.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ int main()

PeopleTable *table = [[PeopleTable alloc] init];

PeopleTable_Cursor *cursor = [table addRow];
PeopleTable_Cursor *cursor = [table addEmptyRow];
cursor.Name = @"Brian";
cursor.Age = 10;

cursor = [table addRow];
cursor = [table addEmptyRow];
cursor.Name = @"Sofie";
cursor.Age = 40;

Expand All @@ -32,7 +32,7 @@ int main()
Name:@"Jesper"
Age:200];
*/
cursor = [table addRow];
cursor = [table addEmptyRow];
cursor.Name = @"Jesper";
cursor.Age = 200;

Expand Down
8 changes: 4 additions & 4 deletions doc/ref/examples/ex_objc_tableview_dynamic_intro.m
Original file line number Diff line number Diff line change
Expand Up @@ -26,31 +26,31 @@ int main()

/* Row 0 */

cursor = [table addRow];
cursor = [table addEmptyRow];

[cursor setInt:23 inColumn:AGE];
[cursor setString:@"Joe" inColumn:NAME];
[cursor setBool:YES inColumn:HIRED];

/* Row 1 */

cursor = [table addRow];
cursor = [table addEmptyRow];

[cursor setInt:32 inColumn:AGE];
[cursor setString:@"Simon" inColumn:NAME];
[cursor setBool:YES inColumn:HIRED];

/* Row 2 */

cursor = [table addRow];
cursor = [table addEmptyRow];

[cursor setInt:12 inColumn:AGE];
[cursor setString:@"Steve" inColumn:NAME];
[cursor setBool:NO inColumn:HIRED];

/* Row 3 */

cursor = [table addRow];
cursor = [table addEmptyRow];

[cursor setInt:59 inColumn:AGE];
[cursor setString:@"Nick" inColumn:NAME];
Expand Down
6 changes: 3 additions & 3 deletions doc/ref/examples/ex_objc_tableview_typed_intro.m
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ int main()

/* Adds rows to the table. */

PeopleTable_Cursor *cursor = [table addRow];
PeopleTable_Cursor *cursor = [table addEmptyRow];
cursor.Name = @"Brian";
cursor.Age = 10;

cursor = [table addRow];
cursor = [table addEmptyRow];
cursor.Name = @"Sofie";
cursor.Age = 40;

cursor = [table addRow];
cursor = [table addEmptyRow];
cursor.Name = @"Sam";
cursor.Age = 76;

Expand Down
Loading

0 comments on commit 7fb70cc

Please sign in to comment.