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.

Sign up for GitHub

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

Merging changes from develop into Breaking-updates + ref doc setup. Many changes, please review #106

Merged
merged 32 commits into from
Sep 9, 2013
Merged

Merging changes from develop into Breaking-updates + ref doc setup. Many changes, please review #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
fca6382
Made testcases pass. Disabled some of the new tests for View and Quer…
Sep 6, 2013
539e6b9
Added finalize to TableQuery
Sep 6, 2013
c1e97c4
Changed tab to spaces
Sep 6, 2013
2494d8a
Merge pull request #102 from hovoere/develop
Sep 6, 2013
6af6fc6
Merge branch 'master' of github.com:Tightdb/tightdb_java2 into develop
Sep 6, 2013
dab7eb5
Merge remote-tracking branch 'Tightdb/develop' into develop
Sep 6, 2013
d5580bc
Renamed class util to Util.
Sep 6, 2013
0c0167f
Updated changes.txt
Sep 6, 2013
a17d6d1
Mem leak test
Sep 6, 2013
3edb02d
Merge pull request #103 from hovoere/develop
Sep 6, 2013
90ee201
Intial addition of typed interface ref doc for Table
Sep 6, 2013
2455611
empty shell added for typed intro example. Will do later
Sep 6, 2013
7d6b839
Added column type check
Sep 9, 2013
9875337
Merge remote-tracking branch 'Tightdb/develop' into develop
Sep 9, 2013
2709d98
Enabled and fixed testcases for column type tests.
Sep 9, 2013
4342dac
minor fixes.
Sep 9, 2013
773f160
rename of table view intro file and id
Sep 9, 2013
35d6467
Merged develop into mekjaer/master
Sep 9, 2013
7439b80
Added last validity checks in Query.
Sep 9, 2013
d367632
Test for thrown exception in queri on wrong column types
Sep 9, 2013
d3222a8
hack for renaming
Sep 9, 2013
6750e28
correct name for Util
Sep 9, 2013
0360e1a
Enabled transaction tests under Windows.
Sep 9, 2013
0805c79
Example Util changed to ExampleHelper to avoid conflict with internal…
Sep 9, 2013
1501eb6
Added test for column out of bounds
Sep 9, 2013
37d1387
Test cases added for accessing queries and views on closed table
Sep 9, 2013
859dc59
Added (disabled) test for double commit() and double rollback()
Sep 9, 2013
400f043
test cases for closed table
Sep 9, 2013
e0cc0d0
Changed comments
Sep 9, 2013
99bfa59
cleaned up
Sep 9, 2013
263525e
Merge pull request #104 from hovoere/develop
Sep 9, 2013
3fc3ff3
Merged develop into breaking updates and updated test case correspond…
Sep 9, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .JNI-h-file-generation.launch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
</listAttribute>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE" value="${none}"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="C:\Program Files\Java\jdk1.7.0\bin\javah.exe"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-d ${workspace_loc}/../tightdb_java2/tightdb-java-core/target/classes/jni com.tightdb.Group com.tightdb.Table com.tightdb.TableView com.tightdb.TableQuery com.tightdb.internal.util com.tightdb.SharedGroup"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-d ${workspace_loc}/../tightdb_java2/tightdb-java-core/target/classes/jni com.tightdb.Group com.tightdb.Table com.tightdb.TableView com.tightdb.TableQuery com.tightdb.internal.Util com.tightdb.SharedGroup"/>
<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc}/../tightdb_java2/tightdb-java-core/target/classes"/>
</launchConfiguration>
4 changes: 4 additions & 0 deletions doc/changes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
06-September-2013:
=================
! BUGFIX: Fixed small leak in TableQuery.

04-September-2013
===============
+ Added TableQuery.equal for Date
Expand Down
2 changes: 1 addition & 1 deletion doc/ref/data/dyn_query_ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
## TODO: Describe start, end index parameters in searches. end is not inclusive.

ID : class_dyn_query
TITLE : TableQuery(dynamic)
TITLE : TableQuery (dynamic)
SUMMARY : *g_dyn_query_intro_summary
DESCR : *g_dyn_query_intro_descr
SEE : *g_dyn_query_intro_see
Expand Down
2 changes: 1 addition & 1 deletion doc/ref/data/dyn_table_ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# updateFromSpec, getTableSpec

ID : class_dyn_table
TITLE : Table
TITLE : Table (dynamic)
SUMMARY : *g_dyn_table_intro_summary
DESCR : *g_dyn_table_intro_descr
SEE : *g_dyn_table_intro_see
Expand Down
4 changes: 2 additions & 2 deletions doc/ref/data/dyn_view_ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
# TODO: Add addLong()

ID : class_dyn_tableview
TITLE : TableView
TITLE : TableView (dynamic)
SUMMARY : *g_dyn_view_intro_summary
DESCR : *g_dyn_view_intro_descr
SEE :
EXAMPLES :
- DESCR : The methods available in a TableView is a subset of those in
{@link class_dyn_table}, so you can check the examples there.
CODE: ex_java_dyn_view_intro
CODE: ex_java_dyn_table_view_intro
IGNORE : [g_dyn_view_get_subtable_const,
g_dyn_view_find_all_bool_const,
g_dyn_view_find_all_int_const,
Expand Down
2 changes: 1 addition & 1 deletion doc/ref/data/reference.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ IMPORTPATH: ../../tightdb/doc/ref_cpp/data

CATEGORIES: # list global class-id in order of appearence
- Typed Table: # Category header name
# - typed_table # Global Class name. File: 'typed_table_ref.yaml'
- typed_table # Global Class name. File: 'typed_table_ref.yaml'
# - typed_view
# - typed_query
- Dynamic Table:
Expand Down
Loading