0002032: Resolve table name in create trigger statement with default …

…catalog and schema if source catalog and schema are not specified
JumpMind · Oct 28, 2014 · 8717c74 · 8717c74
1 parent 29fe3d2
commit 8717c74
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlTriggerTemplate.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mssql/MsSqlTriggerTemplate.java
@@ -93,7 +93,8 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
 "     end                                                                                                                                                                  \n" +
 "     $(custom_on_insert_text)                                                                                                                                             \n" +
 "     if (@NCT = 0) set nocount off                                                                                                                                        \n" +
-"   end                                                                                                                                                                    " );
+"   end                                                                                                                                                                    \n" +
+"   go");
 
         sqlTemplates.put("updateTriggerTemplate" ,
 "create trigger $(triggerName) on $(schemaName)$(tableName) with execute as "+triggerExecuteAs+" after update as                                                                                                \n" +
@@ -132,7 +133,8 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
 "       end                                                                                                                                                                \n" +
 "       $(custom_on_update_text)                                                                                                                                             \n" +
 "     if (@NCT = 0) set nocount off                                                                                                                                        \n" +
-"     end                                                                                                                                                                  " );
+"   end                                                                                                                                                                    \n" +
+"   go");
 
         sqlTemplates.put("updateHandleKeyUpdatesTriggerTemplate" ,
 "create trigger $(triggerName) on $(schemaName)$(tableName) with execute as "+triggerExecuteAs+" after update as                                                                                                                             \n" +
@@ -179,7 +181,8 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
 "       end                                                                                                                                                                \n" +
 "       $(custom_on_update_text)                                                                                                                                             \n" +
 "     if (@NCT = 0) set nocount off                                                                                                                                        \n" +
-"     end                                                                                                                                                                  " );
+"   end                                                                                                                                                                    \n" +
+"   go");
 
         sqlTemplates.put("deleteTriggerTemplate" ,
 "create trigger $(triggerName) on $(schemaName)$(tableName) with execute as "+triggerExecuteAs+" after delete as                                                                                                                             \n" +
@@ -210,7 +213,8 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) {
 "    end                                                                                                                                                                  \n" +
 "    $(custom_on_delete_text)                                                                                                                                              \n" +
 "    if (@NCT = 0) set nocount off                                                                                                                                         \n" +
-"  end                                                                                                                                                                    " );
+"   end                                                                                                                                                                    \n" +
+"   go");
 
         sqlTemplates.put("initialLoadSqlTemplate" ,
 "select $(columns) from $(schemaName)$(tableName) t where $(whereClause) " );

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractTriggerTemplate.java
@@ -20,6 +20,7 @@
  */
 package org.jumpmind.symmetric.db;
 
+import static org.apache.commons.lang.StringUtils.isBlank;
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 import java.sql.Types;
@@ -247,6 +248,9 @@ protected String getSourceTablePrefix(Table table) {
                 + "." : "");
         String catalogPlus = (table.getCatalog() != null ? table.getCatalog() + "." : "")
                 + schemaPlus;
+        if (isBlank(catalogPlus)) {
+            catalogPlus = replaceDefaultSchemaAndCatalog(catalogPlus);
+        }
         return catalogPlus;
     }
 
@@ -256,6 +260,9 @@ protected String getSourceTablePrefix(TriggerHistory triggerHistory) {
         String catalogPlus = (triggerHistory.getSourceCatalogName() != null ? SymmetricUtils.quote(symmetricDialect, triggerHistory
                 .getSourceCatalogName()) + "." : "")
                 + schemaPlus;
+        if (isBlank(catalogPlus)) {
+            catalogPlus = replaceDefaultSchemaAndCatalog(catalogPlus);
+        }
         return catalogPlus;
     }