8000 Fix tests for non-ICU build · postgres/postgres@3e623eb · GitHub
[go: up one dir, main page]
Skip to content

Commit 3e623eb

Browse files
peterepetere
committed
Fix tests for non-ICU build
missed in 0d21d4b
1 parent 0d21d4b commit 3e623eb

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

‎src/test/regress/expected/collate.icu.utf8.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44
/* skip test if not UTF8 server encoding or no ICU collations installed */
55
SELECT getdatabaseencoding() <> 'UTF8' OR
6-
(SELECT count(*) FROM pg_collation WHERE collprovider = 'i') = 0
6+
(SELECT count(*) FROM pg_collation WHERE collprovider = 'i' AND collname <> 'unicode') = 0
77
AS skip_test \gset
88
\if :skip_test
99
\quit

‎src/test/regress/expected/collate.icu.utf8_1.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*/
44
/* skip test if not UTF8 server encoding or no ICU collations installed */
55
SELECT getdatabaseencoding() <> 'UTF8' OR
6-
(SELECT count(*) FROM pg_collation WHERE collprovider = 'i') = 0
6+
(SELECT count(*) FROM pg_collation WHERE collprovider = 'i' AND collname <> 'unicode') = 0
77
AS skip_test \gset
88
\if :skip_test
99
\quit

‎src/test/regress/sql/collate.icu.utf8.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
/* skip test if not UTF8 server encoding or no ICU collations installed */
66
SELECT getdatabaseencoding() <> 'UTF8' OR
7-
(SELECT count(*) FROM pg_collation WHERE collprovider = 'i') = 0
7+
(SELECT count(*) FROM pg_collation WHERE collprovider = 'i' AND collname <> 'unicode') = 0
88
AS skip_test \gset
99
\if :skip_test
1010
\quit

0 commit comments

Comments
 (0)
0