aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2018-05-24 17:41:52 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2018-05-24 17:41:52 -0400
commit2eb809ad7e71737b1a1ef5679d8e4c88e785669e (patch)
tree70e9594eff4ccbecf830091367be456cedf4bc5e
parentf248453b7a1b0590b3c7cf32a958573b70e23b09 (diff)
downloadpostgresql-2eb809ad7e71737b1a1ef5679d8e4c88e785669e.tar.gz
postgresql-2eb809ad7e71737b1a1ef5679d8e4c88e785669e.zip
Update non-default collation tests for getObjectDescription() changes.
Sigh, also missed in commit b86b7bfa3. Per buildfarm.
-rw-r--r--src/test/regress/expected/collate.icu.utf8.out8
-rw-r--r--src/test/regress/expected/collate.linux.utf8.out8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/test/regress/expected/collate.icu.utf8.out b/src/test/regress/expected/collate.icu.utf8.out
index e8cf5d50d1d..f485b5c330d 100644
--- a/src/test/regress/expected/collate.icu.utf8.out
+++ b/src/test/regress/expected/collate.icu.utf8.out
@@ -1056,17 +1056,17 @@ CREATE TABLE collate_dep_test4t (a int, b text);
CREATE INDEX collate_dep_test4i ON collate_dep_test4t (b COLLATE test0);
DROP COLLATION test0 RESTRICT; -- fail
ERROR: cannot drop collation test0 because other objects depend on it
-DETAIL: table collate_dep_test1 column b depends on collation test0
+DETAIL: column b of table collate_dep_test1 depends on collation test0
type collate_dep_dom1 depends on collation test0
-composite type collate_dep_test2 column y depends on collation test0
+column y of composite type collate_dep_test2 depends on collation test0
view collate_dep_test3 depends on collation test0
index collate_dep_test4i depends on collation test0
HINT: Use DROP ... CASCADE to drop the dependent objects too.
DROP COLLATION test0 CASCADE;
NOTICE: drop cascades to 5 other objects
-DETAIL: drop cascades to table collate_dep_test1 column b
+DETAIL: drop cascades to column b of table collate_dep_test1
drop cascades to type collate_dep_dom1
-drop cascades to composite type collate_dep_test2 column y
+drop cascades to column y of composite type collate_dep_test2
drop cascades to view collate_dep_test3
drop cascades to index collate_dep_test4i
\d collate_dep_test1
diff --git a/src/test/regress/expected/collate.linux.utf8.out b/src/test/regress/expected/collate.linux.utf8.out
index 4eb2322e539..400a747cdc9 100644
--- a/src/test/regress/expected/collate.linux.utf8.out
+++ b/src/test/regress/expected/collate.linux.utf8.out
@@ -1073,17 +1073,17 @@ CREATE TABLE collate_dep_test4t (a int, b text);
CREATE INDEX collate_dep_test4i ON collate_dep_test4t (b COLLATE test0);
DROP COLLATION test0 RESTRICT; -- fail
ERROR: cannot drop collation test0 because other objects depend on it
-DETAIL: table collate_dep_test1 column b depends on collation test0
+DETAIL: column b of table collate_dep_test1 depends on collation test0
type collate_dep_dom1 depends on collation test0
-composite type collate_dep_test2 column y depends on collation test0
+column y of composite type collate_dep_test2 depends on collation test0
view collate_dep_test3 depends on collation test0
index collate_dep_test4i depends on collation test0
HINT: Use DROP ... CASCADE to drop the dependent objects too.
DROP COLLATION test0 CASCADE;
NOTICE: drop cascades to 5 other objects
-DETAIL: drop cascades to table collate_dep_test1 column b
+DETAIL: drop cascades to column b of table collate_dep_test1
drop cascades to type collate_dep_dom1
-drop cascades to composite type collate_dep_test2 column y
+drop cascades to column y of composite type collate_dep_test2
drop cascades to view collate_dep_test3
drop cascades to index collate_dep_test4i
\d collate_dep_test1