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".

diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index 388e25e9dbad9dec8c293b2713c37e79ed87c0b5..4768c8b186c216c76fc43bbb977fc5b8431e43a7 100644 (file)
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -1262,11 +1262,11 @@ NOTICE:  drop cascades to table c1
 -- its datatype
 create domain mytype as text;
 create temp table foo (f1 text, f2 mytype, f3 text);
-insert into foo values('aa','bb','cc');
+insert into foo values('bb','cc','dd');
 select * from foo;
  f1 | f2 | f3 
 ----+----+----
- aa | bb | cc
+ bb | cc | dd
 (1 row)
 
 drop domain mytype cascade;
@@ -1274,14 +1274,14 @@ NOTICE:  drop cascades to table foo column f2
 select * from foo;
  f1 | f3 
 ----+----
- aa | cc
+ bb | dd
 (1 row)
 
 insert into foo values('qq','rr');
 select * from foo;
  f1 | f3 
 ----+----
- aa | cc
+ bb | dd
  qq | rr
 (2 rows)
 
@@ -1289,7 +1289,7 @@ update foo set f3 = 'zz';
 select * from foo;
  f1 | f3 
 ----+----
- aa | zz
+ bb | zz
  qq | zz
 (2 rows)
 

diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out
index d7b66ee1729c211ddfd383021d9d3872f5c16811..12b54aad172fda320a1df6df25cdecc3a5ca5062 100644 (file)
--- a/src/test/regress/expected/join.out
+++ b/src/test/regress/expected/join.out
@@ -1854,20 +1854,20 @@ SELECT '' AS "xxx", *
 CREATE TABLE t1 (name TEXT, n INTEGER);
 CREATE TABLE t2 (name TEXT, n INTEGER);
 CREATE TABLE t3 (name TEXT, n INTEGER);
-INSERT INTO t1 VALUES ( 'aa', 11 );
-INSERT INTO t2 VALUES ( 'aa', 12 );
-INSERT INTO t2 VALUES ( 'bb', 22 );
-INSERT INTO t2 VALUES ( 'dd', 42 );
-INSERT INTO t3 VALUES ( 'aa', 13 );
-INSERT INTO t3 VALUES ( 'bb', 23 );
-INSERT INTO t3 VALUES ( 'cc', 33 );
+INSERT INTO t1 VALUES ( 'bb', 11 );
+INSERT INTO t2 VALUES ( 'bb', 12 );
+INSERT INTO t2 VALUES ( 'cc', 22 );
+INSERT INTO t2 VALUES ( 'ee', 42 );
+INSERT INTO t3 VALUES ( 'bb', 13 );
+INSERT INTO t3 VALUES ( 'cc', 23 );
+INSERT INTO t3 VALUES ( 'dd', 33 );
 SELECT * FROM t1 FULL JOIN t2 USING (name) FULL JOIN t3 USING (name);
  name | n  | n  | n  
 ------+----+----+----
- aa   | 11 | 12 | 13
- bb   |    | 22 | 23
- cc   |    |    | 33
- dd   |    | 42 |   
+ bb   | 11 | 12 | 13
+ cc   |    | 22 | 23
+ dd   |    |    | 33
+ ee   |    | 42 |   
 (4 rows)
 
 --
@@ -1881,8 +1881,8 @@ INNER JOIN
 USING (name);
  name | n  | n  
 ------+----+----
- aa   | 12 | 13
- bb   | 22 | 23
+ bb   | 12 | 13
+ cc   | 22 | 23
 (2 rows)
 
 SELECT * FROM
@@ -1892,9 +1892,9 @@ LEFT JOIN
 USING (name);
  name | n  | n  
 ------+----+----
- aa   | 12 | 13
- bb   | 22 | 23
- dd   | 42 |   
+ bb   | 12 | 13
+ cc   | 22 | 23
+ ee   | 42 |   
 (3 rows)
 
 SELECT * FROM
@@ -1904,10 +1904,10 @@ FULL JOIN
 USING (name);
  name | n  | n  
 ------+----+----
- aa   | 12 | 13
- bb   | 22 | 23
- cc   |    | 33
- dd   | 42 |   
+ bb   | 12 | 13
+ cc   | 22 | 23
+ dd   |    | 33
+ ee   | 42 |   
 (4 rows)
 
 -- Cases with non-nullable expressions in subquery results;
@@ -1918,8 +1918,8 @@ NATURAL INNER JOIN
 (SELECT name, n as s3_n, 3 as s3_2 FROM t3) s3;
  name | s2_n | s2_2 | s3_n | s3_2 
 ------+------+------+------+------
- aa   |   12 |    2 |   13 |    3
- bb   |   22 |    2 |   23 |    3
+ bb   |   12 |    2 |   13 |    3
+ cc   |   22 |    2 |   23 |    3
 (2 rows)
 
 SELECT * FROM
@@ -1928,9 +1928,9 @@ NATURAL LEFT JOIN
 (SELECT name, n as s3_n, 3 as s3_2 FROM t3) s3;
  name | s2_n | s2_2 | s3_n | s3_2 
 ------+------+------+------+------
- aa   |   12 |    2 |   13 |    3
- bb   |   22 |    2 |   23 |    3
- dd   |   42 |    2 |      |     
+ bb   |   12 |    2 |   13 |    3
+ cc   |   22 |    2 |   23 |    3
+ ee   |   42 |    2 |      |     
 (3 rows)
 
 SELECT * FROM
@@ -1939,10 +1939,10 @@ NATURAL FULL JOIN
 (SELECT name, n as s3_n, 3 as s3_2 FROM t3) s3;
  name | s2_n | s2_2 | s3_n | s3_2 
 ------+------+------+------+------
- aa   |   12 |    2 |   13 |    3
- bb   |   22 |    2 |   23 |    3
- cc   |      |      |   33 |    3
- dd   |   42 |    2 |      |     
+ bb   |   12 |    2 |   13 |    3
+ cc   |   22 |    2 |   23 |    3
+ dd   |      |      |   33 |    3
+ ee   |   42 |    2 |      |     
 (4 rows)
 
 SELECT * FROM
@@ -1953,7 +1953,7 @@ NATURAL INNER JOIN
 (SELECT name, n as s3_n, 3 as s3_2 FROM t3) s3;
  name | s1_n | s1_1 | s2_n | s2_2 | s3_n | s3_2 
 ------+------+------+------+------+------+------
- aa   |   11 |    1 |   12 |    2 |   13 |    3
+ bb   |   11 |    1 |   12 |    2 |   13 |    3
 (1 row)
 
 SELECT * FROM
@@ -1964,10 +1964,10 @@ NATURAL FULL JOIN
 (SELECT name, n as s3_n, 3 as s3_2 FROM t3) s3;
  name | s1_n | s1_1 | s2_n | s2_2 | s3_n | s3_2 
 ------+------+------+------+------+------+------
- aa   |   11 |    1 |   12 |    2 |   13 |    3
- bb   |      |      |   22 |    2 |   23 |    3
- cc   |      |      |      |      |   33 |    3
- dd   |      |      |   42 |    2 |      |     
+ bb   |   11 |    1 |   12 |    2 |   13 |    3
+ cc   |      |      |   22 |    2 |   23 |    3
+ dd   |      |      |      |      |   33 |    3
+ ee   |      |      |   42 |    2 |      |     
 (4 rows)
 
 SELECT * FROM
@@ -1980,10 +1980,10 @@ NATURAL FULL JOIN
   ) ss2;
  name | s1_n | s2_n | s3_n 
 ------+------+------+------
- aa   |   11 |   12 |   13
- bb   |      |   22 |   23
- cc   |      |      |   33
- dd   |      |   42 |     
+ bb   |   11 |   12 |   13
+ cc   |      |   22 |   23
+ dd   |      |      |   33
+ ee   |      |   42 |     
 (4 rows)
 
 SELECT * FROM
@@ -1996,10 +1996,10 @@ NATURAL FULL JOIN
   ) ss2;
  name | s1_n | s2_n | s2_2 | s3_n 
 ------+------+------+------+------
- aa   |   11 |   12 |    2 |   13
- bb   |      |   22 |    2 |   23
- cc   |      |      |      |   33
- dd   |      |   42 |    2 |     
+ bb   |   11 |   12 |    2 |   13
+ cc   |      |   22 |    2 |   23
+ dd   |      |      |      |   33
+ ee   |      |   42 |    2 |     
 (4 rows)
 
 -- Test for propagation of nullability constraints into sub-joins

diff --git a/src/test/regress/expected/select_implicit.out b/src/test/regress/expected/select_implicit.out
index b358ee9fccad1db1d7490f7d07c2262932364134..14fcd1c2b5b90fa949357ce032d42e9f410ec2ab 100644 (file)
--- a/src/test/regress/expected/select_implicit.out
+++ b/src/test/regress/expected/select_implicit.out
@@ -8,8 +8,8 @@
 -- load test data
 CREATE TABLE test_missing_target (a int, b int, c char(8), d char);
 INSERT INTO test_missing_target VALUES (0, 1, 'XXXX', 'A');
-INSERT INTO test_missing_target VALUES (1, 2, 'AAAA', 'b');
-INSERT INTO test_missing_target VALUES (2, 2, 'AAAA', 'c');
+INSERT INTO test_missing_target VALUES (1, 2, 'ABAB', 'b');
+INSERT INTO test_missing_target VALUES (2, 2, 'ABAB', 'c');
 INSERT INTO test_missing_target VALUES (3, 3, 'BBBB', 'D');
 INSERT INTO test_missing_target VALUES (4, 3, 'BBBB', 'e');
 INSERT INTO test_missing_target VALUES (5, 3, 'bbbb', 'F');
@@ -21,7 +21,7 @@ INSERT INTO test_missing_target VALUES (9, 4, 'CCCC', 'j');
 SELECT c, count(*) FROM test_missing_target GROUP BY test_missing_target.c ORDER BY c;
     c     | count 
 ----------+-------
- AAAA     |     2
+ ABAB     |     2
  BBBB     |     2
  CCCC     |     2
  XXXX     |     1
@@ -73,8 +73,8 @@ SELECT c FROM test_missing_target ORDER BY a;
     c     
 ----------
  XXXX    
- AAAA    
- AAAA    
+ ABAB    
+ ABAB    
  BBBB    
  BBBB    
  bbbb    
@@ -105,7 +105,7 @@ SELECT count(*) FROM test_missing_target ORDER BY 1 desc;
 SELECT c, count(*) FROM test_missing_target GROUP BY 1 ORDER BY 1;
     c     | count 
 ----------+-------
- AAAA     |     2
+ ABAB     |     2
  BBBB     |     2
  CCCC     |     2
  XXXX     |     1
@@ -258,7 +258,7 @@ SELECT lower(test_missing_target.c), count(c)
   FROM test_missing_target GROUP BY lower(c) ORDER BY lower(c);
  lower | count 
 -------+-------
- aaaa  |     2
+ abab  |     2
  bbbb  |     3
  cccc  |     4
  xxxx  |     1

diff --git a/src/test/regress/expected/select_implicit_1.out b/src/test/regress/expected/select_implicit_1.out
index 1527ce42774b2f52ca845165f5d8bbe179e73845..aee2da72b195ca3b2bc578a3ec574b4e4ed9b085 100644 (file)
--- a/src/test/regress/expected/select_implicit_1.out
+++ b/src/test/regress/expected/select_implicit_1.out
@@ -8,8 +8,8 @@
 -- load test data
 CREATE TABLE test_missing_target (a int, b int, c char(8), d char);
 INSERT INTO test_missing_target VALUES (0, 1, 'XXXX', 'A');
-INSERT INTO test_missing_target VALUES (1, 2, 'AAAA', 'b');
-INSERT INTO test_missing_target VALUES (2, 2, 'AAAA', 'c');
+INSERT INTO test_missing_target VALUES (1, 2, 'ABAB', 'b');
+INSERT INTO test_missing_target VALUES (2, 2, 'ABAB', 'c');
 INSERT INTO test_missing_target VALUES (3, 3, 'BBBB', 'D');
 INSERT INTO test_missing_target VALUES (4, 3, 'BBBB', 'e');
 INSERT INTO test_missing_target VALUES (5, 3, 'bbbb', 'F');
@@ -21,7 +21,7 @@ INSERT INTO test_missing_target VALUES (9, 4, 'CCCC', 'j');
 SELECT c, count(*) FROM test_missing_target GROUP BY test_missing_target.c ORDER BY c;
     c     | count 
 ----------+-------
- AAAA     |     2
+ ABAB     |     2
  BBBB     |     2
  bbbb     |     1
  CCCC     |     2
@@ -73,8 +73,8 @@ SELECT c FROM test_missing_target ORDER BY a;
     c     
 ----------
  XXXX    
- AAAA    
- AAAA    
+ ABAB    
+ ABAB    
  BBBB    
  BBBB    
  bbbb    
@@ -105,7 +105,7 @@ SELECT count(*) FROM test_missing_target ORDER BY 1 desc;
 SELECT c, count(*) FROM test_missing_target GROUP BY 1 ORDER BY 1;
     c     | count 
 ----------+-------
- AAAA     |     2
+ ABAB     |     2
  BBBB     |     2
  bbbb     |     1
  CCCC     |     2
@@ -258,7 +258,7 @@ SELECT lower(test_missing_target.c), count(c)
   FROM test_missing_target GROUP BY lower(c) ORDER BY lower(c);
  lower | count 
 -------+-------
- aaaa  |     2
+ abab  |     2
  bbbb  |     3
  cccc  |     4
  xxxx  |     1

diff --git a/src/test/regress/expected/select_implicit_2.out b/src/test/regress/expected/select_implicit_2.out
index 4217af7ba460dac593cf3cd7236143ef93c997f4..250f0fedb0d8f2dea9063eac14a41dc60d2e2487 100644 (file)
--- a/src/test/regress/expected/select_implicit_2.out
+++ b/src/test/regress/expected/select_implicit_2.out
@@ -8,8 +8,8 @@
 -- load test data
 CREATE TABLE test_missing_target (a int, b int, c char(8), d char);
 INSERT INTO test_missing_target VALUES (0, 1, 'XXXX', 'A');
-INSERT INTO test_missing_target VALUES (1, 2, 'AAAA', 'b');
-INSERT INTO test_missing_target VALUES (2, 2, 'AAAA', 'c');
+INSERT INTO test_missing_target VALUES (1, 2, 'ABAB', 'b');
+INSERT INTO test_missing_target VALUES (2, 2, 'ABAB', 'c');
 INSERT INTO test_missing_target VALUES (3, 3, 'BBBB', 'D');
 INSERT INTO test_missing_target VALUES (4, 3, 'BBBB', 'e');
 INSERT INTO test_missing_target VALUES (5, 3, 'bbbb', 'F');
@@ -21,7 +21,7 @@ INSERT INTO test_missing_target VALUES (9, 4, 'CCCC', 'j');
 SELECT c, count(*) FROM test_missing_target GROUP BY test_missing_target.c ORDER BY c;
     c     | count 
 ----------+-------
- AAAA     |     2
+ ABAB     |     2
  bbbb     |     1
  BBBB     |     2
  cccc     |     2
@@ -73,8 +73,8 @@ SELECT c FROM test_missing_target ORDER BY a;
     c     
 ----------
  XXXX    
- AAAA    
- AAAA    
+ ABAB    
+ ABAB    
  BBBB    
  BBBB    
  bbbb    
@@ -105,7 +105,7 @@ SELECT count(*) FROM test_missing_target ORDER BY 1 desc;
 SELECT c, count(*) FROM test_missing_target GROUP BY 1 ORDER BY 1;
     c     | count 
 ----------+-------
- AAAA     |     2
+ ABAB     |     2
  bbbb     |     1
  BBBB     |     2
  cccc     |     2
@@ -258,7 +258,7 @@ SELECT lower(test_missing_target.c), count(c)
   FROM test_missing_target GROUP BY lower(c) ORDER BY lower(c);
  lower | count 
 -------+-------
- aaaa  |     2
+ abab  |     2
  bbbb  |     3
  cccc  |     4
  xxxx  |     1

diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
index 60ce47c47df94fb8b7f89eda14d7d0e015e63bc8..20d1c2ba83e418abc127fcfaac418b68fcd90ed9 100644 (file)
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -977,7 +977,7 @@ drop table p1 cascade;
 create domain mytype as text;
 create temp table foo (f1 text, f2 mytype, f3 text);
 
-insert into foo values('aa','bb','cc');
+insert into foo values('bb','cc','dd');
 select * from foo;
 
 drop domain mytype cascade;

diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql
index 0e5638c7c1b4db0f1649a72d56c899c9a96a9e5e..245fde58ae43c6898c01a2b708a1dc1d9b9e394b 100644 (file)
--- a/src/test/regress/sql/join.sql
+++ b/src/test/regress/sql/join.sql
@@ -206,13 +206,13 @@ CREATE TABLE t1 (name TEXT, n INTEGER);
 CREATE TABLE t2 (name TEXT, n INTEGER);
 CREATE TABLE t3 (name TEXT, n INTEGER);
 
-INSERT INTO t1 VALUES ( 'aa', 11 );
-INSERT INTO t2 VALUES ( 'aa', 12 );
-INSERT INTO t2 VALUES ( 'bb', 22 );
-INSERT INTO t2 VALUES ( 'dd', 42 );
-INSERT INTO t3 VALUES ( 'aa', 13 );
-INSERT INTO t3 VALUES ( 'bb', 23 );
-INSERT INTO t3 VALUES ( 'cc', 33 );
+INSERT INTO t1 VALUES ( 'bb', 11 );
+INSERT INTO t2 VALUES ( 'bb', 12 );
+INSERT INTO t2 VALUES ( 'cc', 22 );
+INSERT INTO t2 VALUES ( 'ee', 42 );
+INSERT INTO t3 VALUES ( 'bb', 13 );
+INSERT INTO t3 VALUES ( 'cc', 23 );
+INSERT INTO t3 VALUES ( 'dd', 33 );
 
 SELECT * FROM t1 FULL JOIN t2 USING (name) FULL JOIN t3 USING (name);
 

diff --git a/src/test/regress/sql/select_implicit.sql b/src/test/regress/sql/select_implicit.sql
index 60fac0b8bde197a31c099337bf0ddc2f54e05471..4e934da09318a41894fb11a80f0a1576f2eba857 100644 (file)
--- a/src/test/regress/sql/select_implicit.sql
+++ b/src/test/regress/sql/select_implicit.sql
@@ -9,8 +9,8 @@
 -- load test data
 CREATE TABLE test_missing_target (a int, b int, c char(8), d char);
 INSERT INTO test_missing_target VALUES (0, 1, 'XXXX', 'A');
-INSERT INTO test_missing_target VALUES (1, 2, 'AAAA', 'b');
-INSERT INTO test_missing_target VALUES (2, 2, 'AAAA', 'c');
+INSERT INTO test_missing_target VALUES (1, 2, 'ABAB', 'b');
+INSERT INTO test_missing_target VALUES (2, 2, 'ABAB', 'c');
 INSERT INTO test_missing_target VALUES (3, 3, 'BBBB', 'D');
 INSERT INTO test_missing_target VALUES (4, 3, 'BBBB', 'e');
 INSERT INTO test_missing_target VALUES (5, 3, 'bbbb', 'F');