-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix pg17 compatibility with colllocale
pg17 renamed colliculocale to colllocale. Since the impacted code is new in powa 5, just use the new name everywhere rather than carry around the old name forever.
- Loading branch information
Showing
1 changed file
with
15 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -569,7 +569,7 @@ INSERT INTO @[email protected]_catalog_src_queries | |
true AS collisdeterministic, | ||
pg_encoding_to_char(collencoding) AS collencoding, collcollate, | ||
collctype, | ||
NULL::text AS colliculocale, NULL::text AS collicurules, | ||
NULL::text AS colllocale, NULL::text AS collicurules, | ||
NULL::text AS collversion | ||
FROM pg_catalog.pg_collation$$), | ||
-- pg_collation pg10+, collprovider and collversion added | ||
|
@@ -578,7 +578,7 @@ INSERT INTO @[email protected]_catalog_src_queries | |
true AS collisdeterministic, | ||
pg_encoding_to_char(collencoding) AS collencoding, collcollate, | ||
collctype, | ||
NULL::text AS colliculocale, NULL::text AS collicurules, | ||
NULL::text AS colllocale, NULL::text AS collicurules, | ||
collversion | ||
FROM pg_catalog.pg_collation$$), | ||
-- pg_collation pg12+, collisdeterministic added | ||
|
@@ -587,7 +587,7 @@ INSERT INTO @[email protected]_catalog_src_queries | |
collisdeterministic, | ||
pg_encoding_to_char(collencoding) AS collencoding, collcollate, | ||
collctype, | ||
NULL::text AS colliculocale, NULL::text AS collicurules, | ||
NULL::text AS colllocale, NULL::text AS collicurules, | ||
collversion | ||
FROM pg_catalog.pg_collation$$), | ||
-- pg_collation pg15+, colliculocale added | ||
|
@@ -596,7 +596,7 @@ INSERT INTO @[email protected]_catalog_src_queries | |
collisdeterministic, | ||
pg_encoding_to_char(collencoding) AS collencoding, collcollate, | ||
collctype, | ||
colliculocale, NULL::text AS collicurules, | ||
colliculocale AS colllocale, NULL::text AS collicurules, | ||
collversion | ||
FROM pg_catalog.pg_collation$$), | ||
-- pg_collation pg16+, collicurules added | ||
|
@@ -605,7 +605,16 @@ INSERT INTO @[email protected]_catalog_src_queries | |
collisdeterministic, | ||
pg_encoding_to_char(collencoding) AS collencoding, collcollate, | ||
collctype, | ||
colliculocale, collicurules, | ||
colliculocale AS colllocale, collicurules, | ||
collversion | ||
FROM pg_catalog.pg_collation$$), | ||
-- pg_collation pg16+, colliculocale renamed to colllocale | ||
('pg_collation', 170000, | ||
$$SELECT oid, collname::text AS collname, collnamespace, collprovider, | ||
collisdeterministic, | ||
pg_encoding_to_char(collencoding) AS collencoding, collcollate, | ||
collctype, | ||
colllocale, collicurules, | ||
collversion | ||
FROM pg_catalog.pg_collation$$), | ||
-- pg_proc | ||
|
@@ -834,7 +843,7 @@ CREATE TABLE @[email protected]_catalog_collation ( | |
collencoding text NOT NULL, | ||
collcollate text, | ||
collctype text, | ||
colliculocale text, | ||
colllocale text, | ||
collicurules text, | ||
collversion text, | ||
PRIMARY KEY (srvid, dbid, oid), | ||
|