aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera <alvherre@alvh.no-ip.org>2021-10-20 13:05:42 -0300
committerAlvaro Herrera <alvherre@alvh.no-ip.org>2021-10-20 13:05:42 -0300
commitcd124d205c42a623b68cd155ace94cc376851b78 (patch)
tree50c33cc620aa5013cb1b5ee6c57d680a45c31c6e
parent41f30ecc29c89285d3eecd435906c4e9cb048be4 (diff)
downloadpostgresql-cd124d205c42a623b68cd155ace94cc376851b78.tar.gz
postgresql-cd124d205c42a623b68cd155ace94cc376851b78.zip
Protect against collation variations in test
Discussion: https://postgr.es/m/YW/MYdSRQZtPFBWR@paquier.xyz
-rw-r--r--src/test/regress/expected/alter_table.out6
-rw-r--r--src/test/regress/sql/alter_table.sql6
2 files changed, 6 insertions, 6 deletions
diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index c9141f1d73e..c3b2b37067a 100644
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -243,7 +243,7 @@ ALTER INDEX alter_idx_rename_test_parted RENAME TO alter_idx_rename_test_parted_
SELECT relation::regclass, mode FROM pg_locks
WHERE pid = pg_backend_pid() AND locktype = 'relation'
AND relation::regclass::text LIKE 'alter\_idx%'
-ORDER BY relation::regclass::text;
+ORDER BY relation::regclass::text COLLATE "C";
relation | mode
--------------------------------+---------------------
alter_idx_rename_test_2 | AccessExclusiveLock
@@ -257,7 +257,7 @@ ALTER INDEX alter_idx_rename_test_parted_idx RENAME TO alter_idx_rename_test_par
SELECT relation::regclass, mode FROM pg_locks
WHERE pid = pg_backend_pid() AND locktype = 'relation'
AND relation::regclass::text LIKE 'alter\_idx%'
-ORDER BY relation::regclass::text;
+ORDER BY relation::regclass::text COLLATE "C";
relation | mode
------------------------------------+--------------------------
alter_idx_rename_test_idx_2 | ShareUpdateExclusiveLock
@@ -271,7 +271,7 @@ ALTER TABLE alter_idx_rename_test_parted_idx_2 RENAME TO alter_idx_rename_test_p
SELECT relation::regclass, mode FROM pg_locks
WHERE pid = pg_backend_pid() AND locktype = 'relation'
AND relation::regclass::text LIKE 'alter\_idx%'
-ORDER BY relation::regclass::text;
+ORDER BY relation::regclass::text COLLATE "C";
relation | mode
------------------------------------+---------------------
alter_idx_rename_test_idx_3 | AccessExclusiveLock
diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
index 1f0a3021f36..4ddbd16a4e7 100644
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -238,7 +238,7 @@ ALTER INDEX alter_idx_rename_test_parted RENAME TO alter_idx_rename_test_parted_
SELECT relation::regclass, mode FROM pg_locks
WHERE pid = pg_backend_pid() AND locktype = 'relation'
AND relation::regclass::text LIKE 'alter\_idx%'
-ORDER BY relation::regclass::text;
+ORDER BY relation::regclass::text COLLATE "C";
COMMIT;
BEGIN;
ALTER INDEX alter_idx_rename_test_idx RENAME TO alter_idx_rename_test_idx_2;
@@ -246,7 +246,7 @@ ALTER INDEX alter_idx_rename_test_parted_idx RENAME TO alter_idx_rename_test_par
SELECT relation::regclass, mode FROM pg_locks
WHERE pid = pg_backend_pid() AND locktype = 'relation'
AND relation::regclass::text LIKE 'alter\_idx%'
-ORDER BY relation::regclass::text;
+ORDER BY relation::regclass::text COLLATE "C";
COMMIT;
BEGIN;
ALTER TABLE alter_idx_rename_test_idx_2 RENAME TO alter_idx_rename_test_idx_3;
@@ -254,7 +254,7 @@ ALTER TABLE alter_idx_rename_test_parted_idx_2 RENAME TO alter_idx_rename_test_p
SELECT relation::regclass, mode FROM pg_locks
WHERE pid = pg_backend_pid() AND locktype = 'relation'
AND relation::regclass::text LIKE 'alter\_idx%'
-ORDER BY relation::regclass::text;
+ORDER BY relation::regclass::text COLLATE "C";
COMMIT;
DROP TABLE alter_idx_rename_test_2;