summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Herrera2021-10-20 16:05:42 +0000
committerAlvaro Herrera2021-10-20 16:05:42 +0000
commita73a3671daea34f244e1c51321d714be3200f2d9 (patch)
treebae212d9024b9a8c0cc2ed2f6ff68dd2c39b6d33
parentabb9ee92c5070d2b742aea9175c6a59ee403049f (diff)
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 11693c9e2ab..d54c7e3ffb3 100644
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -248,7 +248,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
@@ -262,7 +262,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
@@ -276,7 +276,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 690873732ce..42ec7347044 100644
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -242,7 +242,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;
@@ -250,7 +250,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;
@@ -258,7 +258,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;