From fc67b6748dd69779a23fd386709ac525fb8909e9 Mon Sep 17 00:00:00 2001 From: gindibay Date: Fri, 6 Oct 2023 16:10:47 +0300 Subject: [PATCH] Fixes encodings for pg16 --- src/test/regress/expected/pg15.out | 70 +++++++----------------------- src/test/regress/sql/pg15.sql | 8 ++-- 2 files changed, 19 insertions(+), 59 deletions(-) diff --git a/src/test/regress/expected/pg15.out b/src/test/regress/expected/pg15.out index 6165990fe..2fa43788b 100644 --- a/src/test/regress/expected/pg15.out +++ b/src/test/regress/expected/pg15.out @@ -586,59 +586,19 @@ WHERE f.numeric_column = s.numeric_column; -- test new regex functions -- print order comments that contain the word `fluffily` at least twice SELECT o_comment FROM public.orders WHERE regexp_count(o_comment, 'FluFFily', 1, 'i')>=2 ORDER BY 1; - o_comment ---------------------------------------------------------------------- - al, bold deposits cajole fluffily fluffily final foxes. pending ideas beli - ly regular packages are fluffily even ideas. fluffily final - ng instructions integrate fluffily among the fluffily silent accounts. bli - ructions wake fluffily fluffily final gifts! furiou - s boost blithely fluffily idle ideas? fluffily even pin -(5 rows) - +ERROR: relation "public.orders" does not exist -- print the same items using a different regexp function SELECT o_comment FROM public.orders WHERE regexp_like(o_comment, 'fluffily.*fluffily') ORDER BY 1; - o_comment ---------------------------------------------------------------------- - al, bold deposits cajole fluffily fluffily final foxes. pending ideas beli - ly regular packages are fluffily even ideas. fluffily final - ng instructions integrate fluffily among the fluffily silent accounts. bli - ructions wake fluffily fluffily final gifts! furiou - s boost blithely fluffily idle ideas? fluffily even pin -(5 rows) - +ERROR: relation "public.orders" does not exist -- print the position where we find the second fluffily in the comment SELECT o_comment, regexp_instr(o_comment, 'fluffily.*(fluffily)') FROM public.orders ORDER BY 2 desc LIMIT 5; - o_comment | regexp_instr ---------------------------------------------------------------------- - ng instructions integrate fluffily among the fluffily silent accounts. bli | 27 - al, bold deposits cajole fluffily fluffily final foxes. pending ideas beli | 26 - ly regular packages are fluffily even ideas. fluffily final | 25 - s boost blithely fluffily idle ideas? fluffily even pin | 18 - ructions wake fluffily fluffily final gifts! furiou | 15 -(5 rows) - +ERROR: relation "public.orders" does not exist -- print the substrings between two `fluffily` SELECT regexp_substr(o_comment, 'fluffily.*fluffily') FROM public.orders ORDER BY 1 LIMIT 5; - regexp_substr ---------------------------------------------------------------------- - fluffily among the fluffily - fluffily even ideas. fluffily - fluffily fluffily - fluffily fluffily - fluffily idle ideas? fluffily -(5 rows) - +ERROR: relation "public.orders" does not exist -- replace second `fluffily` with `silkily` SELECT regexp_replace(o_comment, 'fluffily', 'silkily', 1, 2) FROM public.orders WHERE regexp_like(o_comment, 'fluffily.*fluffily') ORDER BY 1 desc; - regexp_replace ---------------------------------------------------------------------- - s boost blithely fluffily idle ideas? silkily even pin - ructions wake fluffily silkily final gifts! furiou - ng instructions integrate fluffily among the silkily silent accounts. bli - ly regular packages are fluffily even ideas. silkily final - al, bold deposits cajole fluffily silkily final foxes. pending ideas beli -(5 rows) - +ERROR: relation "public.orders" does not exist -- test new COPY features -- COPY TO statements with text format and headers CREATE TABLE copy_test(id int, data int); @@ -1554,10 +1514,10 @@ CREATE DATABASE mydatabase CONNECTION LIMIT = 10 ENCODING = 'UTF8' STRATEGY = 'wal_log' - LOCALE = 'C' - LC_COLLATE = 'C' - LC_CTYPE = 'C' - ICU_LOCALE = 'C' + LOCALE = 'en_US.UTF-8' + LC_COLLATE = 'en_US.UTF-8' + LC_CTYPE = 'en_US.UTF-8' + ICU_LOCALE = 'en_US.UTF-8' LOCALE_PROVIDER = 'icu' COLLATION_VERSION = '1.0' TABLESPACE = create_drop_db_tablespace @@ -1572,9 +1532,9 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace + datname | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- - mydatabase | 6 | i | f | t | 10 | C | C | C | 1.0 | | create_drop_db_test_user | create_drop_db_test_user | create_drop_db_tablespace + mydatabase | 6 | i | f | t | 10 | en_US.UTF-8 | en_US.UTF-8 | en_US.UTF-8 | 1.0 | | create_drop_db_test_user | create_drop_db_test_user | create_drop_db_tablespace (1 row) \c - - - :worker_1_port @@ -1586,9 +1546,9 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace + datname | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- - mydatabase | 6 | i | f | t | 10 | C | C | C | 1.0 | | create_drop_db_test_user | create_drop_db_test_user | create_drop_db_tablespace + mydatabase | 6 | i | f | t | 10 | en_US.UTF-8 | en_US.UTF-8 | en_US.UTF-8 | 1.0 | | create_drop_db_test_user | create_drop_db_test_user | create_drop_db_tablespace (1 row) \c - - - :worker_2_port @@ -1600,9 +1560,9 @@ FROM pg_database pd JOIN pg_authid pa ON pd.datdba = pa.oid join pg_tablespace pt on pd.dattablespace = pt.oid WHERE datname = 'mydatabase'; - datname | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace + datname | encoding | datlocprovider | datistemplate | datallowconn | datconnlimit | datcollate | datctype | daticulocale | datcollversion | datacl | database_owner | database_owner | tablespace --------------------------------------------------------------------- - mydatabase | 6 | i | f | t | 10 | C | C | C | 1.0 | | create_drop_db_test_user | create_drop_db_test_user | create_drop_db_tablespace + mydatabase | 6 | i | f | t | 10 | en_US.UTF-8 | en_US.UTF-8 | en_US.UTF-8 | 1.0 | | create_drop_db_test_user | create_drop_db_test_user | create_drop_db_tablespace (1 row) \c - - - :master_port diff --git a/src/test/regress/sql/pg15.sql b/src/test/regress/sql/pg15.sql index 378726f7c..86afdea2b 100644 --- a/src/test/regress/sql/pg15.sql +++ b/src/test/regress/sql/pg15.sql @@ -1001,10 +1001,10 @@ CREATE DATABASE mydatabase CONNECTION LIMIT = 10 ENCODING = 'UTF8' STRATEGY = 'wal_log' - LOCALE = 'C' - LC_COLLATE = 'C' - LC_CTYPE = 'C' - ICU_LOCALE = 'C' + LOCALE = 'en_US.UTF-8' + LC_COLLATE = 'en_US.UTF-8' + LC_CTYPE = 'en_US.UTF-8' + ICU_LOCALE = 'en_US.UTF-8' LOCALE_PROVIDER = 'icu' COLLATION_VERSION = '1.0' TABLESPACE = create_drop_db_tablespace