0003278: Fixes for NuoDB dialect

JumpMind · Oct 13, 2017 · 05cc777 · 05cc777
1 parent 14ecb26
commit 05cc777
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 28 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/nuodb/NuoDbSymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/nuodb/NuoDbSymmetricDialect.java
@@ -37,7 +37,7 @@ public class NuoDbSymmetricDialect extends AbstractSymmetricDialect implements I
 
     static final String SQL_DROP_FUNCTION = "drop function $(functionName)";
 
-    static final String SQL_FUNCTION_INSTALLED = "select count(*) from system.functions where functionname='$(functionName)' and schema in (select database() from system.dual)" ;
+    static final String SQL_FUNCTION_INSTALLED = "select count(*) from system.functions where functionname='$(functionName)' and schema in (select current_schema from system.dual)" ;
 
     static final String SYNC_TRIGGERS_DISABLED_USER_VARIABLE = "sync_triggers_disabled";
 
@@ -62,34 +62,35 @@ public String getTransactionTriggerExpression(String defaultCatalog, String defa
 
     @Override
     public void createRequiredDatabaseObjects() {
-        String function = this.parameterService.getTablePrefix() + "_get_session_variable";
-        if(!installed(SQL_FUNCTION_INSTALLED, function)){
-            String sql = "create function $(functionName)(akey string) returns string                                                        " + 
-                    " as                                                        " +
-                    " VAR l_out string = NULL;                                                        " + 
-                    " try                                                        " + 
-                    " l_out = (SELECT context_value from session_cache where name = akey);                                                        " + 
-                    " catch(error)                                                        " + 
-                    " create temp table if not exists session_cache (name string primary key, context_value string) on commit preserve rows;                                                        " + 
-                    " end_try;                                                        " + 
-                    " return l_out;                                                        " + 
-                    " END_FUNCTION;";
+        String function = parameterService.getTablePrefix() + "_get_session_variable";
+        if (!installed(SQL_FUNCTION_INSTALLED, function)) {
+            String sql = "create function $(functionName)(akey string) returns string as\n" + 
+                    "VAR l_out string = NULL;\n" + 
+                    "try\n" + 
+                    "l_out = (SELECT context_value from " + parameterService.getTablePrefix() + "_session_cache where name = akey);\n" + 
+                    "catch(error)\n" + 
+                    "create temp table if not exists " + parameterService.getTablePrefix() + "_session_cache\n" +
+                    "(name string primary key, context_value string) on commit preserve rows;\n" + 
+                    "end_try;\n" + 
+                    "return l_out;\n" + 
+                    "END_FUNCTION;";
             install(sql, function);
         }
-        function = this.parameterService.getTablePrefix() + "_set_session_variable";
-        if(!installed(SQL_FUNCTION_INSTALLED, function)){
-            String sql = "create function $(functionName)(akey string, avalue string) returns string                                                        " + 
-                    " as                                                        " +
-                    " VAR l_new string = NULL;                                                        " + 
-                    " try                                                        " + 
-                    " INSERT INTO session_cache (name, context_value) values (akey, avalue) ON DUPLICATE KEY UPDATE context_value = avalue;                                                        " + 
-                    " catch(error)                                                        " + 
-                    " create temp table if not exists session_cache (name string primary key, context_value string) on commit preserve rows;                                                        " + 
-                    " INSERT INTO session_cache VALUES (akey, avalue);                                                        "+
-                    " l_new = error;                                                        "+
-                    " end_try;                                                        " + 
-                    " return l_new;                                                        " + 
-                    " END_FUNCTION;";
+        function = parameterService.getTablePrefix() + "_set_session_variable";
+        if (!installed(SQL_FUNCTION_INSTALLED, function)) {
+            String sql = "create function $(functionName)(akey string, avalue string) returns string as\n" +
+                    "VAR l_new string = NULL;\n" + 
+                    "try\n" + 
+                    "INSERT INTO " + parameterService.getTablePrefix() + "_session_cache (name, context_value) \n" +
+                    "values (akey, avalue) ON DUPLICATE KEY UPDATE context_value = avalue;\n" + 
+                    "catch(error)\n" + 
+                    "create temp table if not exists " + parameterService.getTablePrefix() + "_session_cache\n" +
+                    "(name string primary key, context_value string) on commit preserve rows;\n" + 
+                    "INSERT INTO " + parameterService.getTablePrefix() + "_session_cache VALUES (akey, avalue);\n" +
+                    "l_new = error;\n"+
+                    "end_try;\n" + 
+                    "return l_new;\n" + 
+                    "END_FUNCTION;";
             install(sql, function);
         }
     }

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/nuodb/NuoDbDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/nuodb/NuoDbDdlBuilder.java
@@ -292,4 +292,7 @@ protected void processColumnChange(Table sourceTable, Table targetTable, Column
         printEndOfStatement(ddl);
     }
 
+    protected void writeColumnNullableStmt(StringBuilder ddl) {
+    }
+
 }
diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/nuodb/NuoDbDatabasePlatform.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/nuodb/NuoDbDatabasePlatform.java
@@ -73,7 +73,7 @@ public String getName() {
 
     public String getDefaultSchema() {
         if(StringUtils.isBlank(defaultSchema)){
-            defaultSchema = getSqlTemplate().queryForObject("select upper(database()) from dual", String.class);
+            defaultSchema = getSqlTemplate().queryForObject("select current_schema from system.dual", String.class);
         }
         return defaultSchema;
     }