Skip to content

Commit

Permalink
Merge pull request #144 from bmunkholm/fix-failing-testcase
Browse files Browse the repository at this point in the history
Fix failing testcase + ref-doc update
  • Loading branch information
bmunkholm committed Sep 11, 2013
2 parents f16a394 + 73d5185 commit a729182
Show file tree
Hide file tree
Showing 13 changed files with 136 additions and 50 deletions.
11 changes: 9 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
*.tightdb
*.tightdb.lock
*.ncb
*.suo
*.vcproj.*.user
*.swp
*~
cscope.*
Expand All @@ -10,13 +11,16 @@ tags
/gcovr.xml
/tmp

# Ignore all user files except one which includes execution path for test
*.user
!tighdb.vcxproj.user

#ignore thumbnails created by windows
Thumbs.db
#Ignore files build by Visual Studio
*.obj
*.exe
*.pdb
*.user
*.aps
*.pch
*.vspscc
Expand Down Expand Up @@ -44,6 +48,9 @@ Static library*/
/tightdb.xcodeproj/project.xcworkspace
/tightdb.xcodeproj/xcuserdata

# ref doc
/doc/ref_cpp/html/*

# sh build.sh config
/config

Expand Down
4 changes: 3 additions & 1 deletion TightDB.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="test\test_utilities.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\tightdb.hpp" />
Expand Down Expand Up @@ -695,8 +696,9 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Static library, debug|x64'">true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="test\test_utilities.hpp" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>
9 changes: 9 additions & 0 deletions TightDB.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@
<ClCompile Include="test\test_thread.cpp">
<Filter>test</Filter>
</ClCompile>
<ClCompile Include="test\test_utilities.cpp">
<Filter>test\util</Filter>
</ClCompile>
<ClCompile Include="test\test_column.cpp">
<Filter>test</Filter>
</ClCompile>
Expand Down Expand Up @@ -372,6 +375,9 @@
<ClInclude Include="test\pthread_test.hpp">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="test\test_utilities.hpp">
<Filter>test\util</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="pthreads">
Expand All @@ -389,5 +395,8 @@
<Filter Include="src\include">
<UniqueIdentifier>{4436af4e-59db-4e36-9b8c-acb6e5d85aea}</UniqueIdentifier>
</Filter>
<Filter Include="test\util">
<UniqueIdentifier>{0a19bdba-d588-4ba1-935d-8de54bde0675}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>
28 changes: 22 additions & 6 deletions doc/ref_cpp/data/group_ref.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,23 @@ CATEGORIES :
CODE : ex_cpp_group_open_memory

- g_group_commit:
TODO : very soon
NAME : commit
SUMMARY : &g_group_commit_summary
Write changes to attached file.
DESCR : &g_group_commit_descr
>
Write any changes made in the group or its tables to the
attached file.

Note: This method can only be used on groups which is
attached to a writable file.

Table accessors will remain valid across the commit
(which is not the case for SharedGroup commits).

EXAMPLES:
- DESCR :
CODE : ex_cpp_group_commit

- g_group_size:
NAME : size
Expand Down Expand Up @@ -323,15 +339,15 @@ CATEGORIES :
NAME : has_table
SUMMARY : &g_group_has_table_summary
Does group have table?
DESCR :
DESCR:
- TEXT : &g_group_has_table_descr
The method checks whether this group contains the specified table.
The method checks if this group contains the specified table.
- TEXT : >
When no table class is specified, this function
returns <code>true</code> if the group contains a
table with the specified name. When a table class
(<code>MyTable</code>) is specified as a template
parameter, it returns true if the group contains a
table with the specified name.
When a table class (<code>MyTable</code>) is specified as a
template parameter, it returns true if the group contains a
table with the specified name, and the type of that
table is compatible with the specified type.
See {@link concepts_table_type_compatibility} for details.
Expand Down
2 changes: 1 addition & 1 deletion test/expect_json-win.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"int":0,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string0","string_long":"string0 very long string.........","string_enum":"enum1","binary":"62696e61727900","mixed":false,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-123,"sub_second":"sub"}]},{"int":-1,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string1","string_long":"string1 very long string.........","string_enum":"enum2","binary":"62696e61727900","mixed":-1,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-1357,"sub_second":"sub"}]},{"int":2,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string2","string_long":"string2 very long string.........","string_enum":"enum3","binary":"62696e61727900","mixed":"string","tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":2345,"sub_second":"sub"}]},{"int":-3,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string3","string_long":"string3 very long string.........","string_enum":"enum1","binary":"62696e61727900","mixed":"1973-11-29 21:33:09","tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-3825,"sub_second":"sub"}]},{"int":4,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string4","string_long":"string4 very long string.........","string_enum":"enum2","binary":"62696e61727900","mixed":"62696e61727900","tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":4813,"sub_second":"sub"}]},{"int":-5,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string5","string_long":"string5 very long string.........","string_enum":"enum3","binary":"62696e61727900","mixed":[{"first":0,"second":"mixed sub"},{"first":-25,"second":"mixed sub"}],"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-6293,"sub_second":"sub"}]},{"int":6,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string6","string_long":"string6 very long string.........","string_enum":"enum1","binary":"62696e61727900","mixed":7.3859998e+002,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":7281,"sub_second":"sub"}]},{"int":-7,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string7","string_long":"string7 very long string.........","string_enum":"enum2","binary":"62696e61727900","mixed":-6.9135500000000002e+003,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-8761,"sub_second":"sub"}]},{"int":8,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string8","string_long":"string8 very long string.........","string_enum":"enum3","binary":"62696e61727900","mixed":false,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":9749,"sub_second":"sub"}]},{"int":-9,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string9","string_long":"string9 very long string.........","string_enum":"enum1","binary":"62696e61727900","mixed":-81,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-11229,"sub_second":"sub"}]},{"int":10,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string10","string_long":"string10 very long string.........","string_enum":"enum2","binary":"62696e61727900","mixed":"string","tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":12217,"sub_second":"sub"}]},{"int":-11,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string11","string_long":"string11 very long string.........","string_enum":"enum3","binary":"62696e61727900","mixed":"1973-11-29 21:33:09","tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-13697,"sub_second":"sub"}]},{"int":12,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string12","string_long":"string12 very long string.........","string_enum":"enum1","binary":"62696e61727900","mixed":"62696e61727900","tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":14685,"sub_second":"sub"}]},{"int":-13,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string13","string_long":"string13 very long string.........","string_enum":"enum2","binary":"62696e61727900","mixed":[{"first":0,"second":"mixed sub"},{"first":-169,"second":"mixed sub"}],"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-16165,"sub_second":"sub"}]},{"int":14,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string14","string_long":"string14 very long string.........","string_enum":"enum3","binary":"62696e61727900","mixed":1.7234000e+003,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":17153,"sub_second":"sub"}]}]
[{"int":0,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string0","string_long":"string0 very long string.........","string_enum":"enum1","binary":"62696e61727900","mixed":false,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-123,"sub_second":"sub"}]},{"int":-1,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string1","string_long":"string1 very long string.........","string_enum":"enum2","binary":"62696e61727900","mixed":-1,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-1357,"sub_second":"sub"},{"sub_first":-2591,"sub_second":"sub"}]},{"int":2,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string2","string_long":"string2 very long string.........","string_enum":"enum3","binary":"62696e61727900","mixed":"string","tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":2345,"sub_second":"sub"},{"sub_first":4813,"sub_second":"sub"},{"sub_first":7281,"sub_second":"sub"}]},{"int":-3,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string3","string_long":"string3 very long string.........","string_enum":"enum1","binary":"62696e61727900","mixed":"1973-11-29 21:33:09","tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-3825,"sub_second":"sub"},{"sub_first":-7527,"sub_second":"sub"},{"sub_first":-11229,"sub_second":"sub"},{"sub_first":-14931,"sub_second":"sub"}]},{"int":4,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string4","string_long":"string4 very long string.........","string_enum":"enum2","binary":"62696e61727900","mixed":"62696e61727900","tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":4813,"sub_second":"sub"},{"sub_first":9749,"sub_second":"sub"},{"sub_first":14685,"sub_second":"sub"},{"sub_first":19621,"sub_second":"sub"},{"sub_first":24557,"sub_second":"sub"}]},{"int":-5,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string5","string_long":"string5 very long string.........","string_enum":"enum3","binary":"62696e61727900","mixed":[{"first":0,"second":"mixed sub"},{"first":-25,"second":"mixed sub"}],"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-6293,"sub_second":"sub"},{"sub_first":-12463,"sub_second":"sub"},{"sub_first":-18633,"sub_second":"sub"},{"sub_first":-24803,"sub_second":"sub"},{"sub_first":-30973,"sub_second":"sub"},{"sub_first":-37143,"sub_second":"sub"}]},{"int":6,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string6","string_long":"string6 very long string.........","string_enum":"enum1","binary":"62696e61727900","mixed":7.3859998e+002,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":7281,"sub_second":"sub"},{"sub_first":14685,"sub_second":"sub"},{"sub_first":22089,"sub_second":"sub"},{"sub_first":29493,"sub_second":"sub"},{"sub_first":36897,"sub_second":"sub"},{"sub_first":44301,"sub_second":"sub"},{"sub_first":51705,"sub_second":"sub"}]},{"int":-7,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string7","string_long":"string7 very long string.........","string_enum":"enum2","binary":"62696e61727900","mixed":-6.9135500000000002e+003,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-8761,"sub_second":"sub"},{"sub_first":-17399,"sub_second":"sub"},{"sub_first":-26037,"sub_second":"sub"},{"sub_first":-34675,"sub_second":"sub"},{"sub_first":-43313,"sub_second":"sub"},{"sub_first":-51951,"sub_second":"sub"},{"sub_first":-60589,"sub_second":"sub"},{"sub_first":-69227,"sub_second":"sub"}]},{"int":8,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string8","string_long":"string8 very long string.........","string_enum":"enum3","binary":"62696e61727900","mixed":false,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":9749,"sub_second":"sub"},{"sub_first":19621,"sub_second":"sub"},{"sub_first":29493,"sub_second":"sub"},{"sub_first":39365,"sub_second":"sub"},{"sub_first":49237,"sub_second":"sub"},{"sub_first":59109,"sub_second":"sub"},{"sub_first":68981,"sub_second":"sub"},{"sub_first":78853,"sub_second":"sub"},{"sub_first":88725,"sub_second":"sub"}]},{"int":-9,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string9","string_long":"string9 very long string.........","string_enum":"enum1","binary":"62696e61727900","mixed":-81,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-11229,"sub_second":"sub"},{"sub_first":-22335,"sub_second":"sub"},{"sub_first":-33441,"sub_second":"sub"},{"sub_first":-44547,"sub_second":"sub"},{"sub_first":-55653,"sub_second":"sub"},{"sub_first":-66759,"sub_second":"sub"},{"sub_first":-77865,"sub_second":"sub"},{"sub_first":-88971,"sub_second":"sub"},{"sub_first":-100077,"sub_second":"sub"},{"sub_first":-111183,"sub_second":"sub"}]},{"int":10,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string10","string_long":"string10 very long string.........","string_enum":"enum2","binary":"62696e61727900","mixed":"string","tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":12217,"sub_second":"sub"},{"sub_first":24557,"sub_second":"sub"},{"sub_first":36897,"sub_second":"sub"},{"sub_first":49237,"sub_second":"sub"},{"sub_first":61577,"sub_second":"sub"},{"sub_first":73917,"sub_second":"sub"},{"sub_first":86257,"sub_second":"sub"},{"sub_first":98597,"sub_second":"sub"},{"sub_first":110937,"sub_second":"sub"},{"sub_first":123277,"sub_second":"sub"},{"sub_first":135617,"sub_second":"sub"}]},{"int":-11,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string11","string_long":"string11 very long string.........","string_enum":"enum3","binary":"62696e61727900","mixed":"1973-11-29 21:33:09","tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-13697,"sub_second":"sub"},{"sub_first":-27271,"sub_second":"sub"},{"sub_first":-40845,"sub_second":"sub"},{"sub_first":-54419,"sub_second":"sub"},{"sub_first":-67993,"sub_second":"sub"},{"sub_first":-81567,"sub_second":"sub"},{"sub_first":-95141,"sub_second":"sub"},{"sub_first":-108715,"sub_second":"sub"},{"sub_first":-122289,"sub_second":"sub"},{"sub_first":-135863,"sub_second":"sub"},{"sub_first":-149437,"sub_second":"sub"},{"sub_first":-163011,"sub_second":"sub"}]},{"int":12,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string12","string_long":"string12 very long string.........","string_enum":"enum1","binary":"62696e61727900","mixed":"62696e61727900","tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":14685,"sub_second":"sub"},{"sub_first":29493,"sub_second":"sub"},{"sub_first":44301,"sub_second":"sub"},{"sub_first":59109,"sub_second":"sub"},{"sub_first":73917,"sub_second":"sub"},{"sub_first":88725,"sub_second":"sub"},{"sub_first":103533,"sub_second":"sub"},{"sub_first":118341,"sub_second":"sub"},{"sub_first":133149,"sub_second":"sub"},{"sub_first":147957,"sub_second":"sub"},{"sub_first":162765,"sub_second":"sub"},{"sub_first":177573,"sub_second":"sub"},{"sub_first":192381,"sub_second":"sub"}]},{"int":-13,"bool":true,"date":"1970-01-01 03:25:45","float":-1.2345600e+002,"double":-9.8765432099999998e+003,"string":"string13","string_long":"string13 very long string.........","string_enum":"enum2","binary":"62696e61727900","mixed":[{"first":0,"second":"mixed sub"},{"first":-169,"second":"mixed sub"}],"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":-16165,"sub_second":"sub"},{"sub_first":-32207,"sub_second":"sub"},{"sub_first":-48249,"sub_second":"sub"},{"sub_first":-64291,"sub_second":"sub"},{"sub_first":-80333,"sub_second":"sub"},{"sub_first":-96375,"sub_second":"sub"},{"sub_first":-112417,"sub_second":"sub"},{"sub_first":-128459,"sub_second":"sub"},{"sub_first":-144501,"sub_second":"sub"},{"sub_first":-160543,"sub_second":"sub"},{"sub_first":-176585,"sub_second":"sub"},{"sub_first":-192627,"sub_second":"sub"},{"sub_first":-208669,"sub_second":"sub"},{"sub_first":-224711,"sub_second":"sub"}]},{"int":14,"bool":false,"date":"1970-01-01 03:25:45","float":1.2345600e+002,"double":9.8765432099999998e+003,"string":"string14","string_long":"string14 very long string.........","string_enum":"enum3","binary":"62696e61727900","mixed":1.7234000e+003,"tables":[{"sub_first":-123,"sub_second":"sub"},{"sub_first":17153,"sub_second":"sub"},{"sub_first":34429,"sub_second":"sub"},{"sub_first":51705,"sub_second":"sub"},{"sub_first":68981,"sub_second":"sub"},{"sub_first":86257,"sub_second":"sub"},{"sub_first":103533,"sub_second":"sub"},{"sub_first":120809,"sub_second":"sub"},{"sub_first":138085,"sub_second":"sub"},{"sub_first":155361,"sub_second":"sub"},{"sub_first":172637,"sub_second":"sub"},{"sub_first":189913,"sub_second":"sub"},{"sub_first":207189,"sub_second":"sub"},{"sub_first":224465,"sub_second":"sub"},{"sub_first":241741,"sub_second":"sub"},{"sub_first":259017,"sub_second":"sub"}]}]
Loading

0 comments on commit a729182

Please sign in to comment.