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

Commit8987c11

Browse files
committed
Alter regression test cases that rely on the sort order of "aa". Some
locales (da_DK, fo_FO, kl_GL, nb_NO, nn_NO in glibc) sort "aa" after "z".
1 parent2b01cbe commit8987c11

File tree

8 files changed

+78
-78
lines changed

8 files changed

+78
-78
lines changed

‎src/test/regress/expected/alter_table.out‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1262,34 +1262,34 @@ NOTICE: drop cascades to table c1
12621262
-- its datatype
12631263
create domain mytype as text;
12641264
create temp table foo (f1 text, f2 mytype, f3 text);
1265-
insert into foo values('aa','bb','cc');
1265+
insert into foo values('bb','cc','dd');
12661266
select * from foo;
12671267
f1 | f2 | f3
12681268
----+----+----
1269-
aa |bb |cc
1269+
bb |cc |dd
12701270
(1 row)
12711271

12721272
drop domain mytype cascade;
12731273
NOTICE: drop cascades to table foo column f2
12741274
select * from foo;
12751275
f1 | f3
12761276
----+----
1277-
aa |cc
1277+
bb |dd
12781278
(1 row)
12791279

12801280
insert into foo values('qq','rr');
12811281
select * from foo;
12821282
f1 | f3
12831283
----+----
1284-
aa |cc
1284+
bb |dd
12851285
qq | rr
12861286
(2 rows)
12871287

12881288
update foo set f3 = 'zz';
12891289
select * from foo;
12901290
f1 | f3
12911291
----+----
1292-
aa | zz
1292+
bb | zz
12931293
qq | zz
12941294
(2 rows)
12951295

‎src/test/regress/expected/join.out‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,20 +1854,20 @@ SELECT '' AS "xxx", *
18541854
CREATE TABLE t1 (name TEXT, n INTEGER);
18551855
CREATE TABLE t2 (name TEXT, n INTEGER);
18561856
CREATE TABLE t3 (name TEXT, n INTEGER);
1857-
INSERT INTO t1 VALUES ( 'aa', 11 );
1858-
INSERT INTO t2 VALUES ( 'aa', 12 );
1859-
INSERT INTO t2 VALUES ( 'bb', 22 );
1860-
INSERT INTO t2 VALUES ( 'dd', 42 );
1861-
INSERT INTO t3 VALUES ( 'aa', 13 );
1862-
INSERT INTO t3 VALUES ( 'bb', 23 );
1863-
INSERT INTO t3 VALUES ( 'cc', 33 );
1857+
INSERT INTO t1 VALUES ( 'bb', 11 );
1858+
INSERT INTO t2 VALUES ( 'bb', 12 );
1859+
INSERT INTO t2 VALUES ( 'cc', 22 );
1860+
INSERT INTO t2 VALUES ( 'ee', 42 );
1861+
INSERT INTO t3 VALUES ( 'bb', 13 );
1862+
INSERT INTO t3 VALUES ( 'cc', 23 );
1863+
INSERT INTO t3 VALUES ( 'dd', 33 );
18641864
SELECT * FROM t1 FULL JOIN t2 USING (name) FULL JOIN t3 USING (name);
18651865
name | n | n | n
18661866
------+----+----+----
1867-
aa | 11 | 12 | 13
1868-
bb | | 22 | 23
1869-
cc | | | 33
1870-
dd | | 42 |
1867+
bb | 11 | 12 | 13
1868+
cc | | 22 | 23
1869+
dd | | | 33
1870+
ee | | 42 |
18711871
(4 rows)
18721872

18731873
--
@@ -1881,8 +1881,8 @@ INNER JOIN
18811881
USING (name);
18821882
name | n | n
18831883
------+----+----
1884-
aa | 12 | 13
1885-
bb | 22 | 23
1884+
bb | 12 | 13
1885+
cc | 22 | 23
18861886
(2 rows)
18871887

18881888
SELECT * FROM
@@ -1892,9 +1892,9 @@ LEFT JOIN
18921892
USING (name);
18931893
name | n | n
18941894
------+----+----
1895-
aa | 12 | 13
1896-
bb | 22 | 23
1897-
dd | 42 |
1895+
bb | 12 | 13
1896+
cc | 22 | 23
1897+
ee | 42 |
18981898
(3 rows)
18991899

19001900
SELECT * FROM
@@ -1904,10 +1904,10 @@ FULL JOIN
19041904
USING (name);
19051905
name | n | n
19061906
------+----+----
1907-
aa | 12 | 13
1908-
bb | 22 | 23
1909-
cc | | 33
1910-
dd | 42 |
1907+
bb | 12 | 13
1908+
cc | 22 | 23
1909+
dd | | 33
1910+
ee | 42 |
19111911
(4 rows)
19121912

19131913
-- Cases with non-nullable expressions in subquery results;
@@ -1918,8 +1918,8 @@ NATURAL INNER JOIN
19181918
(SELECT name, n as s3_n, 3 as s3_2 FROM t3) s3;
19191919
name | s2_n | s2_2 | s3_n | s3_2
19201920
------+------+------+------+------
1921-
aa | 12 | 2 | 13 | 3
1922-
bb | 22 | 2 | 23 | 3
1921+
bb | 12 | 2 | 13 | 3
1922+
cc | 22 | 2 | 23 | 3
19231923
(2 rows)
19241924

19251925
SELECT * FROM
@@ -1928,9 +1928,9 @@ NATURAL LEFT JOIN
19281928
(SELECT name, n as s3_n, 3 as s3_2 FROM t3) s3;
19291929
name | s2_n | s2_2 | s3_n | s3_2
19301930
------+------+------+------+------
1931-
aa | 12 | 2 | 13 | 3
1932-
bb | 22 | 2 | 23 | 3
1933-
dd | 42 | 2 | |
1931+
bb | 12 | 2 | 13 | 3
1932+
cc | 22 | 2 | 23 | 3
1933+
ee | 42 | 2 | |
19341934
(3 rows)
19351935

19361936
SELECT * FROM
@@ -1939,10 +1939,10 @@ NATURAL FULL JOIN
19391939
(SELECT name, n as s3_n, 3 as s3_2 FROM t3) s3;
19401940
name | s2_n | s2_2 | s3_n | s3_2
19411941
------+------+------+------+------
1942-
aa | 12 | 2 | 13 | 3
1943-
bb | 22 | 2 | 23 | 3
1944-
cc | | | 33 | 3
1945-
dd | 42 | 2 | |
1942+
bb | 12 | 2 | 13 | 3
1943+
cc | 22 | 2 | 23 | 3
1944+
dd | | | 33 | 3
1945+
ee | 42 | 2 | |
19461946
(4 rows)
19471947

19481948
SELECT * FROM
@@ -1953,7 +1953,7 @@ NATURAL INNER JOIN
19531953
(SELECT name, n as s3_n, 3 as s3_2 FROM t3) s3;
19541954
name | s1_n | s1_1 | s2_n | s2_2 | s3_n | s3_2
19551955
------+------+------+------+------+------+------
1956-
aa | 11 | 1 | 12 | 2 | 13 | 3
1956+
bb | 11 | 1 | 12 | 2 | 13 | 3
19571957
(1 row)
19581958

19591959
SELECT * FROM
@@ -1964,10 +1964,10 @@ NATURAL FULL JOIN
19641964
(SELECT name, n as s3_n, 3 as s3_2 FROM t3) s3;
19651965
name | s1_n | s1_1 | s2_n | s2_2 | s3_n | s3_2
19661966
------+------+------+------+------+------+------
1967-
aa | 11 | 1 | 12 | 2 | 13 | 3
1968-
bb | | | 22 | 2 | 23 | 3
1969-
cc | | | | | 33 | 3
1970-
dd | | | 42 | 2 | |
1967+
bb | 11 | 1 | 12 | 2 | 13 | 3
1968+
cc | | | 22 | 2 | 23 | 3
1969+
dd | | | | | 33 | 3
1970+
ee | | | 42 | 2 | |
19711971
(4 rows)
19721972

19731973
SELECT * FROM
@@ -1980,10 +1980,10 @@ NATURAL FULL JOIN
19801980
) ss2;
19811981
name | s1_n | s2_n | s3_n
19821982
------+------+------+------
1983-
aa | 11 | 12 | 13
1984-
bb | | 22 | 23
1985-
cc | | | 33
1986-
dd | | 42 |
1983+
bb | 11 | 12 | 13
1984+
cc | | 22 | 23
1985+
dd | | | 33
1986+
ee | | 42 |
19871987
(4 rows)
19881988

19891989
SELECT * FROM
@@ -1996,10 +1996,10 @@ NATURAL FULL JOIN
19961996
) ss2;
19971997
name | s1_n | s2_n | s2_2 | s3_n
19981998
------+------+------+------+------
1999-
aa | 11 | 12 | 2 | 13
2000-
bb | | 22 | 2 | 23
2001-
cc | | | | 33
2002-
dd | | 42 | 2 |
1999+
bb | 11 | 12 | 2 | 13
2000+
cc | | 22 | 2 | 23
2001+
dd | | | | 33
2002+
ee | | 42 | 2 |
20032003
(4 rows)
20042004

20052005
-- Test for propagation of nullability constraints into sub-joins

‎src/test/regress/expected/select_implicit.out‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
-- load test data
99
CREATE TABLE test_missing_target (a int, b int, c char(8), d char);
1010
INSERT INTO test_missing_target VALUES (0, 1, 'XXXX', 'A');
11-
INSERT INTO test_missing_target VALUES (1, 2, 'AAAA', 'b');
12-
INSERT INTO test_missing_target VALUES (2, 2, 'AAAA', 'c');
11+
INSERT INTO test_missing_target VALUES (1, 2, 'ABAB', 'b');
12+
INSERT INTO test_missing_target VALUES (2, 2, 'ABAB', 'c');
1313
INSERT INTO test_missing_target VALUES (3, 3, 'BBBB', 'D');
1414
INSERT INTO test_missing_target VALUES (4, 3, 'BBBB', 'e');
1515
INSERT INTO test_missing_target VALUES (5, 3, 'bbbb', 'F');
@@ -21,7 +21,7 @@ INSERT INTO test_missing_target VALUES (9, 4, 'CCCC', 'j');
2121
SELECT c, count(*) FROM test_missing_target GROUP BY test_missing_target.c ORDER BY c;
2222
c | count
2323
----------+-------
24-
AAAA | 2
24+
ABAB | 2
2525
BBBB | 2
2626
CCCC | 2
2727
XXXX | 1
@@ -73,8 +73,8 @@ SELECT c FROM test_missing_target ORDER BY a;
7373
c
7474
----------
7575
XXXX
76-
AAAA
77-
AAAA
76+
ABAB
77+
ABAB
7878
BBBB
7979
BBBB
8080
bbbb
@@ -105,7 +105,7 @@ SELECT count(*) FROM test_missing_target ORDER BY 1 desc;
105105
SELECT c, count(*) FROM test_missing_target GROUP BY 1 ORDER BY 1;
106106
c | count
107107
----------+-------
108-
AAAA | 2
108+
ABAB | 2
109109
BBBB | 2
110110
CCCC | 2
111111
XXXX | 1
@@ -258,7 +258,7 @@ SELECT lower(test_missing_target.c), count(c)
258258
FROM test_missing_target GROUP BY lower(c) ORDER BY lower(c);
259259
lower | count
260260
-------+-------
261-
aaaa | 2
261+
abab | 2
262262
bbbb | 3
263263
cccc | 4
264264
xxxx | 1

‎src/test/regress/expected/select_implicit_1.out‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
-- load test data
99
CREATE TABLE test_missing_target (a int, b int, c char(8), d char);
1010
INSERT INTO test_missing_target VALUES (0, 1, 'XXXX', 'A');
11-
INSERT INTO test_missing_target VALUES (1, 2, 'AAAA', 'b');
12-
INSERT INTO test_missing_target VALUES (2, 2, 'AAAA', 'c');
11+
INSERT INTO test_missing_target VALUES (1, 2, 'ABAB', 'b');
12+
INSERT INTO test_missing_target VALUES (2, 2, 'ABAB', 'c');
1313
INSERT INTO test_missing_target VALUES (3, 3, 'BBBB', 'D');
1414
INSERT INTO test_missing_target VALUES (4, 3, 'BBBB', 'e');
1515
INSERT INTO test_missing_target VALUES (5, 3, 'bbbb', 'F');
@@ -21,7 +21,7 @@ INSERT INTO test_missing_target VALUES (9, 4, 'CCCC', 'j');
2121
SELECT c, count(*) FROM test_missing_target GROUP BY test_missing_target.c ORDER BY c;
2222
c | count
2323
----------+-------
24-
AAAA | 2
24+
ABAB | 2
2525
BBBB | 2
2626
bbbb | 1
2727
CCCC | 2
@@ -73,8 +73,8 @@ SELECT c FROM test_missing_target ORDER BY a;
7373
c
7474
----------
7575
XXXX
76-
AAAA
77-
AAAA
76+
ABAB
77+
ABAB
7878
BBBB
7979
BBBB
8080
bbbb
@@ -105,7 +105,7 @@ SELECT count(*) FROM test_missing_target ORDER BY 1 desc;
105105
SELECT c, count(*) FROM test_missing_target GROUP BY 1 ORDER BY 1;
106106
c | count
107107
----------+-------
108-
AAAA | 2
108+
ABAB | 2
109109
BBBB | 2
110110
bbbb | 1
111111
CCCC | 2
@@ -258,7 +258,7 @@ SELECT lower(test_missing_target.c), count(c)
258258
FROM test_missing_target GROUP BY lower(c) ORDER BY lower(c);
259259
lower | count
260260
-------+-------
261-
aaaa | 2
261+
abab | 2
262262
bbbb | 3
263263
cccc | 4
264264
xxxx | 1

‎src/test/regress/expected/select_implicit_2.out‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
-- load test data
99
CREATE TABLE test_missing_target (a int, b int, c char(8), d char);
1010
INSERT INTO test_missing_target VALUES (0, 1, 'XXXX', 'A');
11-
INSERT INTO test_missing_target VALUES (1, 2, 'AAAA', 'b');
12-
INSERT INTO test_missing_target VALUES (2, 2, 'AAAA', 'c');
11+
INSERT INTO test_missing_target VALUES (1, 2, 'ABAB', 'b');
12+
INSERT INTO test_missing_target VALUES (2, 2, 'ABAB', 'c');
1313
INSERT INTO test_missing_target VALUES (3, 3, 'BBBB', 'D');
1414
INSERT INTO test_missing_target VALUES (4, 3, 'BBBB', 'e');
1515
INSERT INTO test_missing_target VALUES (5, 3, 'bbbb', 'F');
@@ -21,7 +21,7 @@ INSERT INTO test_missing_target VALUES (9, 4, 'CCCC', 'j');
2121
SELECT c, count(*) FROM test_missing_target GROUP BY test_missing_target.c ORDER BY c;
2222
c | count
2323
----------+-------
24-
AAAA | 2
24+
ABAB | 2
2525
bbbb | 1
2626
BBBB | 2
2727
cccc | 2
@@ -73,8 +73,8 @@ SELECT c FROM test_missing_target ORDER BY a;
7373
c
7474
----------
7575
XXXX
76-
AAAA
77-
AAAA
76+
ABAB
77+
ABAB
7878
BBBB
7979
BBBB
8080
bbbb
@@ -105,7 +105,7 @@ SELECT count(*) FROM test_missing_target ORDER BY 1 desc;
105105
SELECT c, count(*) FROM test_missing_target GROUP BY 1 ORDER BY 1;
106106
c | count
107107
----------+-------
108-
AAAA | 2
108+
ABAB | 2
109109
bbbb | 1
110110
BBBB | 2
111111
cccc | 2
@@ -258,7 +258,7 @@ SELECT lower(test_missing_target.c), count(c)
258258
FROM test_missing_target GROUP BY lower(c) ORDER BY lower(c);
259259
lower | count
260260
-------+-------
261-
aaaa | 2
261+
abab | 2
262262
bbbb | 3
263263
cccc | 4
264264
xxxx | 1

‎src/test/regress/sql/alter_table.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,7 @@ drop table p1 cascade;
977977
createdomainmytypeastext;
978978
create temp table foo (f1text, f2 mytype, f3text);
979979

980-
insert into foovalues('aa','bb','cc');
980+
insert into foovalues('bb','cc','dd');
981981
select*from foo;
982982

983983
dropdomain mytype cascade;

‎src/test/regress/sql/join.sql‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,13 @@ CREATE TABLE t1 (name TEXT, n INTEGER);
206206
CREATETABLEt2 (nameTEXT, nINTEGER);
207207
CREATETABLEt3 (nameTEXT, nINTEGER);
208208

209-
INSERT INTO t1VALUES ('aa',11 );
210-
INSERT INTO t2VALUES ('aa',12 );
211-
INSERT INTO t2VALUES ('bb',22 );
212-
INSERT INTO t2VALUES ('dd',42 );
213-
INSERT INTO t3VALUES ('aa',13 );
214-
INSERT INTO t3VALUES ('bb',23 );
215-
INSERT INTO t3VALUES ('cc',33 );
209+
INSERT INTO t1VALUES ('bb',11 );
210+
INSERT INTO t2VALUES ('bb',12 );
211+
INSERT INTO t2VALUES ('cc',22 );
212+
INSERT INTO t2VALUES ('ee',42 );
213+
INSERT INTO t3VALUES ('bb',13 );
214+
INSERT INTO t3VALUES ('cc',23 );
215+
INSERT INTO t3VALUES ('dd',33 );
216216

217217
SELECT*FROM t1 FULLJOIN t2 USING (name) FULLJOIN t3 USING (name);
218218

‎src/test/regress/sql/select_implicit.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
-- load test data
1010
CREATETABLEtest_missing_target (aint, bint, cchar(8), dchar);
1111
INSERT INTO test_missing_targetVALUES (0,1,'XXXX','A');
12-
INSERT INTO test_missing_targetVALUES (1,2,'AAAA','b');
13-
INSERT INTO test_missing_targetVALUES (2,2,'AAAA','c');
12+
INSERT INTO test_missing_targetVALUES (1,2,'ABAB','b');
13+
INSERT INTO test_missing_targetVALUES (2,2,'ABAB','c');
1414
INSERT INTO test_missing_targetVALUES (3,3,'BBBB','D');
1515
INSERT INTO test_missing_targetVALUES (4,3,'BBBB','e');
1616
INSERT INTO test_missing_targetVALUES (5,3,'bbbb','F');

0 commit comments

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