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 index 7f92345e3b..c804d52a37 100644 --- 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 @@ -59,7 +59,7 @@ public String getTransactionTriggerExpression(String defaultCatalog, String defa @Override public void createRequiredDatabaseObjects() { - String function = "sym_get_session_variable"; + String function = this.parameterService.getTablePrefix() + "_get_session_variable"; if(!installed(SQL_FUNCTION_INSTALLED, function)){ String sql = "create function $(functionName)(akey string) returns string " + " as " + @@ -73,7 +73,7 @@ public void createRequiredDatabaseObjects() { " END_FUNCTION;"; install(sql, function); } - function = "sym_set_session_variable"; + 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 " + @@ -93,12 +93,12 @@ public void createRequiredDatabaseObjects() { @Override public void dropRequiredDatabaseObjects() { - String function = "sym_get_session_variable"; + String function = this.parameterService.getTablePrefix() + "_get_session_variable"; if (installed(SQL_FUNCTION_INSTALLED, function)) { uninstall(SQL_DROP_FUNCTION, function); } - function = "sym_set_session_variable"; + function = this.parameterService.getTablePrefix() + "_set_session_variable"; if (installed(SQL_FUNCTION_INSTALLED, function)){ uninstall(SQL_DROP_FUNCTION, function); } @@ -134,20 +134,20 @@ public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String sc } public void disableSyncTriggers(ISqlTransaction transaction, String nodeId) { - transaction.prepareAndExecute("select sym_set_session_variable('" + SYNC_TRIGGERS_DISABLED_USER_VARIABLE + "', '1') from dual"); + transaction.prepareAndExecute("select " + this.parameterService.getTablePrefix() + "_set_session_variable('" + SYNC_TRIGGERS_DISABLED_USER_VARIABLE + "', '1') from dual"); if (nodeId != null) { transaction - .prepareAndExecute("select sym_set_session_variable('" + SYNC_TRIGGERS_DISABLED_NODE_VARIABLE + "','" + nodeId + "') from dual"); + .prepareAndExecute("select " + this.parameterService.getTablePrefix()+ "_set_session_variable('" + SYNC_TRIGGERS_DISABLED_NODE_VARIABLE + "','" + nodeId + "') from dual"); } } public void enableSyncTriggers(ISqlTransaction transaction) { - transaction.prepareAndExecute("select sym_set_session_variable('" + SYNC_TRIGGERS_DISABLED_USER_VARIABLE + "', null) from dual"); - transaction.prepareAndExecute("select sym_set_session_variable('" + SYNC_TRIGGERS_DISABLED_NODE_VARIABLE + "', null) from dual"); + transaction.prepareAndExecute("select " + this.parameterService.getTablePrefix() + "_set_session_variable('" + SYNC_TRIGGERS_DISABLED_USER_VARIABLE + "', null) from dual"); + transaction.prepareAndExecute("select " + this.parameterService.getTablePrefix() + "_set_session_variable('" + SYNC_TRIGGERS_DISABLED_NODE_VARIABLE + "', null) from dual"); } public String getSyncTriggersExpression() { - return "sym_get_session_variable('" + SYNC_TRIGGERS_DISABLED_USER_VARIABLE + "') is null"; + return this.parameterService.getTablePrefix()+ "_get_session_variable('" + SYNC_TRIGGERS_DISABLED_USER_VARIABLE + "') is null"; } public void cleanDatabase() { diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/nuodb/NuoDbTriggerTemplate.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/nuodb/NuoDbTriggerTemplate.java index 7b6fb77a4e..871fdf7da3 100644 --- a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/nuodb/NuoDbTriggerTemplate.java +++ b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/nuodb/NuoDbTriggerTemplate.java @@ -56,7 +56,7 @@ public NuoDbTriggerTemplate(ISymmetricDialect symmetricDialect) { " $(triggerHistoryId), \n" + " concat($(columns) \n" + " ), \n" + -" $(channelExpression), $(txIdExpression), sym_get_session_variable('sync_node_disabled'), \n" + +" $(channelExpression), $(txIdExpression), $(prefixName)_get_session_variable('sync_node_disabled'), \n" + " $(externalSelect), \n" + " CURRENT_TIMESTAMP \n" + " ); \n" + @@ -75,7 +75,7 @@ public NuoDbTriggerTemplate(ISymmetricDialect symmetricDialect) { " 'R', \n" + " $(triggerHistoryId), \n" + " $(newKeys), \n" + -" $(channelExpression), $(txIdExpression), sym_get_session_variable('sync_node_disabled'), \n" + +" $(channelExpression), $(txIdExpression), $(prefixName)_get_session_variable('sync_node_disabled'), \n" + " $(externalSelect), \n" + " CURRENT_TIMESTAMP \n" + " ); \n" + @@ -98,7 +98,7 @@ public NuoDbTriggerTemplate(ISymmetricDialect symmetricDialect) { " ), \n" + " concat($(columns)), \n" + " concat($(oldColumns)), \n" + -" $(channelExpression), $(txIdExpression), sym_get_session_variable('sync_node_disabled'), \n" + +" $(channelExpression), $(txIdExpression), $(prefixName)_get_session_variable('sync_node_disabled'), \n" + " $(externalSelect), \n" + " CURRENT_TIMESTAMP \n" + " ); \n" + @@ -121,7 +121,7 @@ public NuoDbTriggerTemplate(ISymmetricDialect symmetricDialect) { " ), \n" + " concat($(oldColumns) \n" + " ), \n" + -" $(channelExpression), $(txIdExpression), sym_get_session_variable('sync_node_disabled'), \n" + +" $(channelExpression), $(txIdExpression), $(prefixName)_get_session_variable('sync_node_disabled'), \n" + " $(externalSelect), \n" + " CURRENT_TIMESTAMP \n" + " ); \n" +