From 28ab636bd4a3c619304a02eea4d7edd265618cdc Mon Sep 17 00:00:00 2001
From: morgiyan <maxim.orgiyan@oracle.com>
Date: Mon, 4 Jan 2016 19:27:38 -0800
Subject: [PATCH] Removed nvarchar2/nclob/raw support, changed table name
 defaulting

Removes nvarchar2/nclob/raw since they are not supported by Oracle SQL

Changes table name defaulting algorithm to avoid case-sensitive table
names in common cases
---
 build.xml                                     |  2 +-
 json.xml                                      |  2 +-
 .../soda/rdbms/impl/CollectionDescriptor.java | 48 +++++++++++++++++--
 .../soda/test_OracleCollectionAdmin.java      | 10 +++-
 .../tests/soda/test_OracleDatabaseAdmin.java  | 38 ++++++++++-----
 .../json/tests/soda/test_OracleDocument2.java |  9 +++-
 .../soda/test_OracleOperationBuilder2.java    | 16 +++++--
 .../json/tests/soda/test_OracleSodaCache.java |  2 +-
 8 files changed, 102 insertions(+), 25 deletions(-)

diff --git a/build.xml b/build.xml
index 6182f05..2f87f90 100644
--- a/build.xml
+++ b/build.xml
@@ -76,7 +76,7 @@
             <fileset dir="${classes.dir}"/>
             <fileset dir="${resources.dir}"/>
             <manifest>
-                <attribute name="Repository-Id" value="XDK_SODA1.0.0_LINUX.X64_151210 GITHUB"/>
+                <attribute name="Repository-Id" value="XDK_SODA1.0.0_LINUX.X64_151227 GITHUB"/>
             </manifest>
         </jar>
     </target>
diff --git a/json.xml b/json.xml
index 9d61771..f798a20 100644
--- a/json.xml
+++ b/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.1.jar"/>
+    <property name="jar.orajsoda" value="${xdk.lib.dir}/orajsoda-1.0.2.jar"/>
 
     <!--
        Generic project layout
diff --git a/src/oracle/soda/rdbms/impl/CollectionDescriptor.java b/src/oracle/soda/rdbms/impl/CollectionDescriptor.java
index b9ede14..ffcc503 100644
--- a/src/oracle/soda/rdbms/impl/CollectionDescriptor.java
+++ b/src/oracle/soda/rdbms/impl/CollectionDescriptor.java
@@ -21,6 +21,7 @@
 import java.io.IOException;
 
 import java.util.Map;
+import java.util.Locale;
 
 import javax.json.JsonObject;
 import javax.json.JsonString;
@@ -161,7 +162,19 @@ public class CollectionDescriptor
   final String   doctypeColumnName;
   final String   creationColumnName;
 
+  /**
+   * Return a SQL identifier derived from the string, case-preserving
+   */
   static String stringToIdentifier(String jsonName)
+  {
+    return(CollectionDescriptor.stringToIdentifier(jsonName, true));
+  }
+
+  /**
+   * Return a SQL identifier derived from the string,
+   * optionally either case-preserving or upper-casing
+   */
+  static String stringToIdentifier(String jsonName, boolean preserveCase)
   {
     String identifierName = null;
     if (jsonName != null)
@@ -169,6 +182,10 @@ static String stringToIdentifier(String jsonName)
       char[] data = jsonName.toCharArray();
       if (data.length == 0) return("");
 
+      boolean hasUpper = false;
+      boolean hasLower = false;
+      boolean toUpper = !preserveCase;
+
       // Examine all characters of data
       for (int i = 0; i < data.length; ++i)
       {
@@ -177,9 +194,32 @@ static String stringToIdentifier(String jsonName)
           data[i] = '_'; // Replace double quotes with underscores
         else if (ch < ' ')
           data[i] = '_'; // Replace control characters with underscores
+        else if ((ch >= 'A') && (ch <= 'Z'))
+          hasUpper = true;
+        else if ((ch >= 'a') && (ch <= 'z'))
+          hasLower = true;
+        // If the string contains non-alphanumeric characters
+        // that aren't allowed by SQL, we shouldn't uppercase it
+        else if (((ch < '0') || (ch > '9')) &&
+                 ((ch != '_') && (ch != '$') && (ch != '#')))
+          toUpper = false;
+      }
+
+      // If the string is mixed case, we shouldn't uppercase it
+      if (toUpper && hasUpper && hasLower)
+        toUpper = false;
+      // If the string doesn't start with an alphabetic character
+      // we shouldn't upper case it
+      if (toUpper)
+      {
+        char ch = data[0];
+        if (((ch < 'A') || (ch > 'Z')) && ((ch < 'a') || (ch > 'z')))
+          toUpper = false;
       }
 
       identifierName = new String(data);
+
+      if (toUpper) identifierName = identifierName.toUpperCase(Locale.US);
     }
     return(identifierName);
   }
@@ -1036,7 +1076,7 @@ CollectionDescriptor buildDescriptor(String uriName,
       byte dbObjectType = this.dbObjectType;
       if (dbObjectName == null)
       {
-        dbObjectName = stringToIdentifier(uriName);
+        dbObjectName = stringToIdentifier(uriName, false); // Case converting
         dbObjectType = DBOBJECT_TABLE;
       }
 
@@ -1217,6 +1257,7 @@ else if (sqlType.equalsIgnoreCase("varchar"))
         type = CHAR_CONTENT;
       else if (sqlType.equalsIgnoreCase("varchar2"))
         type = CHAR_CONTENT;
+      /* Raw, and n-types are not currently supported
       else if (sqlType.equalsIgnoreCase("raw"))
         type = RAW_CONTENT;
       else if (sqlType.equalsIgnoreCase("nchar"))
@@ -1225,12 +1266,13 @@ else if (sqlType.equalsIgnoreCase("nvarchar"))
         type = NCHAR_CONTENT;
       else if (sqlType.equalsIgnoreCase("nvarchar2"))
         type = NCHAR_CONTENT;
+      else if (sqlType.equalsIgnoreCase("nclob"))
+        type = NCLOB_CONTENT;
+      */
       else if (sqlType.equalsIgnoreCase("blob"))
         type = BLOB_CONTENT;
       else if (sqlType.equalsIgnoreCase("clob"))
         type = CLOB_CONTENT;
-      else if (sqlType.equalsIgnoreCase("nclob"))
-        type = NCLOB_CONTENT;
       else
         throw SODAUtils.makeException(SODAMessage.EX_INVALID_ARG_VALUE, sqlType);
 
diff --git a/test/src/oracle/json/tests/soda/test_OracleCollectionAdmin.java b/test/src/oracle/json/tests/soda/test_OracleCollectionAdmin.java
index 7d97e92..4bce94d 100644
--- a/test/src/oracle/json/tests/soda/test_OracleCollectionAdmin.java
+++ b/test/src/oracle/json/tests/soda/test_OracleCollectionAdmin.java
@@ -52,6 +52,7 @@ public void testIsHeterogeneous() throws Exception {
       assertEquals(msg, e.getMessage());
     }
     
+    /* ### Oracle Database does not support NVARCHAR2 and RAW storage for JSON
     try {
       // Test with mediaTypeColumn, but content type = "NVARCHAR2" 
       client.createMetadataBuilder().mediaTypeColumnName("CONTENT_TYPE").contentColumnType("NVARCHAR2")
@@ -69,6 +70,7 @@ public void testIsHeterogeneous() throws Exception {
     } catch (OracleException e) {
       assertEquals(msg, e.getMessage());
     }
+    */
     
     try {
       // Test with mediaTypeColumn, but content type = "CLOB" 
@@ -79,6 +81,7 @@ public void testIsHeterogeneous() throws Exception {
       assertEquals(msg, e.getMessage());
     }
     
+    /*  ### Oracle Database does not support NCLOB storage for JSON 
     try {
       // Test with mediaTypeColumn, but content type = "NCLOB" 
       client.createMetadataBuilder().mediaTypeColumnName("CONTENT_TYPE").contentColumnType("NCLOB")
@@ -87,7 +90,7 @@ public void testIsHeterogeneous() throws Exception {
     } catch (OracleException e) {
       assertEquals(msg, e.getMessage());
     }
-
+    */
 
     OracleCollection col6 = dbAdmin.createCollection("testIsHeterogeneous6");
     assertEquals(false, col6.admin().isHeterogeneous());
@@ -558,6 +561,7 @@ public void testIndexAll() throws Exception {
     OracleCollection col3 = dbAdmin.createCollection("testIndexAll3", mDoc3);
     testIndexAllwithCol(col3);
     
+    /* ### Oracle Database does not support NVARCHAR2, NCLOB, or RAW storage for JSON
     // Test with contentColumnType=RAW
     OracleDocument mDoc5 = client.createMetadataBuilder()
         .contentColumnType("RAW").build();
@@ -588,6 +592,7 @@ public void testIndexAll() throws Exception {
       // Expect an OracleException
       assertEquals("indexAll is not implemented for content columns with type NCLOB.", e.getMessage());
     }
+    */
  
   }
  
@@ -907,6 +912,8 @@ public void testCreateIndex() throws Exception {
       assertTrue(t.getMessage().contains("ORA-01452"));
     }
 
+    /* ### Oracle Database does not support NVARCHAR2 or NCLOB storage for JSON
+
     String indexSpecN9 =
       "{ \"name\":\"STUDENT_INDEXN9\", \"language\" : \"english\" }";
     
@@ -933,6 +940,7 @@ public void testCreateIndex() throws Exception {
       // Expect an OracleException
       assertEquals("indexAll is not implemented for content columns with type NCLOB.", e.getMessage());
     }
+    */
 
   } 
 
diff --git a/test/src/oracle/json/tests/soda/test_OracleDatabaseAdmin.java b/test/src/oracle/json/tests/soda/test_OracleDatabaseAdmin.java
index edaa1a4..bfeb84d 100644
--- a/test/src/oracle/json/tests/soda/test_OracleDatabaseAdmin.java
+++ b/test/src/oracle/json/tests/soda/test_OracleDatabaseAdmin.java
@@ -199,10 +199,10 @@ public void testCreateCollection2() throws Exception {
     }
 
     //Test with unmatched contentColumnMaxLength
-    OracleDocument metaDoc10 = client.createMetadataBuilder().contentColumnType("NVARCHAR2").contentColumnMaxLength(1024).build();
+    OracleDocument metaDoc10 = client.createMetadataBuilder().contentColumnType("VARCHAR2").contentColumnMaxLength(1024).build();
     String colName10 = "testCreateCollection10";
     dbAdmin.createCollection(colName10, metaDoc10);
-    OracleDocument metaDoc10_1 = client.createMetadataBuilder().contentColumnType("NVARCHAR2").contentColumnMaxLength(256).build();
+    OracleDocument metaDoc10_1 = client.createMetadataBuilder().contentColumnType("VARCHAR2").contentColumnMaxLength(256).build();
     try {
       dbAdmin.createCollection(colName10, metaDoc10_1);
       fail("No exception when mismatch on collection metadata");
@@ -385,7 +385,7 @@ public void testCreateCollection2() throws Exception {
     OracleDocument metaDoc24 = client.createMetadataBuilder().contentColumnType("CLOB").build();
     String colName24 = "testCreateCollection24";
     dbAdmin.createCollection(colName24, metaDoc24);
-    OracleDocument metaDoc24_1 = client.createMetadataBuilder().contentColumnType("RAW").build();
+    OracleDocument metaDoc24_1 = client.createMetadataBuilder().contentColumnType("BLOB").build();
     try {
       dbAdmin.createCollection(colName24, metaDoc24_1);
       fail("No exception when mismatch on collection metadata");
@@ -863,15 +863,17 @@ private void testContColType(String contColType) throws Exception {
   public void testContentColumnTypes() throws Exception {
     testContColType("VARCHAR2");
     
+    testContColType("BLOB");
+
+    testContColType("CLOB");
+
+    /* ### Oracle Database does not support NVARCHAR2, NCLOB, or RAW storage for JSON
     testContColType("NVARCHAR2");
     
     testContColType("RAW");
     
-    testContColType("BLOB");
-    
-    testContColType("CLOB");
-    
     testContColType("NCLOB");
+    */
 
     // Test with invalid CONTENT_COLUMN_TYPE for collection creation
     try {
@@ -1070,9 +1072,12 @@ private void testContentMaxLength(String contentSQLType) throws Exception {
   
   public void testContentMaxLength() throws Exception {
     
-    testContentMaxLength("NVARCHAR2");
     testContentMaxLength("VARCHAR2");
+
+    /* ### Oracle Database does not support NVARCHAR2 or RAW storage for JSON
+    testContentMaxLength("NVARCHAR2");
     testContentMaxLength("RAW");
+    */
     
     // Test about specifying CONTENT_MAX_LENGTH for "BLOB" type
     try { 
@@ -1120,6 +1125,7 @@ public void testContentMaxLength() throws Exception {
     }
     
     // Test about specifying CONTENT_MAX_LENGTH for "NCLOB" type
+    /* ### Oracle Database does not support NCLOB storage for JSON
     try { 
       OracleDocument mDoc6 = client.createMetadataBuilder()
           .keyColumnAssignmentMethod("CLIENT").contentColumnType("NCLOB")
@@ -1130,6 +1136,7 @@ public void testContentMaxLength() throws Exception {
       // Expect an OracleException
       assertEquals("A maximum length cannot be set for LOB types.", e.getMessage());
     }
+    */
 
   }
 
@@ -1157,7 +1164,7 @@ public void testKeyMetadata() throws Exception {
     
     // Test with key column type=NVARCHAR2 && max key length=512 && key method=GUID
     OracleDocument mDoc2 = client.createMetadataBuilder()
-        .contentColumnType("NVARCHAR2").contentColumnMaxLength(512)
+        .keyColumnType("NVARCHAR2").keyColumnMaxLength(512)
         .keyColumnAssignmentMethod("GUID").build();
     
     OracleCollection col2 = dbAdmin.createCollection("testKeyMetadata2", mDoc2);
@@ -1167,7 +1174,7 @@ public void testKeyMetadata() throws Exception {
     
     // Test with key column type=RAW && key method=UUID
     OracleDocument mDoc3 = client.createMetadataBuilder()
-        .contentColumnType("RAW").keyColumnAssignmentMethod("UUID").build();
+        .keyColumnType("RAW").keyColumnAssignmentMethod("UUID").build();
     
     OracleCollection col3 = dbAdmin.createCollection("testKeyMetadata3", mDoc3);
     OracleDocument doc3 = col3.insertAndGet(db.createDocumentFromString(null, "{ \"d\" : 3 }", null));
@@ -1368,7 +1375,10 @@ private void testBasicOperations(OracleCollection col) throws Exception {
   
   public void testSecureFileMetadata() throws Exception {
 
-    final String[] sqlTypes = { "BLOB", "CLOB", "NCLOB"};
+    // ### Oracle Database does not support NVARCHAR2 or NCLOB storage for JSON
+    //final String[] sqlTypes = { "BLOB", "CLOB", "NCLOB"};
+    
+    final String[] sqlTypes = { "BLOB", "CLOB"};
     final String[] compressions = { "NONE", "HIGH", "MEDIUM", "LOW"};
     final boolean[] cachings = {true, false};
     final String[] encryptions = {"3DES168", "AES128", "AES192", "AES256"};
@@ -1399,7 +1409,9 @@ public void testSecureFileMetadata() throws Exception {
       }
     } // end for "for lobTypes" loop
  
-    final String[] nonLobTypes = { "VARCHAR2", "NVARCHAR2", "RAW"};
+    // ### Oracle Database does not support NVARCHAR2 or RAW storage for JSON
+    //final String[] nonLobTypes = { "VARCHAR2", "NVARCHAR2", "RAW"};
+    final String[] nonLobTypes = { "VARCHAR2" };
     counter = 100;
     for (String nonLobType : nonLobTypes) {
       OracleDocument mDoc = client.createMetadataBuilder()
@@ -1431,6 +1443,7 @@ public void testSecureFileMetadata() throws Exception {
       assertEquals("SecureFile LOB settings cannot be used when the content column type is \"VARCHAR2\"", e.getMessage());
     } 
 
+    /* ### Oracle Database does not support NVARCHAR2 or RAW for JSON
     try {
       OracleDocument mDoc2 = client.createMetadataBuilder()
           .contentColumnType("NVARCHAR2")
@@ -1454,6 +1467,7 @@ public void testSecureFileMetadata() throws Exception {
       // Expect an OracleException  
       assertEquals("SecureFile LOB settings cannot be used when the content column type is \"RAW\"", e.getMessage());
     }
+    */
  
   }
 
diff --git a/test/src/oracle/json/tests/soda/test_OracleDocument2.java b/test/src/oracle/json/tests/soda/test_OracleDocument2.java
index 134c273..05a0b4a 100644
--- a/test/src/oracle/json/tests/soda/test_OracleDocument2.java
+++ b/test/src/oracle/json/tests/soda/test_OracleDocument2.java
@@ -525,7 +525,7 @@ public void testDocumentEncoding() throws Exception {
     OracleDocument meta = client.createMetadataBuilder()
         .keyColumnAssignmentMethod("CLIENT")
         .contentColumnType("BLOB")
-         .build();
+        .build();
     OracleDocument mDoc = db.createDocumentFromByteArray(null, meta.getContentAsString().getBytes(UTF8), null);
     OracleCollection col = dbAdmin.createCollection("testDocumentEncoding", mDoc);
     for (Charset c : CHARSETS) {
@@ -535,6 +535,7 @@ public void testDocumentEncoding() throws Exception {
     }
     
     // Test with RAW
+    /* ### Oracle Database does not support RAW storage for JSON
     OracleDocument meta2 = client.createMetadataBuilder()
         .keyColumnAssignmentMethod("CLIENT").contentColumnType("RAW").build();
     OracleDocument mDoc2 = db.createDocumentFromByteArray(null, 
@@ -547,6 +548,7 @@ public void testDocumentEncoding() throws Exception {
       if (c != UTF32 && c != UTF32LE && c != UTF32BE)
         basicTestForEncoding(c, col2);
     }
+    */
     
     // Test with VARCHAR2
     OracleDocument meta3 = client.createMetadataBuilder()
@@ -559,6 +561,7 @@ public void testDocumentEncoding() throws Exception {
     }
     
     // Test with NVARCHAR2
+    /* ### Oracle Database does not support NVARCHAR2 storage for JSON
     OracleDocument meta4 = client.createMetadataBuilder()
         .keyColumnAssignmentMethod("CLIENT").contentColumnType("NVARCHAR2").build();
     OracleDocument mDoc4 = db.createDocumentFromByteArray(null, 
@@ -567,6 +570,7 @@ public void testDocumentEncoding() throws Exception {
     for (Charset c : CHARSETS) {
       basicTestForEncoding(c, col4);
     }
+    */
 
     // Test with CLOB
     OracleDocument meta5 = client.createMetadataBuilder()
@@ -579,6 +583,7 @@ public void testDocumentEncoding() throws Exception {
     }
     
     // Test with NCLOB
+    /* ### Oracle Database does not support NCLOB storage for JSON
     OracleDocument meta6 = client.createMetadataBuilder()
         .keyColumnAssignmentMethod("CLIENT").contentColumnType("NCLOB").build();
     OracleDocument mDoc6 = db.createDocumentFromByteArray(null, 
@@ -587,7 +592,7 @@ public void testDocumentEncoding() throws Exception {
     for (Charset c : CHARSETS) {
       basicTestForEncoding(c, col6);
     }
-    
+    */ 
   }
 
   private void testlargeContentWithCol(OracleCollection col) throws Exception {
diff --git a/test/src/oracle/json/tests/soda/test_OracleOperationBuilder2.java b/test/src/oracle/json/tests/soda/test_OracleOperationBuilder2.java
index 5cebec9..a7dd2bc 100644
--- a/test/src/oracle/json/tests/soda/test_OracleOperationBuilder2.java
+++ b/test/src/oracle/json/tests/soda/test_OracleOperationBuilder2.java
@@ -652,7 +652,9 @@ private void testFilter3(String contentColumnType) throws Exception {
  }
  
   String[] columnSqlTypes = {
-      "CLOB", "NCLOB", "BLOB", "VARCHAR2", "NVARCHAR2", "RAW"
+      // ### Oracle Database does not support NVARCHAR2, NCLOB, and RAW storage for JSON 
+      //"CLOB", "NCLOB", "BLOB", "VARCHAR2", "NVARCHAR2", "RAW"
+      "CLOB", "BLOB", "VARCHAR2"
   };
   
   public void testFilter() throws Exception {
@@ -1894,7 +1896,9 @@ public void testReplaceOne() throws Exception {
     OracleDocument mDoc4 = client.createMetadataBuilder()
         .keyColumnAssignmentMethod("CLIENT")
         .versionColumnMethod("SHA256")
-        .contentColumnType("NVARCHAR2").build();
+        // ### Oracle Database does not support NVARCHAR2 storage for JSON
+        //.contentColumnType("NVARCHAR2").build();
+        .contentColumnType("VARCHAR2").build();
     OracleCollection col4 = dbAdmin.createCollection("testReplaceOne4", mDoc4);
     testReplaceOneWithCol(col4, true, false);
     
@@ -1902,7 +1906,9 @@ public void testReplaceOne() throws Exception {
     OracleDocument mDoc5 = client.createMetadataBuilder()
         .keyColumnAssignmentMethod("CLIENT")
         .versionColumnMethod("MD5")
-        .contentColumnType("RAW").build();
+        // ### Oracle Database does not support RAW storage for JSON
+        //.contentColumnType("RAW").build();
+        .contentColumnType("VARCHAR2").build();
     OracleCollection col5 = dbAdmin.createCollection("testReplaceOne5", mDoc5);
     testReplaceOneWithCol(col5, true, false);
     
@@ -1995,7 +2001,9 @@ public void testReplaceOneAndGet() throws Exception {
     OracleDocument mDoc5 = client.createMetadataBuilder()
         .keyColumnAssignmentMethod("CLIENT")
         .versionColumnMethod("SEQUENTIAL")
-        .contentColumnType("NCLOB").build();
+        // ### Oracle Database does not support NVARCHAR2, NCLOB, and RAW storage for JSON    
+        //.contentColumnType("NCLOB").build();
+        .contentColumnType("CLOB").build();
     OracleCollection col5 = dbAdmin.createCollection("testReplaceOneAndGet5", mDoc5);
     testReplaceOneWithCol(col5, true, true);
     
diff --git a/test/src/oracle/json/tests/soda/test_OracleSodaCache.java b/test/src/oracle/json/tests/soda/test_OracleSodaCache.java
index 5214c64..24d3fea 100644
--- a/test/src/oracle/json/tests/soda/test_OracleSodaCache.java
+++ b/test/src/oracle/json/tests/soda/test_OracleSodaCache.java
@@ -68,7 +68,7 @@ private void cacheTests2() throws Exception {
     assertNotNull(col2_1);
     assertEquals(existingColName1, col2_1.admin().getName());
 
-    OracleDocument metaDoc2_3 = client.createMetadataBuilder().contentColumnType("RAW").build();
+    OracleDocument metaDoc2_3 = client.createMetadataBuilder().contentColumnType("VARCHAR2").build();
     try {
       dbAdmin.createCollection(existingColName1, metaDoc2_3);
       fail("No exception when mismatch on collection metadata");