summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Vondra2017-07-13 17:51:36 +0000
committerTomas Vondra2017-07-13 17:51:36 +0000
commitf4ec9cfa19dd1af17fb20c68a646d46e1cb8949a (patch)
tree11fbd07003743be91d49a2b41df17df0d23d2b1c
parent4c6a467a01b129f5bbb3ce900c1a9af41c0e4ec8 (diff)
Accept output changes due to psql \d format tweaks
The format used by psql \d and \d+ changed a bit, splitting the single Modifiers column into Collation, Nullable, Default. Additional commands changed too, for example \dew+ now uses "options" instead of "Options" and so on. This commit accepts all such output changes across all regression tests.
-rw-r--r--src/test/regress/expected/alter_table.out10
-rw-r--r--src/test/regress/expected/create_table_like.out24
-rw-r--r--src/test/regress/expected/foreign_data.out116
-rw-r--r--src/test/regress/expected/guc.out56
-rw-r--r--src/test/regress/expected/xc_sequence.out10
5 files changed, 108 insertions, 108 deletions
diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index 866dc3f5bf..7763dc2a02 100644
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -2756,11 +2756,11 @@ ALTER TABLE IF EXISTS tt8 ALTER COLUMN f SET DEFAULT 0;
ALTER TABLE IF EXISTS tt8 RENAME COLUMN f TO f1;
ALTER TABLE IF EXISTS tt8 SET SCHEMA alter2;
\d alter2.tt8
- Table "alter2.tt8"
- Column | Type | Modifiers
---------+---------+-----------
- a | integer |
- f1 | integer | default 0
+ Table "alter2.tt8"
+ Column | Type | Collation | Nullable | Default
+--------+---------+-----------+----------+---------
+ a | integer | | |
+ f1 | integer | | | 0
Check constraints:
"tt8_f_check" CHECK (f1 >= 0 AND f1 <= 10)
diff --git a/src/test/regress/expected/create_table_like.out b/src/test/regress/expected/create_table_like.out
index 595817bf85..697e19a29b 100644
--- a/src/test/regress/expected/create_table_like.out
+++ b/src/test/regress/expected/create_table_like.out
@@ -156,23 +156,23 @@ CREATE TABLE ctlt4 (a text, c text);
ALTER TABLE ctlt4 ALTER COLUMN c SET STORAGE EXTERNAL;
CREATE TABLE ctlt12_storage (LIKE ctlt1 INCLUDING STORAGE, LIKE ctlt2 INCLUDING STORAGE);
\d+ ctlt12_storage
- Table "public.ctlt12_storage"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+------+-----------+----------+--------------+-------------
- a | text | not null | main | |
- b | text | | extended | |
- c | text | | external | |
+ Table "public.ctlt12_storage"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+------+-----------+----------+---------+----------+--------------+-------------
+ a | text | | not null | | main | |
+ b | text | | | | extended | |
+ c | text | | | | external | |
Distribute By: HASH(a)
Location Nodes: ALL DATANODES
CREATE TABLE ctlt12_comments (LIKE ctlt1 INCLUDING COMMENTS, LIKE ctlt2 INCLUDING COMMENTS);
\d+ ctlt12_comments
- Table "public.ctlt12_comments"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+------+-----------+----------+--------------+-------------
- a | text | not null | extended | | A
- b | text | | extended | | B
- c | text | | extended | | C
+ Table "public.ctlt12_comments"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+------+-----------+----------+---------+----------+--------------+-------------
+ a | text | | not null | | extended | | A
+ b | text | | | | extended | | B
+ c | text | | | | extended | | C
Distribute By: HASH(a)
Location Nodes: ALL DATANODES
diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out
index cdafb90762..dc6a61b6d8 100644
--- a/src/test/regress/expected/foreign_data.out
+++ b/src/test/regress/expected/foreign_data.out
@@ -60,7 +60,7 @@ ERROR: Postgres-XL does not support FOREIGN DATA WRAPPER yet
DETAIL: The feature is not currently supported
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
@@ -74,7 +74,7 @@ ERROR: Postgres-XL does not support FOREIGN DATA WRAPPER yet
DETAIL: The feature is not currently supported
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
@@ -90,7 +90,7 @@ ERROR: Postgres-XL does not support FOREIGN DATA WRAPPER yet
DETAIL: The feature is not currently supported
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
@@ -105,7 +105,7 @@ ALTER FOREIGN DATA WRAPPER foo NO VALIDATOR;
ERROR: foreign-data wrapper "foo" does not exist
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
@@ -119,7 +119,7 @@ ALTER FOREIGN DATA WRAPPER foo OPTIONS (ADD x '1', DROP x);
ERROR: foreign-data wrapper "foo" does not exist
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
@@ -127,7 +127,7 @@ ALTER FOREIGN DATA WRAPPER foo OPTIONS (DROP a, SET b '3', ADD c '4');
ERROR: foreign-data wrapper "foo" does not exist
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
@@ -137,7 +137,7 @@ ALTER FOREIGN DATA WRAPPER foo OPTIONS (b '4'); -- ERROR
ERROR: foreign-data wrapper "foo" does not exist
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
@@ -150,7 +150,7 @@ ALTER FOREIGN DATA WRAPPER foo OPTIONS (ADD d '5');
ERROR: foreign-data wrapper "foo" does not exist
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
@@ -166,7 +166,7 @@ HINT: Must be superuser to alter a foreign-data wrapper.
RESET ROLE;
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
@@ -174,7 +174,7 @@ ALTER FOREIGN DATA WRAPPER foo RENAME TO foo1;
ERROR: foreign-data wrapper "foo" does not exist
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
@@ -187,7 +187,7 @@ DROP FOREIGN DATA WRAPPER IF EXISTS nonexistent;
NOTICE: foreign-data wrapper "nonexistent" does not exist, skipping
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
@@ -201,7 +201,7 @@ DROP ROLE regress_test_role_super;
ERROR: role "regress_test_role_super" does not exist
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
@@ -222,19 +222,19 @@ CREATE USER MAPPING IF NOT EXISTS FOR current_user SERVER s1; -- NOTICE
NOTICE: user mapping for "regress_foreign_data_user" already exists for server s1, skipping
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
\des+
List of foreign servers
- Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW Options | Description
+ Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW options | Description
------+-------+----------------------+-------------------+------+---------+-------------+-------------
(0 rows)
\deu+
List of user mappings
- Server | User name | FDW Options
+ Server | User name | FDW options
--------+-----------+-------------
(0 rows)
@@ -248,7 +248,7 @@ DROP FOREIGN DATA WRAPPER foo CASCADE;
ERROR: foreign-data wrapper "foo" does not exist
\dew+
List of foreign-data wrappers
- Name | Owner | Handler | Validator | Access privileges | FDW Options | Description
+ Name | Owner | Handler | Validator | Access privileges | FDW options | Description
------+-------+---------+-----------+-------------------+-------------+-------------
(0 rows)
@@ -303,7 +303,7 @@ ERROR: Postgres-XL does not support SERVER yet
DETAIL: The feature is not currently supported
\des+
List of foreign servers
- Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW Options | Description
+ Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW options | Description
------+-------+----------------------+-------------------+------+---------+-------------+-------------
(0 rows)
SET ROLE regress_test_role;
@@ -320,7 +320,7 @@ DETAIL: The feature is not currently supported
RESET ROLE;
\des+
List of foreign servers
- Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW Options | Description
+ Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW options | Description
------+-------+----------------------+-------------------+------+---------+-------------+-------------
(0 rows)
@@ -340,7 +340,7 @@ ERROR: Postgres-XL does not support SERVER yet
DETAIL: The feature is not currently supported
\des+
List of foreign servers
- Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW Options | Description
+ Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW options | Description
------+-------+----------------------+-------------------+------+---------+-------------+-------------
(0 rows)
@@ -365,7 +365,7 @@ GRANT USAGE ON FOREIGN SERVER s6 TO regress_test_role2 WITH GRANT OPTION;
ERROR: server "s6" does not exist
\des+
List of foreign servers
- Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW Options | Description
+ Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW options | Description
------+-------+----------------------+-------------------+------+---------+-------------+-------------
(0 rows)
@@ -406,7 +406,7 @@ RESET ROLE;
DROP ROLE regress_test_indirect; -- ERROR
\des+
List of foreign servers
- Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW Options | Description
+ Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW options | Description
------+-------+----------------------+-------------------+------+---------+-------------+-------------
(0 rows)
@@ -414,7 +414,7 @@ ALTER SERVER s8 RENAME to s8new;
ERROR: server "s8" does not exist
\des+
List of foreign servers
- Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW Options | Description
+ Name | Owner | Foreign-data wrapper | Access privileges | Type | Version | FDW options | Description
------+-------+----------------------+-------------------+------+---------+-------------+-------------
(0 rows)
@@ -557,7 +557,7 @@ ERROR: server "t1" does not exist
RESET ROLE;
\deu+
List of user mappings
- Server | User name | FDW Options
+ Server | User name | FDW options
--------+-----------+-------------
(0 rows)
@@ -645,7 +645,7 @@ ERROR: relation "ft1" does not exist
\d+ ft1
\det+
List of foreign tables
- Schema | Table | Server | FDW Options | Description
+ Schema | Table | Server | FDW options | Description
--------+-------+--------+-------------+-------------
(0 rows)
@@ -1185,12 +1185,12 @@ CREATE FOREIGN TABLE ft2 () INHERITS (pt1)
SERVER s0 OPTIONS (delimiter ',', quote '"', "be quoted" 'value');
ERROR: server "s0" does not exist
\d+ pt1
- Table "public.pt1"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+---------+-----------+----------+--------------+-------------
- c1 | integer | not null | plain | |
- c2 | text | | extended | |
- c3 | date | | plain | |
+ Table "public.pt1"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+---------+-----------+----------+---------+----------+--------------+-------------
+ c1 | integer | | not null | | plain | |
+ c2 | text | | | | extended | |
+ c3 | date | | | | plain | |
Distribute By: HASH(c1)
Location Nodes: ALL DATANODES
@@ -1256,17 +1256,17 @@ ALTER TABLE pt1 ADD COLUMN c6 integer;
ALTER TABLE pt1 ADD COLUMN c7 integer NOT NULL;
ALTER TABLE pt1 ADD COLUMN c8 integer;
\d+ pt1
- Table "public.pt1"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+---------+-----------+----------+--------------+-------------
- c1 | integer | not null | plain | |
- c2 | text | | extended | |
- c3 | date | | plain | |
- c4 | integer | | plain | |
- c5 | integer | default 0 | plain | |
- c6 | integer | | plain | |
- c7 | integer | not null | plain | |
- c8 | integer | | plain | |
+ Table "public.pt1"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+---------+-----------+----------+---------+----------+--------------+-------------
+ c1 | integer | | not null | | plain | |
+ c2 | text | | | | extended | |
+ c3 | date | | | | plain | |
+ c4 | integer | | | | plain | |
+ c5 | integer | | | 0 | plain | |
+ c6 | integer | | | | plain | |
+ c7 | integer | | not null | | plain | |
+ c8 | integer | | | | plain | |
Distribute By: HASH(c1)
Location Nodes: ALL DATANODES
@@ -1286,17 +1286,17 @@ ALTER TABLE pt1 ALTER COLUMN c1 SET (n_distinct = 100);
ALTER TABLE pt1 ALTER COLUMN c8 SET STATISTICS -1;
ALTER TABLE pt1 ALTER COLUMN c8 SET STORAGE EXTERNAL;
\d+ pt1
- Table "public.pt1"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+---------+-----------+----------+--------------+-------------
- c1 | integer | not null | plain | 10000 |
- c2 | text | | extended | |
- c3 | date | | plain | |
- c4 | integer | default 0 | plain | |
- c5 | integer | | plain | |
- c6 | integer | not null | plain | |
- c7 | integer | | plain | |
- c8 | text | | external | |
+ Table "public.pt1"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+---------+-----------+----------+---------+----------+--------------+-------------
+ c1 | integer | | not null | | plain | 10000 |
+ c2 | text | | | | extended | |
+ c3 | date | | | | plain | |
+ c4 | integer | | | 0 | plain | |
+ c5 | integer | | | | plain | |
+ c6 | integer | | not null | | plain | |
+ c7 | integer | | | | plain | |
+ c8 | text | | | | external | |
Distribute By: HASH(c1)
Location Nodes: ALL DATANODES
@@ -1308,12 +1308,12 @@ ALTER TABLE pt1 DROP COLUMN c6;
ALTER TABLE pt1 DROP COLUMN c7;
ALTER TABLE pt1 DROP COLUMN c8;
\d+ pt1
- Table "public.pt1"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+---------+-----------+----------+--------------+-------------
- c1 | integer | not null | plain | 10000 |
- c2 | text | | extended | |
- c3 | date | | plain | |
+ Table "public.pt1"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+---------+-----------+----------+---------+----------+--------------+-------------
+ c1 | integer | | not null | | plain | 10000 |
+ c2 | text | | | | extended | |
+ c3 | date | | | | plain | |
Distribute By: HASH(c1)
Location Nodes: ALL DATANODES
diff --git a/src/test/regress/expected/guc.out b/src/test/regress/expected/guc.out
index d28ef2cdbc..921c567d29 100644
--- a/src/test/regress/expected/guc.out
+++ b/src/test/regress/expected/guc.out
@@ -541,10 +541,10 @@ CREATE SCHEMA "SELECT";
SET search_path TO testschema;
CREATE TABLE testtab (a int);
\d+ testtab
- Table "testschema.testtab"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+---------+-----------+---------+--------------+-------------
- a | integer | | plain | |
+ Table "testschema.testtab"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a | integer | | | | plain | |
Distribute By: HASH(a)
Location Nodes: ALL DATANODES
@@ -561,10 +561,10 @@ DROP TABLE testtab;
SET search_path TO "testschema";
CREATE TABLE testtab (a int);
\d+ testtab
- Table "testschema.testtab"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+---------+-----------+---------+--------------+-------------
- a | integer | | plain | |
+ Table "testschema.testtab"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a | integer | | | | plain | |
Distribute By: HASH(a)
Location Nodes: ALL DATANODES
@@ -581,10 +581,10 @@ DROP TABLE testtab;
SET search_path TO testschema, "testschema 2";
CREATE TABLE testtab (a int);
\d+ testtab
- Table "testschema.testtab"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+---------+-----------+---------+--------------+-------------
- a | integer | | plain | |
+ Table "testschema.testtab"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a | integer | | | | plain | |
Distribute By: HASH(a)
Location Nodes: ALL DATANODES
@@ -601,10 +601,10 @@ DROP TABLE testtab;
SET search_path TO "testschema 3", "testschema 2";
CREATE TABLE testtab (a int);
\d+ testtab
- Table "testschema 3.testtab"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+---------+-----------+---------+--------------+-------------
- a | integer | | plain | |
+ Table "testschema 3.testtab"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a | integer | | | | plain | |
Distribute By: HASH(a)
Location Nodes: ALL DATANODES
@@ -626,19 +626,19 @@ LINE 1: SET search_path TO "testschema 3", SELECT;
SET search_path TO "SELECT", "testschema 3";
CREATE TABLE testtab (a int);
\d+ testtab
- Table "SELECT.testtab"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+---------+-----------+---------+--------------+-------------
- a | integer | | plain | |
+ Table "SELECT.testtab"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a | integer | | | | plain | |
Distribute By: HASH(a)
Location Nodes: ALL DATANODES
CREATE TABLE "testschema 3".testtab (a int);
\d+ testtab
- Table "SELECT.testtab"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+---------+-----------+---------+--------------+-------------
- a | integer | | plain | |
+ Table "SELECT.testtab"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a | integer | | | | plain | |
Distribute By: HASH(a)
Location Nodes: ALL DATANODES
@@ -662,10 +662,10 @@ SELECT * FROM "testschema 3".testtab;
(3 rows)
\d+ testtab
- Table "SELECT.testtab"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+---------+-----------+---------+--------------+-------------
- a | integer | | plain | |
+ Table "SELECT.testtab"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a | integer | | | | plain | |
Distribute By: HASH(a)
Location Nodes: ALL DATANODES
diff --git a/src/test/regress/expected/xc_sequence.out b/src/test/regress/expected/xc_sequence.out
index 6674596187..0d4ea678b3 100644
--- a/src/test/regress/expected/xc_sequence.out
+++ b/src/test/regress/expected/xc_sequence.out
@@ -458,11 +458,11 @@ SELECT nextval('xl_s1');
CREATE TABLE xl_testtab (a serial, b int);
ALTER TABLE xl_testtab RENAME TO xl_testtab_newname;
\d+ xl_testtab_newname
- Table "public.xl_testtab_newname"
- Column | Type | Modifiers | Storage | Stats target | Description
---------+---------+--------------------------------------------------------+---------+--------------+-------------
- a | integer | not null default nextval('xl_testtab_a_seq'::regclass) | plain | |
- b | integer | | plain | |
+ Table "public.xl_testtab_newname"
+ Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
+--------+---------+-----------+----------+---------------------------------------+---------+--------------+-------------
+ a | integer | | not null | nextval('xl_testtab_a_seq'::regclass) | plain | |
+ b | integer | | | | plain | |
Distribute By: HASH(a)
Location Nodes: ALL DATANODES