From b2157ec9f71682bf4db59429e271860f33ed3e0c Mon Sep 17 00:00:00 2001 From: elong Date: Thu, 24 Mar 2016 12:43:50 -0400 Subject: [PATCH] 0002535: Some SQL has sym_ hardcoded in table name --- .../jumpmind/symmetric/db/mssql/MsSqlTriggerTemplate.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 index fa79bf06ec..c9e49e1d1f 100644 --- 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,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) { " fetch next from DataCursor into @DataRow $(newKeyVariables), @ChannelId \n" + " while @@FETCH_STATUS = 0 begin \n" + " insert into " + defaultCatalog + "$(defaultSchema)$(prefixName)_data (table_name, event_type, trigger_hist_id, row_data, channel_id, transaction_id, source_node_id, external_data, create_time) \n" + -" values('$(targetTableName)','I', $(triggerHistoryId), @DataRow, @ChannelId, $(txIdExpression), " + defaultCatalog + "dbo.sym_node_disabled(), $(externalSelect), current_timestamp) \n" + +" values('$(targetTableName)','I', $(triggerHistoryId), @DataRow, @ChannelId, $(txIdExpression), " + defaultCatalog + "dbo.($prefixName)_node_disabled(), $(externalSelect), current_timestamp) \n" + " fetch next from DataCursor into @DataRow $(newKeyVariables), @ChannelId \n" + " end \n" + " close DataCursor \n" + @@ -177,7 +177,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) { " while @@FETCH_STATUS = 0 begin \n" + " if ($(dataHasChangedCondition)) begin \n" + " insert into " + defaultCatalog + "$(defaultSchema)$(prefixName)_data (table_name, event_type, trigger_hist_id, row_data, pk_data, old_data, channel_id, transaction_id, source_node_id, external_data, create_time) \n" + -" values('$(targetTableName)','U', $(triggerHistoryId), @DataRow, @OldPk, @OldDataRow, @ChannelId, $(txIdExpression), " + defaultCatalog + "dbo.sym_node_disabled(), $(externalSelect), current_timestamp)\n" + +" values('$(targetTableName)','U', $(triggerHistoryId), @DataRow, @OldPk, @OldDataRow, @ChannelId, $(txIdExpression), " + defaultCatalog + "dbo.$(prefixName)_node_disabled(), $(externalSelect), current_timestamp)\n" + " end \n" + " fetch next from DeleteCursor into @OldPk, @OldDataRow $(oldKeyVariables) \n" + " fetch next from InsertCursor into @DataRow $(newKeyVariables), @ChannelId \n" + @@ -213,7 +213,7 @@ public MsSqlTriggerTemplate(ISymmetricDialect symmetricDialect) { " fetch next from DataCursor into @OldPk, @OldDataRow $(oldKeyVariables), @ChannelId \n" + " while @@FETCH_STATUS = 0 begin \n" + " insert into " + defaultCatalog + "$(defaultSchema)$(prefixName)_data (table_name, event_type, trigger_hist_id, pk_data, old_data, channel_id, transaction_id, source_node_id, external_data, create_time) \n" + -" values('$(targetTableName)','D', $(triggerHistoryId), @OldPk, @OldDataRow, @ChannelId, $(txIdExpression), " + defaultCatalog + "dbo.sym_node_disabled(), $(externalSelect), current_timestamp)\n" + +" values('$(targetTableName)','D', $(triggerHistoryId), @OldPk, @OldDataRow, @ChannelId, $(txIdExpression), " + defaultCatalog + "dbo.$(prefixName)_node_disabled(), $(externalSelect), current_timestamp)\n" + " fetch next from DataCursor into @OldPk,@OldDataRow $(oldKeyVariables), @ChannelId \n" + " end \n" + " close DataCursor \n" +