SODA 1.0.4

SODA 1.0.4

Author: morgiyan

build.xml

@@ -76,7 +76,7 @@
             <fileset dir="${classes.dir}"/>
             <fileset dir="${resources.dir}"/>
             <manifest>
-                <attribute name="Repository-Id" value="XDK_SODA-ORDS3.0.7_LINUX.X64_RELEASE GITHUB"/>
+                <attribute name="Repository-Id" value="XDK_SODA1.0.4A_LINUX.X64_RELEASE GITHUB"/>
             </manifest>
         </jar>
     </target>

json.xml

@@ -22,7 +22,7 @@
     <property name="jsr353.jar" value="${env.SODA_JSR353_JAR}"/>
 
     <property name="xdk.lib.dir" value="${xdk.json.src.dir}/lib"/>
-    <property name="jar.orajsoda" value="${xdk.lib.dir}/orajsoda-1.0.3.jar"/>
+    <property name="jar.orajsoda" value="${xdk.lib.dir}/orajsoda-1.0.4.jar"/>
 
     <!--
        Generic project layout

resources/oracle/json/parser/Messages.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2016, 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
@@ -60,7 +60,12 @@
 5043="language" should only be specified for a JSON text index ("fields" must be omitted then)
 5044="order" value cannot be "{0}". Valid values are "asc", "desc", "1", "-1", 1, or -1.
 5058="Scalar required" and "lax" index flags cannot be both set to true.
-
+5059="{0}" cannot be set in conjunction with "{1}".
+5060="dataguide" cannot be "{0}". Valid values are "on" or "off".
+5061="search_on" cannot be "{0}". Valid values are "none", "text", \
+     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.
 #
 # SQL phase "run-time" errors (5500 to 5999 error code range)
 #

resources/oracle/soda/rdbms/exceptions/Messages.properties

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 # Messages used in SODA API exceptions
@@ -16,37 +16,43 @@
 2006=''since'' and ''until'' arguments cannot both be null.
 2007=Collection {0} has no version.
 2008={0} argument must be positive.
-2009=The total number of keys specified using key(), keys(), or filter() methods \
-     is {0}, which exceeds the maximum limit of {1}.
+2009=The total number of keys specified using key(), keys(), or filter() \
+methods is {0}, which exceeds the maximum limit of {1}.
 2010={0} iterator returned null, after returning {1} documents.
 2011=Invalid argument value "{0}".
 2012=A maximum length cannot be set for LOB types.
-2013=SecureFile LOB settings cannot be used when the content column type is "{0}"
-2014=The last-modified column index can only be set when the last-modified column name is set.
-2015=If the assignment method is "SEQUENCE", a key column sequence name must be specified.
+2013=SecureFile LOB settings cannot be used when the content column type \
+is "{0}"
+2014=The last-modified column index can only be set when the last-modified \
+column name is set.
+2015=If the assignment method is "SEQUENCE", a key column sequence name must \
+be specified.
 2016=A version method was specified but the version column name is unspecified.
 2017=The specified key column type cannot be used with a maximum length.
-2018=When using GUID or UUID to assign character type key values, the key column \
-     length must be 32 bytes or greater.
-2019=The collection may not have a media type column unless the content column type is BLOB.
-2020=Media type of the document is not "application/json". getContentAsString() \
-     is only supported for JSON documents.
+2018=When using GUID or UUID to assign character type key values, the key \
+column length must be 32 bytes or greater.
+2019=The collection may not have a media type column unless the content \
+column type is BLOB.
+2020=Media type of the document is not "application/json". \
+getContentAsString() is only supported for JSON documents.
 2021={0} set contains null.
-2022=The key for the document to replace must be specified using the key() method.
+2022=The key for the document to replace must be specified using the \
+key() method.
 2023={0} argument must be nonnegative.
 2024=Invalid index create specification.
 2025=Invalid index drop specification.
 2026=Collection metadata document has no content or has empty content.
 2027=Collection metadata document is not valid JSON.
-2028=Collection metadata document is not valid JSON, encoding could not be determined.
+2028=Collection metadata document is not valid JSON, encoding could not be \
+determined.
 2029=IOException occurred while processing collection metadata document.
 2030=Invalid value for "{0}" in the collection metadata.
 2031=The collection metadata must be a JSON object.
 2032=The object key "{0}" is unexpected in the collection metadata.
-2033=The collection is not configured with client-assigned keys, but the input document \
-     has a key.
-2034=The collection is not configured with client-assigned key, but {0} iterator returned a \
-     document with a key, after returning {1} documents.
+2033=The collection is not configured with client-assigned keys, but the \
+input document has a key.
+2034=The collection is not configured with client-assigned key, but {0} \
+iterator returned a document with a key, after returning {1} documents.
 2035=getCurrentSchema() invoked on the provided JDBC connection returned null.
 2036=Invalid projection specification.
 2037=The value {0} is not a valid key of type {1}.
@@ -57,13 +63,23 @@ the content column encryption is set to NONE.
 2041=Error trying to drop the collection. Make sure all outstanding writes \
 to the collection are committed.
 2042=This operation requires SODA to start a transaction, \
-     but there is an error disabling JDBC connection auto-commit.
+but there is an error disabling JDBC connection auto-commit.
 2043=Projection specification document has no content or has empty content.
 2044=Patch specification document has no content or has empty content.
 2045=Projection specification should not contain a mix of include \
-     and exclude rules.
+and exclude rules.
 2046=Path for an index or order by condition should not contain array steps.
-
+2047=Connection must be an OracleConnection or a wrapper for an OracleConnection.
+2048=Language parameter is not supported with a 12.1.0.2 Oracle Database text \
+index.
+2049=Default functional index mode relies on json_value "null on empty" clause \
+supported starting with 12.2.0.1 Oracle Database release. \
+"scalarRequired" and "lax" modes are supported on 12.1.0.2. Note: "lax" \
+indexes are not used by QBEs, so "scalarRequired" is recommended.
+2050="{0}" cannot be specified for a 12.1.0.2 Oracle Database text index.
+2051=Operation "{0}" requires transaction management when connection is in auto-commit \
+mode, but "avoidTxnManagement" flag is set to true on the OracleDatabase instance. \
+Disable auto-commit mode to execute the operation.
 #
 # Internal errors  (2500 to 2999 error code range)
 #
@@ -73,14 +89,21 @@ to the collection are committed.
 2503=Insert document to collection {0} failed.
 2504=Unable to generate UUID-based key.
 2505=Document with key {0} has size {1}, which exceeds the 2GB limit.
+2506=IDENTITY key assignment requires RETURNING support in SQL.
+2507=Error obtaining database version.
 
 #
 # Unimplemented errors (3000 to 3499 error code range)
 #
 3000=Truncation not supported, collection {0} is not table based.
-3001=indexAll is not implemented for content columns with type {0}.
-3002=indexAll is not implemented for collections with NVARCHAR2 keys. 
-3003=Java Virtual Machine (JVM) does not support MD5 versioning algorithm. Switch to \
-     another versioning algorithm.
-3004=Java Virtual Machine (JVM) does not support SHA256 versioning algorithm. Switch to \
-     another versioning algorithm.
+3001=JSON search index is not implemented for content columns with type {0}.
+3002=JSON search index is not implemented for collections with NVARCHAR2 keys.
+3003=Java Virtual Machine (JVM) does not support MD5 versioning algorithm. \
+Switch to another versioning algorithm.
+3004=Java Virtual Machine (JVM) does not support SHA256 versioning algorithm. \
+Switch to another versioning algorithm.
+3005=Feature is not implememted.
+3006=JSON spatial indexing is not supported on heterogeneous collections.
+3007=JSON search indexing is not supported on heterogeneous collections.
+3008=JSON functional indexing is not supported on heterogeneous collections.
+3009=Query-by-example (QBE) is not supported on heterogeneous collections.

src/oracle/json/parser/IndexColumn.java

@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. 
+/* Copyright (c) 2014, 2017, Oracle and/or its affiliates. 
 All rights reserved.*/
 
 /*
@@ -118,14 +118,11 @@ public int setSqlType(String str)
         sqlType = SQLTYPE_NUMBER;
       else if (str.equalsIgnoreCase("DATE"))
         sqlType = SQLTYPE_DATE;
-      else if ((str.equalsIgnoreCase("TIMESTAMP")) ||
-               (str.equalsIgnoreCase("DATETIME")))
+      else if ((str.equalsIgnoreCase("TIMESTAMP")))
         sqlType = SQLTYPE_TIMESTAMP;
       else if ((str.equalsIgnoreCase("STRING")) ||
                (str.equalsIgnoreCase("VARCHAR")) ||
-               (str.equalsIgnoreCase("VARCHAR2")) ||
-               (str.equalsIgnoreCase("NVARCHAR")) ||
-               (str.equalsIgnoreCase("NVARCHAR2")))
+               (str.equalsIgnoreCase("VARCHAR2")))
         sqlType = SQLTYPE_CHAR;
     }
     // Set the SQL type only if a valid type was detected