Make contrib regression tests safe for Danish locale.

In btree_gin and citext, avoid some not-particularly-interesting
dependencies on the sorting of 'aa'.  In tsearch2, use COLLATE "C" to
remove an uninteresting dependency on locale sort order (and thereby
allow removal of a variant expected-file).

Also, in citext, avoid assuming that lower('I') = 'i'.  This isn't relevant
to Danish but it does fail in Turkish.

6 files changed, 12 insertions, 12 deletions

diff --git a/contrib/btree_gin/expected/bytea.out b/contrib/btree_gin/expected/bytea.out
index 8b5a0c615d..b0ed7a5345 100644
--- a/contrib/btree_gin/expected/bytea.out
+++ b/contrib/btree_gin/expected/bytea.out
@@ -4,13 +4,13 @@ SET bytea_output TO escape;
 CREATE TABLE test_bytea (
 	i bytea
 );
-INSERT INTO test_bytea VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_bytea VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 CREATE INDEX idx_bytea ON test_bytea USING gin (i);
 SELECT * FROM test_bytea WHERE i<'abc'::bytea ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
 (3 rows)
 
@@ -18,7 +18,7 @@ SELECT * FROM test_bytea WHERE i<='abc'::bytea ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
  abc
 (4 rows)
diff --git a/contrib/btree_gin/expected/text.out b/contrib/btree_gin/expected/text.out
index 1ed206eec7..3e31ad744d 100644
--- a/contrib/btree_gin/expected/text.out
+++ b/contrib/btree_gin/expected/text.out
@@ -2,13 +2,13 @@ set enable_seqscan=off;
 CREATE TABLE test_text (
 	i text
 );
-INSERT INTO test_text VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_text VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 CREATE INDEX idx_text ON test_text USING gin (i);
 SELECT * FROM test_text WHERE i<'abc' ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
 (3 rows)
 
@@ -16,7 +16,7 @@ SELECT * FROM test_text WHERE i<='abc' ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
  abc
 (4 rows)
diff --git a/contrib/btree_gin/expected/varchar.out b/contrib/btree_gin/expected/varchar.out
index b893dd976d..086afbc356 100644
--- a/contrib/btree_gin/expected/varchar.out
+++ b/contrib/btree_gin/expected/varchar.out
@@ -2,13 +2,13 @@ set enable_seqscan=off;
 CREATE TABLE test_varchar (
 	i varchar
 );
-INSERT INTO test_varchar VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_varchar VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 CREATE INDEX idx_varchar ON test_varchar USING gin (i);
 SELECT * FROM test_varchar WHERE i<'abc'::varchar ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
 (3 rows)
 
@@ -16,7 +16,7 @@ SELECT * FROM test_varchar WHERE i<='abc'::varchar ORDER BY i;
   i  
 -----
  a
- aaa
+ ab
  abb
  abc
 (4 rows)
diff --git a/contrib/btree_gin/sql/bytea.sql b/contrib/btree_gin/sql/bytea.sql
index 0ef6247e10..5f3eb11b16 100644
--- a/contrib/btree_gin/sql/bytea.sql
+++ b/contrib/btree_gin/sql/bytea.sql
@@ -6,7 +6,7 @@ CREATE TABLE test_bytea (
 	i bytea
 );
 
-INSERT INTO test_bytea VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_bytea VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 
 CREATE INDEX idx_bytea ON test_bytea USING gin (i);
 
diff --git a/contrib/btree_gin/sql/text.sql b/contrib/btree_gin/sql/text.sql
index 5288206af3..d5b3b39898 100644
--- a/contrib/btree_gin/sql/text.sql
+++ b/contrib/btree_gin/sql/text.sql
@@ -4,7 +4,7 @@ CREATE TABLE test_text (
 	i text
 );
 
-INSERT INTO test_text VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_text VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 
 CREATE INDEX idx_text ON test_text USING gin (i);
 
diff --git a/contrib/btree_gin/sql/varchar.sql b/contrib/btree_gin/sql/varchar.sql
index 16255df426..dbdacab7e9 100644
--- a/contrib/btree_gin/sql/varchar.sql
+++ b/contrib/btree_gin/sql/varchar.sql
@@ -4,7 +4,7 @@ CREATE TABLE test_varchar (
 	i varchar
 );
 
-INSERT INTO test_varchar VALUES ('aaa'),('a'),('abc'),('abb'),('axy'),('xyz');
+INSERT INTO test_varchar VALUES ('a'),('ab'),('abc'),('abb'),('axy'),('xyz');
 
 CREATE INDEX idx_varchar ON test_varchar USING gin (i);