Merge branch '3.8' of https://github.com/JumpMind/symmetric-ds into 3.8

JumpMind · Sep 9, 2016 · 1585fde · 1585fde
2 parents bae17c0 + 1c30161
commit 1585fde
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2SymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/db2/Db2SymmetricDialect.java
@@ -119,6 +119,8 @@ public BinaryEncoding getBinaryEncoding() {
     }
 
     public void enableSyncTriggers(ISqlTransaction transaction) {
+        transaction.prepareAndExecute("set " + parameterService.getTablePrefix() + VAR_TRIGGER_DISABLED + " = null");
+        transaction.prepareAndExecute("set " + getSourceNodeExpression() + " = null");
     }
 
     public void disableSyncTriggers(ISqlTransaction transaction, String nodeId) {

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/db/sqlite/SqliteSymmetricDialect.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/db/sqlite/SqliteSymmetricDialect.java
@@ -89,7 +89,7 @@ public void enableSyncTriggers(ISqlTransaction transaction) {
     public String getSyncTriggersExpression() {
         if (isBlank(sqliteFunctionToOverride)) {
             String contextTableName = parameterService.getTablePrefix() + "_" + TableConstants.SYM_CONTEXT;
-            return "(not exists (select value from " + contextTableName + " where name = '" + SYNC_TRIGGERS_DISABLED_USER_VARIABLE + "'))";
+            return "(not exists (select context_value from " + contextTableName + " where name = '" + SYNC_TRIGGERS_DISABLED_USER_VARIABLE + "'))";
         } else {
             return "(" + sqliteFunctionToOverride + "() not like 'DISABLED%')";
         }