Skip to content

Commit 04c8c5f

Browse files
mykolianmykolian
authored
Collate all parent names to the same default sql server collation (#2482)
1 parent f810618 commit 04c8c5f

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

‎src/Microsoft.SqlTools.SqlCore/SimpleObjectExplorer/ObjectExplorerModel.cs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ public static class ObjectExplorerModelQueries
444444
SELECT
445445
SCHEMA_NAME AS schema_name,
446446
SCHEMA_NAME AS object_name,
447-
CATALOG_NAME AS parent_name,
447+
CATALOG_NAME COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
448448
SCHEMA_NAME AS display_name,
449449
'Schema' AS object_type,
450450
NULL AS object_sub_type
@@ -473,7 +473,7 @@ SCHEMA_NAME NOT IN (
473473
SELECT
474474
s.name AS schema_name,
475475
t.name AS object_name,
476-
s.name AS parent_name,
476+
s.name COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
477477
t.name AS display_name,
478478
'Table' AS object_type,
479479
NULL AS object_sub_type
@@ -489,7 +489,7 @@ sys.tables t
489489
SELECT
490490
c.TABLE_SCHEMA AS schema_name,
491491
c.COLUMN_NAME AS object_name,
492-
c.TABLE_NAME AS parent_name,
492+
c.TABLE_NAME COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
493493
c.COLUMN_NAME +
494494
' (' +
495495
CASE
@@ -537,7 +537,7 @@ LEFT JOIN
537537
SELECT
538538
S.name AS schema_name,
539539
I.name AS object_name,
540-
O.name AS parent_name,
540+
O.name COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
541541
I.name + ' (' +
542542
CASE WHEN I.is_unique = 1 THEN 'Unique' ELSE 'Non-Unique' END +
543543
', ' +
@@ -565,7 +565,7 @@ Where I.name IS NOT NULL
565565
SELECT
566566
TABLE_SCHEMA AS schema_name,
567567
TABLE_NAME AS object_name,
568-
TABLE_SCHEMA AS parent_name,
568+
TABLE_SCHEMA COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
569569
TABLE_NAME AS display_name,
570570
'View' AS object_type,
571571
NULL AS object_sub_type
@@ -581,7 +581,7 @@ NULL AS object_sub_type
581581
SELECT
582582
SPECIFIC_SCHEMA AS schema_name,
583583
SPECIFIC_NAME AS object_name,
584-
SPECIFIC_SCHEMA AS parent_name,
584+
SPECIFIC_SCHEMA COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
585585
SPECIFIC_NAME AS display_name,
586586
'StoredProcedure' AS object_type,
587587
NULL AS object_sub_type
@@ -597,7 +597,7 @@ NULL AS object_sub_type
597597
SELECT
598598
S.name AS schema_name,
599599
P.name AS object_name,
600-
O.name AS parent_name,
600+
O.name COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
601601
P.name + ' (' + TP.name + ', ' +
602602
CASE WHEN P.is_output = 1 THEN 'Output' ELSE 'Input' END + ', ' +
603603
CASE WHEN P.has_default_value = 1 THEN 'Default' ELSE 'No default' END + ')'
@@ -618,7 +618,7 @@ sys.parameters AS P
618618
SELECT
619619
S.name AS schema_name,
620620
P.name AS object_name,
621-
S.name AS parent_name,
621+
S.name COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
622622
P.name AS display_name,
623623
'ScalarFunction' AS object_type,
624624
NULL AS object_sub_type
@@ -635,7 +635,7 @@ sys.schemas AS S
635635
SELECT
636636
S.name AS schema_name,
637637
P.name AS object_name,
638-
S.name AS parent_name,
638+
S.name COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
639639
P.name AS display_name,
640640
'TableValuedFunction' AS object_type,
641641
NULL AS object_sub_type
@@ -652,7 +652,7 @@ sys.schemas AS S
652652
SELECT
653653
s.name AS schema_name,
654654
t.name AS object_name,
655-
s.name AS parent_name,
655+
s.name COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
656656
t.name AS display_name,
657657
'Shortcut' AS object_type,
658658
NULL AS object_sub_type

‎src/Microsoft.SqlTools.SqlCore/SimpleObjectExplorer/ObjectExplorerModel.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
SELECT
5151
SCHEMA_NAME AS schema_name,
5252
SCHEMA_NAME AS object_name,
53-
CATALOG_NAME AS parent_name,
53+
CATALOG_NAME COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
5454
SCHEMA_NAME AS display_name,
5555
'Schema' AS object_type,
5656
NULL AS object_sub_type
@@ -92,7 +92,7 @@
9292
SELECT
9393
s.name AS schema_name,
9494
t.name AS object_name,
95-
s.name AS parent_name,
95+
s.name COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
9696
t.name AS display_name,
9797
'Table' AS object_type,
9898
NULL AS object_sub_type
@@ -118,7 +118,7 @@
118118
SELECT
119119
c.TABLE_SCHEMA AS schema_name,
120120
c.COLUMN_NAME AS object_name,
121-
c.TABLE_NAME AS parent_name,
121+
c.TABLE_NAME COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
122122
c.COLUMN_NAME +
123123
' (' +
124124
CASE
@@ -174,7 +174,7 @@
174174
SELECT
175175
S.name AS schema_name,
176176
I.name AS object_name,
177-
O.name AS parent_name,
177+
O.name COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
178178
I.name + ' (' +
179179
CASE WHEN I.is_unique = 1 THEN 'Unique' ELSE 'Non-Unique' END +
180180
', ' +
@@ -209,7 +209,7 @@
209209
SELECT
210210
TABLE_SCHEMA AS schema_name,
211211
TABLE_NAME AS object_name,
212-
TABLE_SCHEMA AS parent_name,
212+
TABLE_SCHEMA COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
213213
TABLE_NAME AS display_name,
214214
'View' AS object_type,
215215
NULL AS object_sub_type
@@ -235,7 +235,7 @@
235235
SELECT
236236
SPECIFIC_SCHEMA AS schema_name,
237237
SPECIFIC_NAME AS object_name,
238-
SPECIFIC_SCHEMA AS parent_name,
238+
SPECIFIC_SCHEMA COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
239239
SPECIFIC_NAME AS display_name,
240240
'StoredProcedure' AS object_type,
241241
NULL AS object_sub_type
@@ -260,7 +260,7 @@
260260
SELECT
261261
S.name AS schema_name,
262262
P.name AS object_name,
263-
O.name AS parent_name,
263+
O.name COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
264264
P.name + ' (' + TP.name + ', ' +
265265
CASE WHEN P.is_output = 1 THEN 'Output' ELSE 'Input' END + ', ' +
266266
CASE WHEN P.has_default_value = 1 THEN 'Default' ELSE 'No default' END + ')'
@@ -294,7 +294,7 @@
294294
SELECT
295295
S.name AS schema_name,
296296
P.name AS object_name,
297-
S.name AS parent_name,
297+
S.name COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
298298
P.name AS display_name,
299299
'ScalarFunction' AS object_type,
300300
NULL AS object_sub_type
@@ -322,7 +322,7 @@
322322
SELECT
323323
S.name AS schema_name,
324324
P.name AS object_name,
325-
S.name AS parent_name,
325+
S.name COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
326326
P.name AS display_name,
327327
'TableValuedFunction' AS object_type,
328328
NULL AS object_sub_type
@@ -348,7 +348,7 @@
348348
SELECT
349349
s.name AS schema_name,
350350
t.name AS object_name,
351-
s.name AS parent_name,
351+
s.name COLLATE SQL_Latin1_General_CP1_CI_AS AS parent_name,
352352
t.name AS display_name,
353353
'Shortcut' AS object_type,
354354
NULL AS object_sub_type

0 commit comments

Comments
 (0)