soda 1.0.5

keyLike and bug fixes

Author: morgiyan

README.md

@@ -1,5 +1,5 @@
-# SODA 1.0.4
-Simple Oracle Document Access (SODA) is an API from Oracle for working with JSON in the Oracle Database. Although SODA is particularly powerful when it comes to JSON data, data of any other type is supported as well.
+# SODA 1.0.5
+Simple Oracle Document Access (SODA) is an API which allows you to use the Oracle Database as a NoSQL JSON document store. Although SODA is particularly powerful when it comes to JSON data, data of any other type is supported as well.
 
 With the SODA architecture, your data is stored as documents, and documents are organized into collections. Each document contains the actual data, as well as additional information automatically maintained by SODA, such as unique key, last-modified timestamp, version, type, etc. SODA lets you create and store such collections of documents in the Oracle Database, and perform create, retrive, update, and delete (CRUD) operations on these documents, without needing to know Structured Query Language (SQL), or JDBC, or how the data is stored in the database. Essentially SODA provides a virtual NoSQL document store on top of your Oracle Database. Under the covers, a collection is stored as a regular Oracle Database table, and each document is stored as a row in the table. SQL access to the table using standard tools is still allowed. 
 

build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!-- 
- Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2015, 2016, 2017 Oracle and/or its affiliates. All rights reserved.
 
    DESCRIPTION
      The main ant build for json.
@@ -59,6 +59,7 @@
             use="true"
             author="false"
             failonerror="true"
+            executable="${javac.java.home}/bin/javadoc"
             />
     </target>
 
@@ -76,7 +77,7 @@
             <fileset dir="${classes.dir}"/>
             <fileset dir="${resources.dir}"/>
             <manifest>
-                <attribute name="Repository-Id" value="XDK_SODA1.0.4A_LINUX.X64_RELEASE GITHUB"/>
+                <attribute name="Repository-Id" value="XDK_SODA1.0.5A_LINUX.X64_RELEASE GITHUB"/>
             </manifest>
         </jar>
     </target>

doc/Building-and-running-tests.md

@@ -10,9 +10,9 @@ the patch, including the post-installation step.
 The test framework is located in the /test directory under the root SODA directory (the root SODA directory is the one containing LICENSE.txt file). It's built with JUnit and driven by Ant. The actual Java test files are in /test/src/oracle/json/tests/soda. To configure the database instance and the test framework, follow these steps (note that some of them require sysdba access).
 
 **(1)** Build the source code (which includes downloading SODA dependencies), as described
-in [Building the source code](https://github.com/oracle/soda-for-java/blob/master/doc/Building-source-code.md). Make sure you perform all steps described in this link. Specifically, make sure that the JAVA6HOME environment variable is set, and that the following jars are located in the /lib directory under the top level SODA directory (the one that contains LICENSE.txt):
+in [Building the source code](https://github.com/oracle/soda-for-java/blob/master/doc/Building-source-code.md). Make sure you perform all steps described in this link. Specifically, make sure that the JAVA_HOME environment variable is set, and that the following jars are located in the /lib directory under the top level SODA directory (the one that contains LICENSE.txt):
 
-* ojdbc6.jar (the JDBC jar that ships with Oracle database version 12.1.0.2)
+* JDBC jar
 * javax.json-1.0.4.jar (JSR353 jar)
 * junit-3.8.1.jar (JUnit jar)
 * orajsoda.jar (SODA Java jar)

doc/Building-source-code.md

@@ -1,30 +1,33 @@
 # Building the source code
 
-SODA is built using Ant with Ivy. Make sure you have ant installed and configured.
+SODA is built using Ant with Ivy. Make sure you have Ant 1.9 or above installed and configured.
 It's not required that Ivy is installed - as long as you have an internet connection, 
 the build process will download Ivy and use it to download SODA dependencies. 
 
 The only SODA dependency that must be manually downloaded is the Oracle JDBC jar that ships with 
-the 12.1.0.2 release of the Oracle database.
+the Oracle database.
 
-The JDBC jar can be downloaded from here:
+JDBC jars for use with JDK 6, 7, and 8 ship with Oracle Database 12.1.0.2 and can be downloaded from here:
 
 [http://www.oracle.com/technetwork/database/features/jdbc/default-2280470.html](http://www.oracle.com/technetwork/database/features/jdbc/default-2280470.html)
 
-Make sure you pick ojdbc6.jar, out of the different flavors available. 
+Make sure you pick either ojdbc6.jar (for use with JDK 6), or ojdbc7.jar (for use with JDK 7 and 8),
+out of the different flavors available. 
 
-Copy the downloaded ojdbc6.jar to the /lib directory under the root SODA directory (the root SODA directory is the one containing LICENSE.txt file).
+If you are using JDK 8 and planning to run SODA with Oracle Database 12.2.0.1, you can alternatively download ojdbc8.jar from here:
+
+http://www.oracle.com/technetwork/database/features/jdbc/jdbc-ucp-122-3110062.html
+
+Copy the downloaded JDBC jar to the /lib directory under the root SODA directory (the root SODA directory is the one containing LICENSE.txt file).
 
 Other dependencies will be automatically downloaded by Ivy. You also have the
 option to not use Ivy, and to download the dependencies manually (see "Building without Ivy" below).
 
 The following instructions require setting various environment variables. They assume you're on Linux, and using the C Shell (csh). On other OSes, you would set environment variables analogously, using a mechanism appropriate for your specific operating system.
 
-SODA builds using Java 6. Set the JAVA6HOME environment
-variable to the JDK install directory. For example, assuming JDK6 is installed
-under /jdk6, and you're using the C Shell (csh) on Linux, do:
+Set the JAVA_HOME environment variable to the JDK install directory. At a minimum, JDK 6 is required. For example, assuming you are using JDK 8 installed under /jdk8, and you're using the C Shell (csh) on Linux, do:
 
-    setenv JAVA6HOME /jdk6 
+    setenv JAVA_HOME /jdk8 
 
 ### Building with Ivy
 

doc/Getting-started-example.md

@@ -76,15 +76,15 @@ public class testSODA {
         // users and the number of friends they have
         OracleDocument doc1 =
           db.createDocumentFromString(
-            "{ \"name\" : \"Alex\", \"friends\" : \"50\" }");
+            "{ \"name\" : \"Alex\", \"friends\" : 50 }");
 
         OracleDocument doc2 =
           db.createDocumentFromString(
-            "{ \"name\" : \"Mia\", \"friends\" : \"300\" }");
+            "{ \"name\" : \"Mia\", \"friends\" : 300 }");
 
         OracleDocument doc3 =
           db.createDocumentFromString(
-            "{ \"name\" : \"Gloria\", \"friends\" : \"399\" }");
+            "{ \"name\" : \"Gloria\", \"friends\" : 399 }");
 
         // Insert the documents into a collection, one-by-one.
         // The result documents contain auto-generated 
@@ -159,27 +159,27 @@ Copy and paste this code into a file called testSODA.java. Then modify the "url"
 
 To compile and run SODA Java applications, you need the following jars:
 
-*    ojdbc6.jar that ships with Oracle Database 12.1.0.2. Download it from [this page](http://www.oracle.com/technetwork/database/features/jdbc/default-2280470.html).
+*    ojdbc6.jar (for use with JDK 6) or ojdbc7.jar (for use with JDK 7 or 8) that ship with Oracle Database 12.1.0.2. Download it from [this page](http://www.oracle.com/technetwork/database/features/jdbc/default-2280470.html). These jars will work with Oracle Database 12.1.0.2 and above. Alternatively, if you are using JDK 8 and Oracle Database 12.2.0.1 and above, you can use ojdbc8.jar from [this page](http://www.oracle.com/technetwork/database/features/jdbc/jdbc-ucp-122-3110062.html). 
 
 *    javax.json-1.0.4.jar. This is the JSR353 implementation, download it from [here](http://search.maven.org/remotecontent?filepath=org/glassfish/javax.json/1.0.4/javax.json-1.0.4.jar).
 
 *    orajsoda-version.jar. The SODA jar. Download the latest version [here](https://github.com/oracle/soda-for-java/releases).
 
-Compile and run testSODA.java, making sure the necessary jars are in the classpath. For example, assuming you're in the directory where the jars are located, do:
+Compile and run testSODA.java, making sure the necessary jars are in the classpath. JDK 6 or above is required. For example, assuming you're in the directory where the jars are located, and you are using ojdbc7.jar, do:
 
     javac -classpath "orajsoda.jar" testSODA.java
-    java -classpath "orajsoda-version.jar:ojdbc6.jar:javax.json-1.0.4.jar:." testSODA
+    java -classpath "orajsoda-version.jar:ojdbc7.jar:javax.json-1.0.4.jar:." testSODA
 
 You should see the following output:
 
     * Retrieving the first document by its key *
 
-    { "name" : "Alex", "friends" : "50" }
+    { "name" : "Alex", "friends" : 50 }
 
     * Retrieving documents representing users with at least 300 friends *
 
-    { "name" : "Mia", "friends" : "300" }
-    { "name" : "Gloria", "friends" : "399" }
+    { "name" : "Mia", "friends" : 300 }
+    { "name" : "Gloria", "friends" : 399 }
 
 This example illustrates two ways of retrieving documents from the collection: by using unique document keys, or by using QBEs. To find all users with at least 300 friends, the following QBE was used in the code above:
 

json.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!-- 
- Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2014, 2015, 2016, 2017 Oracle and/or its affiliates. All rights reserved.
 
    DESCRIPTION
      Common tasks & properties for JSON ANT scripts.
@@ -16,13 +16,10 @@
 
     <property environment="env"/>
 
-    <!-- Compiles with JDK6 to be compatible with an 12.1.0.2 RDBMS deployment -->
-    <property name="javac.java.home" value="${env.JAVA6HOME}"/>
-    <property name="ojdbc6.jar" value="${env.SODA_OJDBC6_JAR}"/>
-    <property name="jsr353.jar" value="${env.SODA_JSR353_JAR}"/>
+    <property name="javac.java.home" value="${env.JAVA_HOME}"/>
 
     <property name="xdk.lib.dir" value="${xdk.json.src.dir}/lib"/>
-    <property name="jar.orajsoda" value="${xdk.lib.dir}/orajsoda-1.0.4.jar"/>
+    <property name="jar.orajsoda" value="${xdk.lib.dir}/orajsoda-1.0.5.jar"/>
 
     <!--
        Generic project layout
@@ -36,8 +33,6 @@
     <property name="resources.dir" value="${basedir}/resources"/>  
 
     <path id="xdk.json.lib.import">
-        <pathelement location="${ojdbc6.jar}"/>
-        <pathelement location="${jsr353.jar}"/>
         <fileset dir="${xdk.lib.dir}" includes="*.jar"/>
     </path>
 

resources/oracle/json/parser/Messages.properties

@@ -66,6 +66,7 @@
      and "text_value".
 5062=Items in the value array for {0} cannot be boolean or null.
 5063={0} must only be used at the top level, either by itself or under $and.
+5064=At most one $id clause allowed.
 #
 # SQL phase "run-time" errors (5500 to 5999 error code range)
 #

resources/oracle/json/parser/Messages_ar.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 # Messages used in query-by-example exceptions
@@ -61,7 +61,17 @@
 5051=\u064A\u062C\u0628 \u0623\u0646 \u064A\u062A\u0645 \u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0627\u0644\u0639\u0648\u0627\u0645\u0644 \u0627\u0644\u0645\u0633\u0627\u062D\u064A\u0629 \u0641\u064A \u0627\u0644\u0645\u0633\u062A\u0648\u0649 \u0627\u0644\u0623\u0639\u0644\u0649 \u0641\u0642\u0637.
 5052=\u064A\u062C\u0628 \u0623\u0646 \u064A\u062A\u0645 \u0627\u0633\u062A\u062E\u062F\u0627\u0645 $contains \u0641\u064A \u0627\u0644\u0645\u0633\u062A\u0648\u0649 \u0627\u0644\u0623\u0639\u0644\u0649 \u0641\u0642\u0637.
 5053=\u0644\u0627 \u064A\u0645\u0643\u0646 \u0644\u0644\u0639\u0627\u0645\u0644 {0} \u0639\u0632\u0644 \u0639\u0627\u0645\u0644 {1}. 
-
+5054=\u064A\u062A\u0639\u064A\u0646 \u062A\u062D\u062F\u064A\u062F \u0645\u0633\u0627\u0631 \u0641\u064A \u062D\u0642\u0644 $orderby.
+5055=\u0644\u0627 \u064A\u0645\u0643\u0646 \u0623\u0646 \u064A\u0634\u062A\u0645\u0644 \u0627\u0644\u062D\u0642\u0644 $orderby \u0639\u0644\u0649 \u0627\u0644\u062E\u0627\u0635\u064A\u0629 "{0}".
+5056=\u0644\u0627 \u064A\u0645\u0643\u0646 \u0623\u0646 \u062A\u0634\u062A\u0645\u0644 \u0627\u0644\u062E\u0627\u0635\u064A\u0629 $orderby "{0}" \u0639\u0644\u0649 \u0627\u0644\u0642\u064A\u0645\u0629 "{1}".
+5057=\u064A\u062C\u0628 \u0623\u0646 \u062A\u0643\u0648\u0646 \u0627\u0644\u062E\u0627\u0635\u064A\u0629 $orderby "{0}" \u0645\u0646 \u0627\u0644\u0646\u0648\u0639 {1}.
+5058=\u0644\u0627 \u064A\u0645\u0643\u0646 \u062A\u0639\u064A\u064A\u0646 \u0639\u0644\u0627\u0645\u062A\u064A \u0627\u0644\u0641\u0647\u0631\u0633 "Scalar required" (\u0645\u0637\u0644\u0648\u0628 \u0642\u064A\u0645\u0629 \u0623\u062D\u0627\u062F\u064A\u0629) \u0648 "lax" (\u0645\u0631\u0646) \u0643\u0644\u062A\u064A\u0647\u0645\u0627 \u0625\u0644\u0649 true.
+5059=\u0644\u0627 \u064A\u0645\u0643\u0646 \u062A\u0639\u064A\u064A\u0646 "{0}" \u0645\u0631\u062A\u0628\u0637\u064B\u0627 \u0645\u0639 "{1}".
+5060="dataguide" \u0644\u0627 \u064A\u0645\u0643\u0646 \u0623\u0646 \u064A\u0643\u0648\u0646 "{0}". \u0627\u0644\u0642\u064A\u0645\u062A\u0627\u0646 \u0627\u0644\u0635\u0627\u0644\u062D\u062A\u0627\u0646 \u0647\u0645\u0627 "on" \u0623\u0648 "off".
+5061="search_on" \u0644\u0627 \u064A\u0645\u0643\u0646 \u0623\u0646 \u064A\u0643\u0648\u0646 "{0}". \u0627\u0644\u0642\u064A\u0645 \u0627\u0644\u0635\u0627\u0644\u062D\u0629 \u0647\u064A "none" \u0648"text" \u0648"text_value".
+5062=\u064A\u062C\u0628 \u0623\u0646 \u062A\u0643\u0648\u0646 \u0627\u0644\u0639\u0646\u0627\u0635\u0631 \u0641\u064A \u0645\u0635\u0641\u0648\u0641\u0629 \u0642\u064A\u0645 {0} \u0645\u0646\u0637\u0642\u064A\u0629 \u0623\u0648 \u0641\u0627\u0631\u063A\u0629.
+5063=\u064A\u062C\u0628 \u0627\u0633\u062A\u062E\u062F\u0627\u0645 {0} \u0641\u064A \u0627\u0644\u0645\u0633\u062A\u0648\u0649 \u0627\u0644\u0623\u0639\u0644\u0649 \u0641\u0642\u0637\u060C \u0628\u0634\u0643\u0644 \u0645\u0646\u0641\u0631\u062F \u0623\u0648 \u0636\u0645\u0646 $and.
+5064=\u0645\u0633\u0645\u0648\u062D \u0628\u0641\u0642\u0631\u0629 $id \u0641\u064A \u0627\u0644\u063A\u0627\u0644\u0628.
 #
 # SQL phase "run-time" errors (5500 to 5999 error code range)
 #

resources/oracle/json/parser/Messages_cs.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 # Messages used in query-by-example exceptions
@@ -61,7 +61,17 @@
 5051=Prostorov\u00E9 oper\u00E1tory se mohou pou\u017E\u00EDvat pouze na nejvy\u0161\u0161\u00ED \u00FArovni.
 5052=Parametr $contains se m\u016F\u017Ee pou\u017E\u00EDvat pouze na nejvy\u0161\u0161\u00ED \u00FArovni.
 5053=Oper\u00E1tor {0} nem\u016F\u017Ee obalovat oper\u00E1tor {1}. 
-
+5054=Pole $orderby mus\u00ED obsahovat cestu.
+5055=Pole $orderby nesm\u00ED obsahovat vlastnost "{0}".
+5056=Vlastnost $orderby "{0}" nesm\u00ED m\u00EDt hodnotu "{1}".
+5057=Vlastnost $orderby "{0}" mus\u00ED m\u00EDt typ {1}.
+5058=P\u0159\u00EDznaky indexu "Scalar required" a "lax" nesm\u00ED b\u00FDt oba nastaveny na hodnotu True.
+5059="{0}" nelze nastavit sou\u010Dasn\u011B s "{1}".
+5060="dataguide" nesm\u00ED b\u00FDt "{0}". Platn\u00E9 hodnoty jsou "on" nebo "off".
+5061="search_on" nesm\u00ED b\u00FDt "{0}". Platn\u00E9 hodnoty jsou "none", "text" a "text_value".
+5062=Polo\u017Eky v poli hodnot pro {0} nesm\u00ED m\u00EDt booleovskou hodnotu nebo hodnotu null.
+5063=Oper\u00E1tor {0} lze pou\u017E\u00EDt pouze na nejvy\u0161\u0161\u00ED \u00FArovni, a to bu\u010F samotn\u00FD, nebo pod oper\u00E1torem $and.
+5064=Povolena nanejv\u00FD\u0161 jedna klauzule $id.
 #
 # SQL phase "run-time" errors (5500 to 5999 error code range)
 #

resources/oracle/json/parser/Messages_da.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 # Messages used in query-by-example exceptions
@@ -61,7 +61,17 @@
 5051=Spatialoperatorer m\u00E5 kun bruges p\u00E5 \u00F8verste niveau.
 5052=$contains m\u00E5 kun bruges p\u00E5 \u00F8verste niveau.
 5053=Operatoren {0} kan ikke omslutte operatoren {1}. 
-
+5054=Et $orderby-felt skal angive en sti.
+5055=Et $orderby-felt kan ikke have egenskaben "{0}".
+5056=$orderby-egenskaben "{0}" kan ikke have v\u00E6rdien "{1}".
+5057=$orderby-egenskaben "{0}" skal v\u00E6re af typen {1}.
+5058=Indeksflagene "Skalar er p\u00E5kr\u00E6vet" og "lax" kan ikke begge v\u00E6re sat til sand.
+5059="{0}" kan ikke v\u00E6re sat sammen med "{1}".
+5060="dataguide" kan ikke v\u00E6re "{0}". Gyldige v\u00E6rdier er "on" eller "off".
+5061="search_on" kan ikke v\u00E6re "{0}". Gyldige v\u00E6rdier er "none", "text" og "text_value".
+5062=Elementer i v\u00E6rdiarray for {0} kan ikke v\u00E6re booleske eller NULL.
+5063={0} m\u00E5 kun bruges p\u00E5 \u00F8verste niveau, enten alene eller under $and.
+5064=H\u00F8jst \u00E9n $id-klausul er tilladt.
 #
 # SQL phase "run-time" errors (5500 to 5999 error code range)
 #