Updating scripted sql to 1.1.1.0-RC1, and making associated changes to config and work-arounds due to bug

9 files changed, 20 insertions, 15 deletions

diff --git a/pom.xml b/pom.xml
index 36ad88d..31cb510 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.forgerock.openicf.connectors</groupId>
             <artifactId>scriptedsql-connector</artifactId>
-            <version>1.1.0.1</version>
+            <version>1.1.1.0-RC1</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
diff --git a/src/main/resources/conf/provisioner.openicf-fiddles.json b/src/main/resources/conf/provisioner.openicf-fiddles.json
index 1ee335a..ebb3d9f 100644
--- a/src/main/resources/conf/provisioner.openicf-fiddles.json
+++ b/src/main/resources/conf/provisioner.openicf-fiddles.json
@@ -2,7 +2,7 @@
     "name" : "fiddles",
     "connectorRef" : {
         "bundleName" : "org.forgerock.openicf.connectors.scriptedsql-connector",
-        "bundleVersion" : "1.1.0.1",
+        "bundleVersion" : "1.1.1.0-RC1",
         "connectorName" : "org.forgerock.openicf.connectors.scriptedsql.ScriptedSQLConnector"
     },
     "producerBufferSize" : 100,
@@ -57,7 +57,7 @@
             "type" : "object",
             "nativeType" : "db_types",
             "properties" : {
-                "id" : {
+                "db_type_id" : {
                     "type" : "integer",
                     "required" : false,
                     "nativeName" : "__UID__",
@@ -125,10 +125,10 @@
             "type" : "object",
             "nativeType" : "schema_defs",
             "properties" : {
-                "id" : {
+                "schema_def_id" : {
                     "type" : "integer",
                     "required" : false,
-                    "nativeName" : "id",
+                    "nativeName" : "schema_def_id",
                     "nativeType" : "integer"
                 },
                 "db_type_id" : {
@@ -255,10 +255,10 @@
                     "nativeName" : "schema_def_id",
                     "nativeType" : "integer"
                 },
-                "id" : {
+                "query_id" : {
                     "type" : "integer",
                     "required" : false,
-                    "nativeName" : "id",
+                    "nativeName" : "query_id",
                     "nativeType" : "integer"
                 }
             }
diff --git a/src/main/resources/conf/provisioner.openicf-hosts.json b/src/main/resources/conf/provisioner.openicf-hosts.json
index c53d9c4..8f89382 100644
--- a/src/main/resources/conf/provisioner.openicf-hosts.json
+++ b/src/main/resources/conf/provisioner.openicf-hosts.json
@@ -2,7 +2,7 @@
     "name" : "hosts",
     "connectorRef" : {
         "bundleName" : "org.forgerock.openicf.connectors.scriptedsql-connector",
-        "bundleVersion" : "1.1.0.1",
+        "bundleVersion" : "1.1.1.0-RC1",
         "connectorName" : "org.forgerock.openicf.connectors.scriptedsql.ScriptedSQLConnector"
     },
     "producerBufferSize" : 100,
diff --git a/src/main/resources/conf/sync.json b/src/main/resources/conf/sync.json
index b9deb1c..816c743 100644
--- a/src/main/resources/conf/sync.json
+++ b/src/main/resources/conf/sync.json
@@ -7,7 +7,7 @@
             "sourceQuery" : {
                 "queryFilter" : "context eq \"host\" and minutes_since_last_used lt 30"
             },
-            "allowEmptySourceSet": true,
+            "allowEmptySourceSet" : true,
             "validSource" : {
                 "type" : "text/javascript",
                 "source" : "source.minutes_since_last_used < 30"
diff --git a/src/main/resources/script/executeQuery.groovy b/src/main/resources/script/executeQuery.groovy
index be6d32b..891c1e6 100644
--- a/src/main/resources/script/executeQuery.groovy
+++ b/src/main/resources/script/executeQuery.groovy
@@ -27,7 +27,7 @@ def m = openidm.create("system/fiddles/queries",
         "md5": "n/a",
         "sql": content.sql,
         "statement_separator": content.statement_separator,
-        "schema_def_id": schema_def.id
+        "schema_def_id": schema_def.schema_def_id
     ]
 )._id =~ /^\d+_\w+_(\d+)*$/
 
diff --git a/src/main/resources/script/loadContent.groovy b/src/main/resources/script/loadContent.groovy
index 091d9f5..b0dc669 100644
--- a/src/main/resources/script/loadContent.groovy
+++ b/src/main/resources/script/loadContent.groovy
@@ -19,7 +19,7 @@ if (fragment_parts.size() > 2) {
 
     response["query_statement_separator"] = query.statement_separator
     response["sql"] = query.sql
-    response["id"] = query.id
+    response["id"] = query.query_id
 
     response["sets"] = openidm.action("endpoint/executeQuery", "query", [
             "db_type_id": fragment_parts[0],
diff --git a/src/main/resources/tools/fiddles/SearchScript.groovy b/src/main/resources/tools/fiddles/SearchScript.groovy
index 820c907..db4e7df 100644
--- a/src/main/resources/tools/fiddles/SearchScript.groovy
+++ b/src/main/resources/tools/fiddles/SearchScript.groovy
@@ -64,11 +64,13 @@ def fieldMap = [
     "schema_defs": [
         "__NAME__": "s.id",
         "__UID__": "(s.db_type_id || '_' || s.short_code)",
+        "schema_def_id": "s.id",
         "last_used": "to_char(s.last_used, 'YYYY-MM-DD HH24:MI:SS.MS')",
         "minutes_since_last_used": "floor(EXTRACT(EPOCH FROM age(current_timestamp, last_used))/60)"
     ],
     "queries": [
         "__NAME__": "q.md5",
+        "query_id": "q.id",
         "__UID__": "(s.db_type_id || '_' || s.short_code || '_' || q.id)"
     ]
 ]
@@ -99,7 +101,9 @@ queryParser = { queryObj ->
             whereParams.push("%" + queryObj.get("right"))
         } else if (queryObj.get("operation") == "STARTSWITH") {
             whereParams.push(queryObj.get("right") + "%")
-        } else if (queryObj.get("left") == "minutes_since_last_used" || queryObj.get("left") == "schema_def_id") {
+        } else if (queryObj.get("left") == "minutes_since_last_used" || 
+                   queryObj.get("left") == "schema_def_id" ||
+                   (objectClass == "db_types" && queryObj.get("left") == "__UID__")) {
             whereParams.push(queryObj.get("right").toInteger())
         } else {
             whereParams.push(queryObj.get("right"))
@@ -155,7 +159,7 @@ switch ( objectClass ) {
         result.add([
             __NAME__:it.md5,
             __UID__: it.db_type_id + '_' + it.short_code,
-            id:it.id.toInteger(),
+            schema_def_id:it.id.toInteger(),
             db_type_id:it.db_type_id.toInteger(), 
             context: it.context,
             fragment: it.db_type_id + '_' + it.short_code,
@@ -192,7 +196,7 @@ switch ( objectClass ) {
             __UID__: it.db_type_id + '_' + it.short_code + '_' + it.id,
             fragment: it.db_type_id + '_' + it.short_code + '_' + it.id,
             md5: it.md5,
-            id:it.id.toInteger(),
+            query_id:it.id.toInteger(),
             schema_def_id:it.schema_def_id.toInteger(), 
             sql: it.sql,
             statement_separator:it.statement_separator
diff --git a/src/main/resources/tools/hosts/CreateScript.groovy b/src/main/resources/tools/hosts/CreateScript.groovy
index 9b255c7..e225a36 100644
--- a/src/main/resources/tools/hosts/CreateScript.groovy
+++ b/src/main/resources/tools/hosts/CreateScript.groovy
@@ -147,7 +147,7 @@ switch ( objectClass ) {
             } catch (e) {
                 hostConnection.close()
                 drop_script.tokenize(delimiter).each { adminHostConnection.execute(it) }
-                throw new ConnectorException(e.getMessage(), e)
+                throw new ConnectorException(e.getMessage())
             } finally {
                 hostConnection.close()
                 adminHostConnection.close()
diff --git a/src/main/resources/ui/sqlfiddle/www/javascript/fiddle_backbone/models/DBTypesList.js b/src/main/resources/ui/sqlfiddle/www/javascript/fiddle_backbone/models/DBTypesList.js
index 40a8e5f..1f2f725 100644
--- a/src/main/resources/ui/sqlfiddle/www/javascript/fiddle_backbone/models/DBTypesList.js
+++ b/src/main/resources/ui/sqlfiddle/www/javascript/fiddle_backbone/models/DBTypesList.js
@@ -13,6 +13,7 @@ define(["jQuery", "Backbone", "fiddle_backbone/models/DBType"], function ($, Bac
                 }
             }).then(function (qry) {
                 _this.reset(_.map(qry.result, function (r) {
+                    r.id = r.db_type_id;
                     return new DBType(r);
                 }));
                 return _this;