Skip to content

Commit c2a57ab

Browse files
authored
Merge pull request #18 from simelis/main
Fix collation conflict
2 parents 8ecbc87 + 297cd9b commit c2a57ab

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

NetStandard.SqlBulkHelpers/Database/SqlQueries/QueryDBTableSchemaBasicDetailsJson.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
AND t.TABLE_CATALOG = DB_NAME()
1313
AND t.TABLE_NAME = CASE
1414
WHEN @IsTempTable = 0 THEN @TableName
15-
ELSE (SELECT TOP (1) t.[name] FROM tempdb.sys.objects t WHERE t.[object_id] = OBJECT_ID(CONCAT(N'tempdb.[', @TableSchema, '].[', @TableName, ']')))
15+
ELSE (SELECT TOP (1) t.[name] FROM tempdb.sys.objects t WHERE t.[object_id] = OBJECT_ID(CONCAT(N'tempdb.[', @TableSchema, '].[', @TableName, ']'))) COLLATE DATABASE_DEFAULT
1616
END
1717
)
1818
SELECT
@@ -69,4 +69,4 @@
6969
))
7070
FROM TablesCte t
7171
ORDER BY t.TableName
72-
FOR JSON PATH, WITHOUT_ARRAY_WRAPPER
72+
FOR JSON PATH, WITHOUT_ARRAY_WRAPPER

NetStandard.SqlBulkHelpers/Database/SqlQueries/QueryDBTableSchemaExtendedDetailsJson.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
AND t.TABLE_CATALOG = DB_NAME()
1313
AND t.TABLE_NAME = CASE
1414
WHEN @IsTempTable = 0 THEN @TableName
15-
ELSE (SELECT TOP (1) t.[name] FROM tempdb.sys.objects t WHERE t.[object_id] = OBJECT_ID(CONCAT(N'tempdb.[', @TableSchema, '].[', @TableName, ']')))
15+
ELSE (SELECT TOP (1) t.[name] FROM tempdb.sys.objects t WHERE t.[object_id] = OBJECT_ID(CONCAT(N'tempdb.[', @TableSchema, '].[', @TableName, ']'))) COLLATE DATABASE_DEFAULT
1616
END
1717
)
1818
SELECT
@@ -243,4 +243,4 @@
243243
))
244244
FROM TablesCte t
245245
ORDER BY t.TableName
246-
FOR JSON PATH, WITHOUT_ARRAY_WRAPPER
246+
FOR JSON PATH, WITHOUT_ARRAY_WRAPPER

0 commit comments

Comments
 (0)