Protect against collation variations in test

Discussion: https://postgr.es/m/YW/[email protected]

diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index c9141f1d73ebe6818fe37ee171e9248169fcf2d1..c3b2b37067aa77f18d35639a1a33834bb4c0ce7b 100644 (file)
--- 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 1f0a3021f36e044a6d59c81530c700e841740e28..4ddbd16a4e7cd527a2252c98e6cbae5541e7d3f5 100644 (file)
--- 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;