Skip to content

Commit

Permalink
0003278: Fixes for NuoDB dialect
Browse files Browse the repository at this point in the history
  • Loading branch information
@erilong
erilong committed Oct 12, 2017
1 parent 7a1456b commit 7b8dd10
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion symmetric-client/src/main/java/org/jumpmind/symmetric/db/nuodb/NuoDbSymmetricDialect.java
View file
Expand Up @@ -147,7 +147,7 @@ public void enableSyncTriggers(ISqlTransaction transaction) {
}

public String getSyncTriggersExpression() {
return this.parameterService.getTablePrefix()+ "_get_session_variable('" + SYNC_TRIGGERS_DISABLED_USER_VARIABLE + "') is null";
return "$(defaultSchema)" + parameterService.getTablePrefix()+ "_get_session_variable('" + SYNC_TRIGGERS_DISABLED_USER_VARIABLE + "') is null";
}

public void cleanDatabase() {
Expand Down
8 changes: 4 additions & 4 deletions symmetric-client/src/main/java/org/jumpmind/symmetric/db/nuodb/NuoDbTriggerTemplate.java
View file
Expand Up @@ -56,7 +56,7 @@ public NuoDbTriggerTemplate(ISymmetricDialect symmetricDialect) {
" $(triggerHistoryId), \n" +
" concat($(columns) \n" +
" ), \n" +
" $(channelExpression), $(txIdExpression), $(prefixName)_get_session_variable('sync_node_disabled'), \n" +
" $(channelExpression), $(txIdExpression), $(defaultSchema)$(prefixName)_get_session_variable('sync_node_disabled'), \n" +
" $(externalSelect), \n" +
" CURRENT_TIMESTAMP \n" +
" ); \n" +
Expand All @@ -75,7 +75,7 @@ public NuoDbTriggerTemplate(ISymmetricDialect symmetricDialect) {
" 'R', \n" +
" $(triggerHistoryId), \n" +
" $(newKeys), \n" +
" $(channelExpression), $(txIdExpression), $(prefixName)_get_session_variable('sync_node_disabled'), \n" +
" $(channelExpression), $(txIdExpression), $(defaultSchema)$(prefixName)_get_session_variable('sync_node_disabled'), \n" +
" $(externalSelect), \n" +
" CURRENT_TIMESTAMP \n" +
" ); \n" +
Expand All @@ -98,7 +98,7 @@ public NuoDbTriggerTemplate(ISymmetricDialect symmetricDialect) {
" ), \n" +
" concat($(columns)), \n" +
" concat($(oldColumns)), \n" +
" $(channelExpression), $(txIdExpression), $(prefixName)_get_session_variable('sync_node_disabled'), \n" +
" $(channelExpression), $(txIdExpression), $(defaultSchema)$(prefixName)_get_session_variable('sync_node_disabled'), \n" +
" $(externalSelect), \n" +
" CURRENT_TIMESTAMP \n" +
" ); \n" +
Expand All @@ -121,7 +121,7 @@ public NuoDbTriggerTemplate(ISymmetricDialect symmetricDialect) {
" ), \n" +
" concat($(oldColumns) \n" +
" ), \n" +
" $(channelExpression), $(txIdExpression), $(prefixName)_get_session_variable('sync_node_disabled'), \n" +
" $(channelExpression), $(txIdExpression), $(defaultSchema)$(prefixName)_get_session_variable('sync_node_disabled'), \n" +
" $(externalSelect), \n" +
" CURRENT_TIMESTAMP \n" +
" ); \n" +
Expand Down

0 comments on commit 7b8dd10

Please sign in to comment.