Skip to content

Commit

Permalink
Fix pg17 compatibility with colllocale
Browse files Browse the repository at this point in the history
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
rjuju committed Jul 26, 2024
1 parent 3917b63 commit fd31214
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions powa--5.0.0dev.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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),
Expand Down

0 comments on commit fd31214

Please sign in to comment.