@@ -118,7 +118,7 @@ BEGIN
118
118
*/
119
119
DECLARE @our_columns internals .ColumnsTable
120
120
121
- INSERT INTO @our_columns (column_id, quotedName )
121
+ INSERT INTO @our_columns (column_id, quoted_name )
122
122
EXEC @retval = internals .GetColumns
123
123
@database_part = @our_database_part,
124
124
@schema = @our_schema,
@@ -132,7 +132,7 @@ BEGIN
132
132
*/
133
133
DECLARE @use_columns internals .ColumnsTable
134
134
135
- INSERT INTO @use_columns (column_id, quotedName )
135
+ INSERT INTO @use_columns (column_id, quoted_name )
136
136
EXEC @retval = internals .ProcessUseParam
137
137
@use = @use,
138
138
@our_columns = @our_columns,
@@ -145,7 +145,7 @@ BEGIN
145
145
*/
146
146
DECLARE @their_columns internals .ColumnsTable
147
147
148
- INSERT INTO @their_columns (column_id, quotedName )
148
+ INSERT INTO @their_columns (column_id, quoted_name )
149
149
EXEC @retval = internals .GetColumns
150
150
@database_part = @their_database_part,
151
151
@schema = @their_schema,
@@ -160,7 +160,7 @@ BEGIN
160
160
-- NB @mapped_columns contains local column id with mapped remote column name
161
161
DECLARE @mapped_columns internals .ColumnsTable
162
162
163
- INSERT INTO @mapped_columns (column_id, quotedName )
163
+ INSERT INTO @mapped_columns (column_id, quoted_name )
164
164
EXEC @retval = internals .ProcessMapParam
165
165
@map = @map,
166
166
@our_columns = @our_columns,
@@ -191,7 +191,7 @@ BEGIN
191
191
/*
192
192
* Use @join for join instead of table primary keys, if provided
193
193
*/
194
- INSERT INTO @key_columns (column_id, quotedName )
194
+ INSERT INTO @key_columns (column_id, quoted_name )
195
195
EXEC @retval = internals .ProcessJoinParam
196
196
@join = @join,
197
197
@use_columns = @use_columns,
@@ -204,7 +204,7 @@ BEGIN
204
204
/*
205
205
* Load our table primary key columns
206
206
*/
207
- INSERT INTO @key_columns (column_id, quotedName )
207
+ INSERT INTO @key_columns (column_id, quoted_name )
208
208
EXEC @retval = internals .GetPrimaryKeyColumns
209
209
@database_part = @our_database_part,
210
210
@schema = @our_schema,
@@ -244,7 +244,7 @@ BEGIN
244
244
245
245
SET @i = 0
246
246
SELECT
247
- @join_sql = @join_sql + CASE WHEN @i = 0 THEN ' ON' ELSE ' AND' END + ' [ours].' + kc .quotedName + ' = [theirs].' + m .quotedName + ' ' + @CRLF,
247
+ @join_sql = @join_sql + CASE WHEN @i = 0 THEN ' ON' ELSE ' AND' END + ' [ours].' + kc .quoted_name + ' = [theirs].' + m .quoted_name + ' ' + @CRLF,
248
248
@i = @i + 1
249
249
FROM @key_columns kc
250
250
INNER JOIN @mapped_columns m
@@ -265,13 +265,13 @@ BEGIN
265
265
IF @added_rows = 1 OR @changed_rows = 1
266
266
BEGIN
267
267
IF @import > 0
268
- INSERT INTO @identity_columns (column_id, quotedName )
268
+ INSERT INTO @identity_columns (column_id, quoted_name )
269
269
EXEC @retval = internals .GetIdentityColumns
270
270
@database_part = @our_database_part,
271
271
@schema = @our_schema,
272
272
@table = @our_table
273
273
ELSE
274
- INSERT INTO @identity_columns (column_id, quotedName )
274
+ INSERT INTO @identity_columns (column_id, quoted_name )
275
275
EXEC @retval = internals .GetIdentityColumns
276
276
@database_part = @their_database_part,
277
277
@schema = @their_schema,
@@ -300,7 +300,7 @@ BEGIN
300
300
301
301
SET @sql = @sql + ' INSERT INTO %0 (' + @CRLF
302
302
303
- SELECT @sql = @sql + @TAB + CASE WHEN @import > 0 THEN uc .quotedName ELSE m .quotedName END + ' ,' + @CRLF
303
+ SELECT @sql = @sql + @TAB + CASE WHEN @import > 0 THEN uc .quoted_name ELSE m .quoted_name END + ' ,' + @CRLF
304
304
FROM @use_columns uc
305
305
INNER JOIN @mapped_columns m
306
306
ON uc .column_id = m .column_id
@@ -311,7 +311,7 @@ BEGIN
311
311
312
312
SELECT @sql = @sql + ' SELECT' + @CRLF
313
313
314
- SELECT @sql = @sql + @TAB + ' %2.' + CASE WHEN @import > 0 THEN m .quotedName ELSE uc .quotedName END + ' ,' + @CRLF
314
+ SELECT @sql = @sql + @TAB + ' %2.' + CASE WHEN @import > 0 THEN m .quoted_name ELSE uc .quoted_name END + ' ,' + @CRLF
315
315
FROM @use_columns uc
316
316
INNER JOIN @mapped_columns m
317
317
ON uc .column_id = m .column_id
@@ -330,7 +330,7 @@ BEGIN
330
330
SELECT
331
331
@sql = @sql +
332
332
CASE WHEN @i = 0 THEN ' ' ELSE ' AND ' END +
333
- ' %1.' + CASE WHEN @import > 0 THEN kc .quotedName ELSE m .quotedName END + ' IS NULL' + @CRLF,
333
+ ' %1.' + CASE WHEN @import > 0 THEN kc .quoted_name ELSE m .quoted_name END + ' IS NULL' + @CRLF,
334
334
@i = @i + 1
335
335
FROM @key_columns kc
336
336
INNER JOIN @mapped_columns m
@@ -374,7 +374,7 @@ BEGIN
374
374
SELECT
375
375
@sql = @sql +
376
376
CASE WHEN @i = 0 THEN ' ' ELSE ' OR ' END +
377
- ' (%1.' + CASE WHEN @import > 0 THEN kc .quotedName ELSE m .quotedName END + ' IS NOT NULL AND %2.' + CASE WHEN @import > 0 THEN m .quotedName ELSE kc .quotedName END + ' IS NULL)' + @CRLF,
377
+ ' (%1.' + CASE WHEN @import > 0 THEN kc .quoted_name ELSE m .quoted_name END + ' IS NOT NULL AND %2.' + CASE WHEN @import > 0 THEN m .quoted_name ELSE kc .quoted_name END + ' IS NULL)' + @CRLF,
378
378
@i = @i + 1
379
379
FROM @key_columns kc
380
380
INNER JOIN @mapped_columns m
@@ -408,8 +408,8 @@ BEGIN
408
408
SELECT
409
409
@sql = @sql +
410
410
@TAB + CASE WHEN @i = 0 THEN ' SET ' ELSE @TAB END +
411
- CASE WHEN @import > 0 THEN uc .quotedName ELSE m .quotedName END + ' = ' +
412
- ' %2.' + CASE WHEN @import > 0 THEN m .quotedName ELSE uc .quotedName END +
411
+ CASE WHEN @import > 0 THEN uc .quoted_name ELSE m .quoted_name END + ' = ' +
412
+ ' %2.' + CASE WHEN @import > 0 THEN m .quoted_name ELSE uc .quoted_name END +
413
413
' ,' + @CRLF,
414
414
@i = @i + 1
415
415
FROM @use_columns uc
@@ -433,9 +433,9 @@ BEGIN
433
433
SELECT
434
434
@sql = @sql +
435
435
CASE WHEN @i = 0 THEN ' ' ELSE ' OR ' END +
436
- ' ([ours].' + uc .quotedName + ' IS NULL AND [theirs].' + m .quotedName + ' IS NOT NULL)' + @CRLF +
437
- ' OR ([ours].' + uc .quotedName + ' IS NOT NULL AND [theirs].' + m .quotedName + ' IS NULL)' + @CRLF +
438
- ' OR [ours].' + uc .quotedName + ' <> [theirs].' + m .quotedName + ' ' + @CRLF,
436
+ ' ([ours].' + uc .quoted_name + ' IS NULL AND [theirs].' + m .quoted_name + ' IS NOT NULL)' + @CRLF +
437
+ ' OR ([ours].' + uc .quoted_name + ' IS NOT NULL AND [theirs].' + m .quoted_name + ' IS NULL)' + @CRLF +
438
+ ' OR [ours].' + uc .quoted_name + ' <> [theirs].' + m .quoted_name + ' ' + @CRLF,
439
439
@i = @i + 1
440
440
FROM @use_columns uc
441
441
INNER JOIN @mapped_columns m
@@ -474,22 +474,22 @@ BEGIN
474
474
IF @interleave = 1
475
475
BEGIN
476
476
SELECT @sql = @sql +
477
- @TAB + ' [ours].' + uc .quotedName + ' AS [<<< ' + uc .quotedName + ' ],' + @CRLF +
478
- @TAB + ' [theirs].' + m .quotedName + ' AS [>>> ' + m .quotedName + ' ],' + @CRLF
477
+ @TAB + ' [ours].' + uc .quoted_name + ' AS [<<< ' + uc .quoted_name + ' ],' + @CRLF +
478
+ @TAB + ' [theirs].' + m .quoted_name + ' AS [>>> ' + m .quoted_name + ' ],' + @CRLF
479
479
FROM @use_columns uc
480
480
INNER JOIN @mapped_columns m
481
- ON u .column_id = m .column_id
481
+ ON uc .column_id = m .column_id
482
482
END
483
483
ELSE
484
484
BEGIN
485
485
SET @sql = @sql + ' '' OURS <<<'' AS [ ],' + @CRLF
486
486
487
- SELECT @sql = @sql + @TAB + ' [ours].' + quotedName + ' ,' + @CRLF
487
+ SELECT @sql = @sql + @TAB + ' [ours].' + quoted_name + ' ,' + @CRLF
488
488
FROM @our_columns
489
489
490
490
SET @sql = @sql + @TAB + ' '' THEIRS >>>'' AS [ ],' + @CRLF
491
491
492
- SELECT @sql = @sql + @TAB + ' [theirs].' + quotedName + ' ,' + @CRLF
492
+ SELECT @sql = @sql + @TAB + ' [theirs].' + quoted_name + ' ,' + @CRLF
493
493
FROM @their_columns
494
494
END
495
495
@@ -507,18 +507,18 @@ BEGIN
507
507
SELECT
508
508
@sql = @sql +
509
509
CASE WHEN @i = 0 THEN ' ' ELSE ' OR ' END +
510
- ' ([ours].' + kc .quotedName + ' IS NULL AND [theirs].' + m .quotedName + ' IS NOT NULL)' + @CRLF +
511
- ' OR ([ours].' + kc .quotedName + ' IS NOT NULL AND [theirs].' + m .quotedName + ' IS NULL)' + @CRLF,
510
+ ' ([ours].' + kc .quoted_name + ' IS NULL AND [theirs].' + m .quoted_name + ' IS NOT NULL)' + @CRLF +
511
+ ' OR ([ours].' + kc .quoted_name + ' IS NOT NULL AND [theirs].' + m .quoted_name + ' IS NULL)' + @CRLF,
512
512
@i = @i + 1
513
513
FROM @key_columns kc
514
514
INNER JOIN @mapped_columns m
515
515
ON kc .column_id = m .column_id
516
516
517
517
SELECT
518
518
@sql = @sql +
519
- ' OR ([ours].' + uc .quotedName + ' IS NULL AND [theirs].' + m .quotedName + ' IS NOT NULL)' + @CRLF +
520
- ' OR ([ours].' + uc .quotedName + ' IS NOT NULL AND [theirs].' + m .quotedName + ' IS NULL)' + @CRLF +
521
- ' OR [ours].' + uc .quotedName + ' <> [theirs].' + m .quotedName + ' ' + @CRLF
519
+ ' OR ([ours].' + uc .quoted_name + ' IS NULL AND [theirs].' + m .quoted_name + ' IS NOT NULL)' + @CRLF +
520
+ ' OR ([ours].' + uc .quoted_name + ' IS NOT NULL AND [theirs].' + m .quoted_name + ' IS NULL)' + @CRLF +
521
+ ' OR [ours].' + uc .quoted_name + ' <> [theirs].' + m .quoted_name + ' ' + @CRLF
522
522
FROM @use_columns uc
523
523
INNER JOIN @mapped_columns m
524
524
ON uc .column_id = m .column_id
0 commit comments