Make sure triggers are installed on sym tables.

JumpMind · Oct 30, 2015 · 479b506 · 479b506
1 parent 025f1fa
commit 479b506
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/symmetric-client-clib/src/common/TableConstants.c b/symmetric-client-clib/src/common/TableConstants.c
@@ -29,23 +29,10 @@ SymList * SymTableConstants_getConfigTables() {
     list->add(list, SYM_NODE_SECURITY);
     list->add(list, SYM_PARAMETER);
     list->add(list, SYM_CHANNEL);
-    list->add(list, SYM_NODE_GROUP_CHANNEL_WND);
     list->add(list, SYM_TRIGGER);
     list->add(list, SYM_ROUTER);
     list->add(list, SYM_TRIGGER_ROUTER);
-    list->add(list, SYM_TRANSFORM_TABLE);
-    list->add(list, SYM_LOAD_FILTER);
-    list->add(list, SYM_TRANSFORM_COLUMN);
-    list->add(list, SYM_CONFLICT);
-    list->add(list, SYM_TABLE_RELOAD_REQUEST);
-    list->add(list, SYM_GROUPLET);
-    list->add(list, SYM_GROUPLET_LINK);
-    list->add(list, SYM_TRIGGER_ROUTER_GROUPLET);
-    list->add(list, SYM_FILE_TRIGGER);
-    list->add(list, SYM_FILE_TRIGGER_ROUTER);
-    list->add(list, SYM_FILE_SNAPSHOT);
     list->add(list, SYM_NODE_IDENTITY);
-    list->add(list, SYM_EXTENSION);
     return list;
 }
 

diff --git a/symmetric-client-clib/src/db/platform/sqlite/SqliteTriggerTemplate.c b/symmetric-client-clib/src/db/platform/sqlite/SqliteTriggerTemplate.c
@@ -115,7 +115,7 @@ char * SymSqliteTriggerTemplate_replaceTemplateVariables(SymSqliteTriggerTemplat
     char *oldKeys = SymSqliteTriggerTemplate_buildColumnsString(this, SYM_ORIG_TABLE_ALIAS,
             "old", "", primaryKeyColumns, dml, 1, channel, trigger);
     char *oldColumns = trigger->useCaptureOldData ? SymSqliteTriggerTemplate_buildColumnsString(this, SYM_ORIG_TABLE_ALIAS,
-            "old", "old", table->columns, dml, 1, channel, trigger) : "null";
+            "old", "old", table->columns, dml, 1, channel, trigger) : SymStringUtils_format("%s", "null");
     char *columns = SymSqliteTriggerTemplate_buildColumnsString(this, SYM_ORIG_TABLE_ALIAS,
             "new", "", table->columns, dml, 0, channel, trigger);
     char *channelExpression = SymStringUtils_format("'%s'", trigger->channelId); // TODO

diff --git a/symmetric-client-clib/src/service/TriggerRouterService.c b/symmetric-client-clib/src/service/TriggerRouterService.c
@@ -822,6 +822,9 @@ void SymTriggerRouterService_syncTriggers(SymTriggerRouterService *this, unsigne
     if (autoSyncTriggers) {
         SymLog_info("Synchronizing triggers");
         SymList *triggers = SymTriggerRouterService_getTriggersToSync(this);
+        SymList *symmetricTableTriggers = buildTriggersForSymmetricTables(this, NULL);
+        triggers->addAll(triggers, symmetricTableTriggers);
+
         SymList *activeTriggerHistories = SymTriggerRouterService_getActiveTriggerHistories(this);
         SymTriggerRouterService_inactivateTriggers(this, triggers, activeTriggerHistories);
         int i;