From 3e623ebc7a22444ad3d15b36ffa3273c47283e18 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 10 Mar 2023 14:27:55 +0100 Subject: [PATCH] Fix tests for non-ICU build missed in 0d21d4b9bc --- src/test/regress/expected/collate.icu.utf8.out | 2 +- src/test/regress/expected/collate.icu.utf8_1.out | 2 +- src/test/regress/sql/collate.icu.utf8.sql | 2 +- 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 -- 2.39.5