Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit638db07

Browse files
committed
Fix ICU tests for older ICU versions
Change the tests to use old-style ICU locale specifications so thatthey can run on older ICU versions.
1 parentc477c68 commit638db07

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,8 +1150,8 @@ SELECT 'Goldmann' < 'Götz' COLLATE "de-x-icu", 'Goldmann' > 'Götz' COLLATE tes
11501150
(1 row)
11511151

11521152
-- nondeterministic collations
1153-
CREATE COLLATION ctest_det (provider = icu, locale = 'und', deterministic = true);
1154-
CREATE COLLATION ctest_nondet (provider = icu, locale = 'und', deterministic = false);
1153+
CREATE COLLATION ctest_det (provider = icu, locale = '', deterministic = true);
1154+
CREATE COLLATION ctest_nondet (provider = icu, locale = '', deterministic = false);
11551155
CREATE TABLE test6 (a int, b text);
11561156
-- same string in different normal forms
11571157
INSERT INTO test6 VALUES (1, U&'\00E4bc');
@@ -1176,8 +1176,8 @@ SELECT * FROM test6 WHERE b = 'äbc' COLLATE ctest_nondet;
11761176
2 | äbc
11771177
(2 rows)
11781178

1179-
CREATE COLLATION case_sensitive (provider = icu, locale = 'und');
1180-
CREATE COLLATION case_insensitive (provider = icu, locale = 'und-u-ks-level2', deterministic = false);
1179+
CREATE COLLATION case_sensitive (provider = icu, locale = '');
1180+
CREATE COLLATION case_insensitive (provider = icu, locale = '@colStrength=secondary', deterministic = false);
11811181
SELECT 'abc' <= 'ABC' COLLATE case_sensitive, 'abc' >= 'ABC' COLLATE case_sensitive;
11821182
?column? | ?column?
11831183
----------+----------
@@ -1642,7 +1642,7 @@ SELECT * FROM outer_text WHERE (f1, f2) NOT IN (SELECT * FROM inner_text);
16421642
(2 rows)
16431643

16441644
-- accents
1645-
CREATE COLLATION ignore_accents (provider = icu, locale = 'und-u-ks-level1-kc-true', deterministic = false);
1645+
CREATE COLLATION ignore_accents (provider = icu, locale = '@colStrength=primary;colCaseLevel=yes', deterministic = false);
16461646
CREATE TABLE test4 (a int, b text);
16471647
INSERT INTO test4 VALUES (1, 'cote'), (2, 'côte'), (3, 'coté'), (4, 'côté');
16481648
SELECT * FROM test4 WHERE b = 'cote';

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,8 @@ SELECT 'Goldmann' < 'Götz' COLLATE "de-x-icu", 'Goldmann' > 'Götz' COLLATE tes
455455

456456
-- nondeterministic collations
457457

458-
CREATE COLLATION ctest_det (provider= icu, locale='und', deterministic= true);
459-
CREATE COLLATION ctest_nondet (provider= icu, locale='und', deterministic= false);
458+
CREATE COLLATION ctest_det (provider= icu, locale='', deterministic= true);
459+
CREATE COLLATION ctest_nondet (provider= icu, locale='', deterministic= false);
460460

461461
CREATETABLEtest6 (aint, btext);
462462
-- same string in different normal forms
@@ -466,8 +466,8 @@ SELECT * FROM test6;
466466
SELECT*FROM test6WHERE b='äbc' COLLATE ctest_det;
467467
SELECT*FROM test6WHERE b='äbc' COLLATE ctest_nondet;
468468

469-
CREATE COLLATION case_sensitive (provider= icu, locale='und');
470-
CREATE COLLATION case_insensitive (provider= icu, locale='und-u-ks-level2', deterministic= false);
469+
CREATE COLLATION case_sensitive (provider= icu, locale='');
470+
CREATE COLLATION case_insensitive (provider= icu, locale='@colStrength=secondary', deterministic= false);
471471

472472
SELECT'abc'<='ABC' COLLATE case_sensitive,'abc'>='ABC' COLLATE case_sensitive;
473473
SELECT'abc'<='ABC' COLLATE case_insensitive,'abc'>='ABC' COLLATE case_insensitive;
@@ -602,7 +602,7 @@ INSERT INTO inner_text VALUES ('a', NULL);
602602
SELECT*FROM outer_textWHERE (f1, f2) NOTIN (SELECT*FROM inner_text);
603603

604604
-- accents
605-
CREATE COLLATION ignore_accents (provider= icu, locale='und-u-ks-level1-kc-true', deterministic= false);
605+
CREATE COLLATION ignore_accents (provider= icu, locale='@colStrength=primary;colCaseLevel=yes', deterministic= false);
606606

607607
CREATETABLEtest4 (aint, btext);
608608
INSERT INTO test4VALUES (1,'cote'), (2,'côte'), (3,'coté'), (4,'côté');

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp