summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut2023-03-10 13:27:55 +0000
committerPeter Eisentraut2023-03-10 13:27:55 +0000
commit3e623ebc7a22444ad3d15b36ffa3273c47283e18 (patch)
treed64720858d95400b541c93a6bf4199c5c44aa7c7 /src
parent0d21d4b9bc1f9da9dda29e5c4db0c6dd45408aaa (diff)
Fix tests for non-ICU build
missed in 0d21d4b9bc
Diffstat (limited to 'src')
-rw-r--r--src/test/regress/expected/collate.icu.utf8.out2
-rw-r--r--src/test/regress/expected/collate.icu.utf8_1.out2
-rw-r--r--src/test/regress/sql/collate.icu.utf8.sql2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/regress/expected/collate.icu.utf8.out b/src/test/regress/expected/collate.icu.utf8.out
index 04c3aa14d2..9a3e12e42d 100644
--- a/src/test/regress/expected/collate.icu.utf8.out
+++ b/src/test/regress/expected/collate.icu.utf8.out
@@ -3,7 +3,7 @@
*/
/* skip test if not UTF8 server encoding or no ICU collations installed */
SELECT getdatabaseencoding() <> 'UTF8' OR
- (SELECT count(*) FROM pg_collation WHERE collprovider = 'i') = 0
+ (SELECT count(*) FROM pg_collation WHERE collprovider = 'i' AND collname <> 'unicode') = 0
AS skip_test \gset
\if :skip_test
\quit
diff --git a/src/test/regress/expected/collate.icu.utf8_1.out b/src/test/regress/expected/collate.icu.utf8_1.out
index a6a33b39ab..25c99c4abf 100644
--- a/src/test/regress/expected/collate.icu.utf8_1.out
+++ b/src/test/regress/expected/collate.icu.utf8_1.out
@@ -3,7 +3,7 @@
*/
/* skip test if not UTF8 server encoding or no ICU collations installed */
SELECT getdatabaseencoding() <> 'UTF8' OR
- (SELECT count(*) FROM pg_collation WHERE collprovider = 'i') = 0
+ (SELECT count(*) FROM pg_collation WHERE collprovider = 'i' AND collname <> 'unicode') = 0
AS skip_test \gset
\if :skip_test
\quit
diff --git a/src/test/regress/sql/collate.icu.utf8.sql b/src/test/regress/sql/collate.icu.utf8.sql
index 4786d65a08..0790068f31 100644
--- a/src/test/regress/sql/collate.icu.utf8.sql
+++ b/src/test/regress/sql/collate.icu.utf8.sql
@@ -4,7 +4,7 @@
/* skip test if not UTF8 server encoding or no ICU collations installed */
SELECT getdatabaseencoding() <> 'UTF8' OR
- (SELECT count(*) FROM pg_collation WHERE collprovider = 'i') = 0
+ (SELECT count(*) FROM pg_collation WHERE collprovider = 'i' AND collname <> 'unicode') = 0
AS skip_test \gset
\if :skip_test
\quit