open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

psql: Split up "Modifiers" column in \d and \dD

Browse Source 
Make separate columns "Collation", "Nullable", "Default".

Reviewed-by: Kuntal Ghosh <kuntalghosh.2007@gmail.com>
pull/17/head
Peter Eisentraut 9 years ago
parent 1d15d0db50
commit a0f357e570
28 changed files with 1144 additions and 1176 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 6
      contrib/earthdistance/expected/earthdistance.out
  2. 120
      contrib/postgres_fdw/expected/postgres_fdw.out
  3. 42
      contrib/test_decoding/expected/ddl.out
  4. 6
      doc/src/sgml/ref/create_index.sgml
  5. 11
      doc/src/sgml/ref/psql-ref.sgml
  6. 71
      src/bin/psql/describe.c
  7. 4
      src/interfaces/ecpg/test/compat_informix/test_informix2.pgc
  8. 4
      src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c
  9. 402
      src/test/regress/expected/alter_table.out
  10. 28
      src/test/regress/expected/collate.linux.utf8.out
  11. 16
      src/test/regress/expected/collate.out
  12. 6
      src/test/regress/expected/copy2.out
  13. 44
      src/test/regress/expected/create_index.out
  14. 56
      src/test/regress/expected/create_table_like.out
  15. 240
      src/test/regress/expected/create_view.out
  16. 426
      src/test/regress/expected/foreign_data.out
  17. 188
      src/test/regress/expected/inherit.out
  18. 8
      src/test/regress/expected/insert.out
  19. 58
      src/test/regress/expected/matview.out
  20. 12
      src/test/regress/expected/polymorphism.out
  21. 6
      src/test/regress/expected/prepared_xacts.out
  22. 36
      src/test/regress/expected/replica_identity.out
  23. 54
      src/test/regress/expected/rules.out
  24. 12
      src/test/regress/expected/tablesample.out
  25. 16
      src/test/regress/expected/triggers.out
  26. 24
      src/test/regress/expected/typed_table.out
  27. 26
      src/test/regress/expected/updatable_views.out
  28. 6
      src/test/regress/expected/with.out

6
contrib/earthdistance/expected/earthdistance.out
Unescape View File

@ -1050,9 +1050,9 @@ drop extension cube cascade;
NOTICE: drop cascades to table foo column f1 NOTICE: drop cascades to table foo column f1
\d foo \d foo
Table "public.foo" Table "public.foo"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
f2 | integer | f2 | integer | | |
-- list what's installed -- list what's installed
\dT public.* \dT public.*

120
contrib/postgres_fdw/expected/postgres_fdw.out
Unescape View File

@ -6708,42 +6708,42 @@ IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest1;
\d import_dest1.* \d import_dest1.*
Foreign table "import_dest1.t1" Foreign table "import_dest1.t1"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+-------------------+-----------+-------------------- --------+-------------------+-----------+----------+---------+--------------------
c1 | integer | | (column_name 'c1') c1 | integer | | | | (column_name 'c1')
c2 | character varying | not null | (column_name 'c2') c2 | character varying | | not null | | (column_name 'c2')
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 't1') FDW Options: (schema_name 'import_source', table_name 't1')
Foreign table "import_dest1.t2" Foreign table "import_dest1.t2"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+-------------------+---------------+-------------------- --------+-------------------+-----------+----------+---------+--------------------
c1 | integer | | (column_name 'c1') c1 | integer | | | | (column_name 'c1')
c2 | character varying | | (column_name 'c2') c2 | character varying | | | | (column_name 'c2')
c3 | text | collate POSIX | (column_name 'c3') c3 | text | POSIX | | | (column_name 'c3')
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 't2') FDW Options: (schema_name 'import_source', table_name 't2')
Foreign table "import_dest1.t3" Foreign table "import_dest1.t3"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+--------------------------+-----------+-------------------- --------+--------------------------+-----------+----------+---------+--------------------
c1 | timestamp with time zone | | (column_name 'c1') c1 | timestamp with time zone | | | | (column_name 'c1')
c2 | typ1 | | (column_name 'c2') c2 | typ1 | | | | (column_name 'c2')
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 't3') FDW Options: (schema_name 'import_source', table_name 't3')
Foreign table "import_dest1.x 4" Foreign table "import_dest1.x 4"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+-----------------------+-----------+--------------------- --------+-----------------------+-----------+----------+---------+---------------------
c1 | double precision | | (column_name 'c1') c1 | double precision | | | | (column_name 'c1')
C 2 | text | | (column_name 'C 2') C 2 | text | | | | (column_name 'C 2')
c3 | character varying(42) | | (column_name 'c3') c3 | character varying(42) | | | | (column_name 'c3')
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 'x 4') FDW Options: (schema_name 'import_source', table_name 'x 4')
Foreign table "import_dest1.x 5" Foreign table "import_dest1.x 5"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+------+-----------+------------- --------+------+-----------+----------+---------+-------------
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 'x 5') FDW Options: (schema_name 'import_source', table_name 'x 5')
@ -6764,42 +6764,42 @@ IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest2
\d import_dest2.* \d import_dest2.*
Foreign table "import_dest2.t1" Foreign table "import_dest2.t1"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+-------------------+-----------+-------------------- --------+-------------------+-----------+----------+---------+--------------------
c1 | integer | | (column_name 'c1') c1 | integer | | | | (column_name 'c1')
c2 | character varying | not null | (column_name 'c2') c2 | character varying | | not null | | (column_name 'c2')
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 't1') FDW Options: (schema_name 'import_source', table_name 't1')
Foreign table "import_dest2.t2" Foreign table "import_dest2.t2"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+-------------------+---------------+-------------------- --------+-------------------+-----------+----------+---------+--------------------
c1 | integer | default 42 | (column_name 'c1') c1 | integer | | | 42 | (column_name 'c1')
c2 | character varying | | (column_name 'c2') c2 | character varying | | | | (column_name 'c2')
c3 | text | collate POSIX | (column_name 'c3') c3 | text | POSIX | | | (column_name 'c3')
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 't2') FDW Options: (schema_name 'import_source', table_name 't2')
Foreign table "import_dest2.t3" Foreign table "import_dest2.t3"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+--------------------------+---------------+-------------------- --------+--------------------------+-----------+----------+---------+--------------------
c1 | timestamp with time zone | default now() | (column_name 'c1') c1 | timestamp with time zone | | | now() | (column_name 'c1')
c2 | typ1 | | (column_name 'c2') c2 | typ1 | | | | (column_name 'c2')
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 't3') FDW Options: (schema_name 'import_source', table_name 't3')
Foreign table "import_dest2.x 4" Foreign table "import_dest2.x 4"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+-----------------------+-----------+--------------------- --------+-----------------------+-----------+----------+---------+---------------------
c1 | double precision | | (column_name 'c1') c1 | double precision | | | | (column_name 'c1')
C 2 | text | | (column_name 'C 2') C 2 | text | | | | (column_name 'C 2')
c3 | character varying(42) | | (column_name 'c3') c3 | character varying(42) | | | | (column_name 'c3')
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 'x 4') FDW Options: (schema_name 'import_source', table_name 'x 4')
Foreign table "import_dest2.x 5" Foreign table "import_dest2.x 5"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+------+-----------+------------- --------+------+-----------+----------+---------+-------------
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 'x 5') FDW Options: (schema_name 'import_source', table_name 'x 5')
@ -6819,42 +6819,42 @@ IMPORT FOREIGN SCHEMA import_source FROM SERVER loopback INTO import_dest3
\d import_dest3.* \d import_dest3.*
Foreign table "import_dest3.t1" Foreign table "import_dest3.t1"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+-------------------+-----------+-------------------- --------+-------------------+-----------+----------+---------+--------------------
c1 | integer | | (column_name 'c1') c1 | integer | | | | (column_name 'c1')
c2 | character varying | | (column_name 'c2') c2 | character varying | | | | (column_name 'c2')
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 't1') FDW Options: (schema_name 'import_source', table_name 't1')
Foreign table "import_dest3.t2" Foreign table "import_dest3.t2"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+-------------------+-----------+-------------------- --------+-------------------+-----------+----------+---------+--------------------
c1 | integer | | (column_name 'c1') c1 | integer | | | | (column_name 'c1')
c2 | character varying | | (column_name 'c2') c2 | character varying | | | | (column_name 'c2')
c3 | text | | (column_name 'c3') c3 | text | | | | (column_name 'c3')
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 't2') FDW Options: (schema_name 'import_source', table_name 't2')
Foreign table "import_dest3.t3" Foreign table "import_dest3.t3"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+--------------------------+-----------+-------------------- --------+--------------------------+-----------+----------+---------+--------------------
c1 | timestamp with time zone | | (column_name 'c1') c1 | timestamp with time zone | | | | (column_name 'c1')
c2 | typ1 | | (column_name 'c2') c2 | typ1 | | | | (column_name 'c2')
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 't3') FDW Options: (schema_name 'import_source', table_name 't3')
Foreign table "import_dest3.x 4" Foreign table "import_dest3.x 4"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+-----------------------+-----------+--------------------- --------+-----------------------+-----------+----------+---------+---------------------
c1 | double precision | | (column_name 'c1') c1 | double precision | | | | (column_name 'c1')
C 2 | text | | (column_name 'C 2') C 2 | text | | | | (column_name 'C 2')
c3 | character varying(42) | | (column_name 'c3') c3 | character varying(42) | | | | (column_name 'c3')
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 'x 4') FDW Options: (schema_name 'import_source', table_name 'x 4')
Foreign table "import_dest3.x 5" Foreign table "import_dest3.x 5"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
--------+------+-----------+------------- --------+------+-----------+----------+---------+-------------
Server: loopback Server: loopback
FDW Options: (schema_name 'import_source', table_name 'x 5') FDW Options: (schema_name 'import_source', table_name 'x 5')

42
contrib/test_decoding/expected/ddl.out
Unescape View File

@ -417,11 +417,11 @@ WITH (user_catalog_table = true)
; ;
\d+ replication_metadata \d+ replication_metadata
Table "public.replication_metadata" Table "public.replication_metadata"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
----------+---------+-------------------------------------------------------------------+----------+--------------+------------- ----------+---------+-----------+----------+--------------------------------------------------+----------+--------------+-------------
id | integer | not null default nextval('replication_metadata_id_seq'::regclass) | plain | | id | integer | | not null | nextval('replication_metadata_id_seq'::regclass) | plain | |
relation | name | not null | plain | | relation | name | | not null | | plain | |
options | text[] | | extended | | options | text[] | | | | extended | |
Indexes: Indexes:
"replication_metadata_pkey" PRIMARY KEY, btree (id) "replication_metadata_pkey" PRIMARY KEY, btree (id)
Options: user_catalog_table=true Options: user_catalog_table=true
@ -431,11 +431,11 @@ VALUES ('foo', ARRAY['a', 'b']);
ALTER TABLE replication_metadata RESET (user_catalog_table); ALTER TABLE replication_metadata RESET (user_catalog_table);
\d+ replication_metadata \d+ replication_metadata
Table "public.replication_metadata" Table "public.replication_metadata"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
----------+---------+-------------------------------------------------------------------+----------+--------------+------------- ----------+---------+-----------+----------+--------------------------------------------------+----------+--------------+-------------
id | integer | not null default nextval('replication_metadata_id_seq'::regclass) | plain | | id | integer | | not null | nextval('replication_metadata_id_seq'::regclass) | plain | |
relation | name | not null | plain | | relation | name | | not null | | plain | |
options | text[] | | extended | | options | text[] | | | | extended | |
Indexes: Indexes:
"replication_metadata_pkey" PRIMARY KEY, btree (id) "replication_metadata_pkey" PRIMARY KEY, btree (id)
@ -444,11 +444,11 @@ VALUES ('bar', ARRAY['a', 'b']);
ALTER TABLE replication_metadata SET (user_catalog_table = true); ALTER TABLE replication_metadata SET (user_catalog_table = true);
\d+ replication_metadata \d+ replication_metadata
Table "public.replication_metadata" Table "public.replication_metadata"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
----------+---------+-------------------------------------------------------------------+----------+--------------+------------- ----------+---------+-----------+----------+--------------------------------------------------+----------+--------------+-------------
id | integer | not null default nextval('replication_metadata_id_seq'::regclass) | plain | | id | integer | | not null | nextval('replication_metadata_id_seq'::regclass) | plain | |
relation | name | not null | plain | | relation | name | | not null | | plain | |
options | text[] | | extended | | options | text[] | | | | extended | |
Indexes: Indexes:
"replication_metadata_pkey" PRIMARY KEY, btree (id) "replication_metadata_pkey" PRIMARY KEY, btree (id)
Options: user_catalog_table=true Options: user_catalog_table=true
@ -462,12 +462,12 @@ ERROR: cannot rewrite table "replication_metadata" used as a catalog table
ALTER TABLE replication_metadata SET (user_catalog_table = false); ALTER TABLE replication_metadata SET (user_catalog_table = false);
\d+ replication_metadata \d+ replication_metadata
Table "public.replication_metadata" Table "public.replication_metadata"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
----------------+---------+-------------------------------------------------------------------+----------+--------------+------------- ----------------+---------+-----------+----------+--------------------------------------------------+----------+--------------+-------------
id | integer | not null default nextval('replication_metadata_id_seq'::regclass) | plain | | id | integer | | not null | nextval('replication_metadata_id_seq'::regclass) | plain | |
relation | name | not null | plain | | relation | name | | not null | | plain | |
options | text[] | | extended | | options | text[] | | | | extended | |
rewritemeornot | integer | | plain | | rewritemeornot | integer | | | | plain | |
Indexes: Indexes:
"replication_metadata_pkey" PRIMARY KEY, btree (id) "replication_metadata_pkey" PRIMARY KEY, btree (id)
Options: user_catalog_table=false Options: user_catalog_table=false

6
doc/src/sgml/ref/create_index.sgml
Unescape View File

@ -459,9 +459,9 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
<programlisting> <programlisting>
postgres=# \d tab postgres=# \d tab
Table "public.tab" Table "public.tab"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
col | integer | col | integer | | |
Indexes: Indexes:
"idx" btree (col) INVALID "idx" btree (col) INVALID
</programlisting> </programlisting>

11
doc/src/sgml/ref/psql-ref.sgml
Unescape View File

@ -4081,12 +4081,11 @@ CREATE TABLE
Now look at the table definition again: Now look at the table definition again:
<programlisting> <programlisting>
testdb=&gt; <userinput>\d my_table</userinput> testdb=&gt; <userinput>\d my_table</userinput>
Table "my_table" Table "public.my_table"
Attribute | Type | Modifier Column | Type | Collation | Nullable | Default
-----------+---------+-------------------- --------+---------+-----------+----------+---------
first | integer | not null default 0 first | integer | | not null | 0
second | text | second | text | | |
</programlisting> </programlisting>
Now we change the prompt to something more interesting: Now we change the prompt to something more interesting:
<programlisting> <programlisting>

71
src/bin/psql/describe.c
Unescape View File

@ -1322,9 +1322,8 @@ describeOneTableDetails(const char *schemaname,
bool printTableInitialized = false; bool printTableInitialized = false;
int i; int i;
char *view_def = NULL; char *view_def = NULL;
char *headers[9]; char *headers[11];
char **seq_values = NULL; char **seq_values = NULL;
char **modifiers = NULL;
char **ptr; char **ptr;
PQExpBufferData title; PQExpBufferData title;
PQExpBufferData tmpbuf; PQExpBufferData tmpbuf;
@ -1346,7 +1345,7 @@ describeOneTableDetails(const char *schemaname,
char relpersistence; char relpersistence;
char relreplident; char relreplident;
} tableinfo; } tableinfo;
bool show_modifiers = false; bool show_column_details = false;
bool retval; bool retval;
retval = false; retval = false;
@ -1649,9 +1648,10 @@ describeOneTableDetails(const char *schemaname,
tableinfo.relkind == 'm' || tableinfo.relkind == 'm' ||
tableinfo.relkind == 'f' || tableinfo.relkind == 'c') tableinfo.relkind == 'f' || tableinfo.relkind == 'c')
{ {
show_modifiers = true; headers[cols++] = gettext_noop("Collation");
headers[cols++] = gettext_noop("Modifiers"); headers[cols++] = gettext_noop("Nullable");
modifiers = pg_malloc0((numrows + 1) * sizeof(*modifiers)); headers[cols++] = gettext_noop("Default");
show_column_details = true;
} }
if (tableinfo.relkind == 'S') if (tableinfo.relkind == 'S')
@ -1709,39 +1709,15 @@ describeOneTableDetails(const char *schemaname,
/* Type */ /* Type */
printTableAddCell(&cont, PQgetvalue(res, i, 1), false, false); printTableAddCell(&cont, PQgetvalue(res, i, 1), false, false);
/* Modifiers: collate, not null, default */ /* Collation, Nullable, Default */
if (show_modifiers) if (show_column_details)
{ {
resetPQExpBuffer(&tmpbuf); printTableAddCell(&cont, PQgetvalue(res, i, 5), false, false);
if (!PQgetisnull(res, i, 5))
{
if (tmpbuf.len > 0)
appendPQExpBufferChar(&tmpbuf, ' ');
appendPQExpBuffer(&tmpbuf, _("collate %s"),
PQgetvalue(res, i, 5));
}
if (strcmp(PQgetvalue(res, i, 3), "t") == 0) printTableAddCell(&cont, strcmp(PQgetvalue(res, i, 3), "t") == 0 ? "not null" : "", false, false);
{
if (tmpbuf.len > 0)
appendPQExpBufferChar(&tmpbuf, ' ');
appendPQExpBufferStr(&tmpbuf, _("not null"));
}
/* handle "default" here */
/* (note: above we cut off the 'default' string at 128) */ /* (note: above we cut off the 'default' string at 128) */
if (strlen(PQgetvalue(res, i, 2)) != 0) printTableAddCell(&cont, PQgetvalue(res, i, 2), false, false);
{
if (tmpbuf.len > 0)
appendPQExpBufferChar(&tmpbuf, ' ');
/* translator: default values of column definitions */
appendPQExpBuffer(&tmpbuf, _("default %s"),
PQgetvalue(res, i, 2));
}
modifiers[i] = pg_strdup(tmpbuf.data);
printTableAddCell(&cont, modifiers[i], false, false);
} }
/* Value: for sequences only */ /* Value: for sequences only */
@ -2670,13 +2646,6 @@ error_return:
free(seq_values); free(seq_values);
} }
if (modifiers)
{
for (ptr = modifiers; *ptr; ptr++)
free(*ptr);
free(modifiers);
}
if (view_def) if (view_def)
free(view_def); free(view_def);
@ -3235,24 +3204,24 @@ listDomains(const char *pattern, bool verbose, bool showSystem)
printfPQExpBuffer(&buf, printfPQExpBuffer(&buf,
"SELECT n.nspname as \"%s\",\n" "SELECT n.nspname as \"%s\",\n"
" t.typname as \"%s\",\n" " t.typname as \"%s\",\n"
" pg_catalog.format_type(t.typbasetype, t.typtypmod) as \"%s\",\n" " pg_catalog.format_type(t.typbasetype, t.typtypmod) as \"%s\",\n",
" TRIM(LEADING\n",
gettext_noop("Schema"), gettext_noop("Schema"),
gettext_noop("Name"), gettext_noop("Name"),
gettext_noop("Type")); gettext_noop("Type"));
if (pset.sversion >= 90100) if (pset.sversion >= 90100)
appendPQExpBufferStr(&buf,
" COALESCE((SELECT ' collate ' || c.collname FROM pg_catalog.pg_collation c, pg_catalog.pg_type bt\n"
" WHERE c.oid = t.typcollation AND bt.oid = t.typbasetype AND t.typcollation <> bt.typcollation), '') ||\n");
appendPQExpBuffer(&buf, appendPQExpBuffer(&buf,
" CASE WHEN t.typnotnull THEN ' not null' ELSE '' END ||\n" " (SELECT c.collname FROM pg_catalog.pg_collation c, pg_catalog.pg_type bt\n"
" CASE WHEN t.typdefault IS NOT NULL THEN ' default ' || t.typdefault ELSE '' END\n" " WHERE c.oid = t.typcollation AND bt.oid = t.typbasetype AND t.typcollation <> bt.typcollation) as \"%s\",\n",
" ) as \"%s\",\n" gettext_noop("Collation"));
appendPQExpBuffer(&buf,
" CASE WHEN t.typnotnull THEN 'not null' END as \"%s\",\n"
" t.typdefault as \"%s\",\n"
" pg_catalog.array_to_string(ARRAY(\n" " pg_catalog.array_to_string(ARRAY(\n"
" SELECT pg_catalog.pg_get_constraintdef(r.oid, true) FROM pg_catalog.pg_constraint r WHERE t.oid = r.contypid\n" " SELECT pg_catalog.pg_get_constraintdef(r.oid, true) FROM pg_catalog.pg_constraint r WHERE t.oid = r.contypid\n"
" ), ' ') as \"%s\"", " ), ' ') as \"%s\"",
gettext_noop("Modifier"), gettext_noop("Nullable"),
gettext_noop("Default"),
gettext_noop("Check")); gettext_noop("Check"));
if (verbose) if (verbose)

4
src/interfaces/ecpg/test/compat_informix/test_informix2.pgc
Unescape View File

@ -113,8 +113,8 @@ int main(void)
/* /*
Table "public.history" Table "public.history"
Column | Type | Modifiers Column | Type | Nullable
--------------+-----------------------------+----------- --------------+-----------------------------+----------
customerid | integer | not null customerid | integer | not null
timestamp | timestamp without time zone | not null timestamp | timestamp without time zone | not null
action_taken | character(5) | not null action_taken | character(5) | not null

4
src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c
Unescape View File

@ -281,8 +281,8 @@ if (sqlca.sqlcode < 0) sqlprint();}
/* /*
Table "public.history" Table "public.history"
Column | Type | Modifiers Column | Type | Nullable
--------------+-----------------------------+----------- --------------+-----------------------------+----------
customerid | integer | not null customerid | integer | not null
timestamp | timestamp without time zone | not null timestamp | timestamp without time zone | not null
action_taken | character(5) | not null action_taken | character(5) | not null

402
src/test/regress/expected/alter_table.out
Unescape View File

@ -181,11 +181,11 @@ ALTER TABLE onek DROP CONSTRAINT onek_unique1_constraint_foo;
CREATE TABLE constraint_rename_test (a int CONSTRAINT con1 CHECK (a > 0), b int, c int); CREATE TABLE constraint_rename_test (a int CONSTRAINT con1 CHECK (a > 0), b int, c int);
\d constraint_rename_test \d constraint_rename_test
Table "public.constraint_rename_test" Table "public.constraint_rename_test"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | integer | b | integer | | |
c | integer | c | integer | | |
Check constraints: Check constraints:
"con1" CHECK (a > 0) "con1" CHECK (a > 0)
@ -194,12 +194,12 @@ NOTICE: merging column "a" with inherited definition
NOTICE: merging constraint "con1" with inherited definition NOTICE: merging constraint "con1" with inherited definition
\d constraint_rename_test2 \d constraint_rename_test2
Table "public.constraint_rename_test2" Table "public.constraint_rename_test2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | integer | b | integer | | |
c | integer | c | integer | | |
d | integer | d | integer | | |
Check constraints: Check constraints:
"con1" CHECK (a > 0) "con1" CHECK (a > 0)
Inherits: constraint_rename_test Inherits: constraint_rename_test
@ -211,23 +211,23 @@ ERROR: inherited constraint "con1" must be renamed in child tables too
ALTER TABLE constraint_rename_test RENAME CONSTRAINT con1 TO con1foo; -- ok ALTER TABLE constraint_rename_test RENAME CONSTRAINT con1 TO con1foo; -- ok
\d constraint_rename_test \d constraint_rename_test
Table "public.constraint_rename_test" Table "public.constraint_rename_test"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | integer | b | integer | | |
c | integer | c | integer | | |
Check constraints: Check constraints:
"con1foo" CHECK (a > 0) "con1foo" CHECK (a > 0)
Number of child tables: 1 (Use \d+ to list them.) Number of child tables: 1 (Use \d+ to list them.)
\d constraint_rename_test2 \d constraint_rename_test2
Table "public.constraint_rename_test2" Table "public.constraint_rename_test2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | integer | b | integer | | |
c | integer | c | integer | | |
d | integer | d | integer | | |
Check constraints: Check constraints:
"con1foo" CHECK (a > 0) "con1foo" CHECK (a > 0)
Inherits: constraint_rename_test Inherits: constraint_rename_test
@ -237,11 +237,11 @@ ALTER TABLE ONLY constraint_rename_test RENAME CONSTRAINT con2 TO con2foo; -- ok
ALTER TABLE constraint_rename_test RENAME CONSTRAINT con2foo TO con2bar; -- ok ALTER TABLE constraint_rename_test RENAME CONSTRAINT con2foo TO con2bar; -- ok
\d constraint_rename_test \d constraint_rename_test
Table "public.constraint_rename_test" Table "public.constraint_rename_test"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | integer | b | integer | | |
c | integer | c | integer | | |
Check constraints: Check constraints:
"con1foo" CHECK (a > 0) "con1foo" CHECK (a > 0)
"con2bar" CHECK (b > 0) NO INHERIT "con2bar" CHECK (b > 0) NO INHERIT
@ -249,12 +249,12 @@ Number of child tables: 1 (Use \d+ to list them.)
\d constraint_rename_test2 \d constraint_rename_test2
Table "public.constraint_rename_test2" Table "public.constraint_rename_test2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | integer | b | integer | | |
c | integer | c | integer | | |
d | integer | d | integer | | |
Check constraints: Check constraints:
"con1foo" CHECK (a > 0) "con1foo" CHECK (a > 0)
Inherits: constraint_rename_test Inherits: constraint_rename_test
@ -263,11 +263,11 @@ ALTER TABLE constraint_rename_test ADD CONSTRAINT con3 PRIMARY KEY (a);
ALTER TABLE constraint_rename_test RENAME CONSTRAINT con3 TO con3foo; -- ok ALTER TABLE constraint_rename_test RENAME CONSTRAINT con3 TO con3foo; -- ok
\d constraint_rename_test \d constraint_rename_test
Table "public.constraint_rename_test" Table "public.constraint_rename_test"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | not null a | integer | | not null |
b | integer | b | integer | | |
c | integer | c | integer | | |
Indexes: Indexes:
"con3foo" PRIMARY KEY, btree (a) "con3foo" PRIMARY KEY, btree (a)
Check constraints: Check constraints:
@ -277,12 +277,12 @@ Number of child tables: 1 (Use \d+ to list them.)
\d constraint_rename_test2 \d constraint_rename_test2
Table "public.constraint_rename_test2" Table "public.constraint_rename_test2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | integer | b | integer | | |
c | integer | c | integer | | |
d | integer | d | integer | | |
Check constraints: Check constraints:
"con1foo" CHECK (a > 0) "con1foo" CHECK (a > 0)
Inherits: constraint_rename_test Inherits: constraint_rename_test
@ -384,9 +384,9 @@ create table nv_parent (d date, check (false) no inherit not valid);
-- not valid constraint added at creation time should automatically become valid -- not valid constraint added at creation time should automatically become valid
\d nv_parent \d nv_parent
Table "public.nv_parent" Table "public.nv_parent"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+------+----------- --------+------+-----------+----------+---------
d | date | d | date | | |
Check constraints: Check constraints:
"nv_parent_check" CHECK (false) NO INHERIT "nv_parent_check" CHECK (false) NO INHERIT
@ -451,9 +451,9 @@ explain (costs off) select * from nv_parent where d between '2009-08-01'::date a
alter table nv_parent add check (d between '2001-01-01'::date and '2099-12-31'::date) not valid; alter table nv_parent add check (d between '2001-01-01'::date and '2099-12-31'::date) not valid;
\d nv_child_2009 \d nv_child_2009
Table "public.nv_child_2009" Table "public.nv_child_2009"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+------+----------- --------+------+-----------+----------+---------
d | date | d | date | | |
Check constraints: Check constraints:
"nv_child_2009_d_check" CHECK (d >= '01-01-2009'::date AND d <= '12-31-2009'::date) "nv_child_2009_d_check" CHECK (d >= '01-01-2009'::date AND d <= '12-31-2009'::date)
"nv_parent_d_check" CHECK (d >= '01-01-2001'::date AND d <= '12-31-2099'::date) NOT VALID "nv_parent_d_check" CHECK (d >= '01-01-2001'::date AND d <= '12-31-2099'::date) NOT VALID
@ -1905,20 +1905,20 @@ CREATE TABLE test_inh_check (a float check (a > 10.2), b float);
CREATE TABLE test_inh_check_child() INHERITS(test_inh_check); CREATE TABLE test_inh_check_child() INHERITS(test_inh_check);
\d test_inh_check \d test_inh_check
Table "public.test_inh_check" Table "public.test_inh_check"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+------------------+----------- --------+------------------+-----------+----------+---------
a | double precision | a | double precision | | |
b | double precision | b | double precision | | |
Check constraints: Check constraints:
"test_inh_check_a_check" CHECK (a > 10.2::double precision) "test_inh_check_a_check" CHECK (a > 10.2::double precision)
Number of child tables: 1 (Use \d+ to list them.) Number of child tables: 1 (Use \d+ to list them.)
\d test_inh_check_child \d test_inh_check_child
Table "public.test_inh_check_child" Table "public.test_inh_check_child"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+------------------+----------- --------+------------------+-----------+----------+---------
a | double precision | a | double precision | | |
b | double precision | b | double precision | | |
Check constraints: Check constraints:
"test_inh_check_a_check" CHECK (a > 10.2::double precision) "test_inh_check_a_check" CHECK (a > 10.2::double precision)
Inherits: test_inh_check Inherits: test_inh_check
@ -1936,20 +1936,20 @@ select relname, conname, coninhcount, conislocal, connoinherit
ALTER TABLE test_inh_check ALTER COLUMN a TYPE numeric; ALTER TABLE test_inh_check ALTER COLUMN a TYPE numeric;
\d test_inh_check \d test_inh_check
Table "public.test_inh_check" Table "public.test_inh_check"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+------------------+----------- --------+------------------+-----------+----------+---------
a | numeric | a | numeric | | |
b | double precision | b | double precision | | |
Check constraints: Check constraints:
"test_inh_check_a_check" CHECK (a::double precision > 10.2::double precision) "test_inh_check_a_check" CHECK (a::double precision > 10.2::double precision)
Number of child tables: 1 (Use \d+ to list them.) Number of child tables: 1 (Use \d+ to list them.)
\d test_inh_check_child \d test_inh_check_child
Table "public.test_inh_check_child" Table "public.test_inh_check_child"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+------------------+----------- --------+------------------+-----------+----------+---------
a | numeric | a | numeric | | |
b | double precision | b | double precision | | |
Check constraints: Check constraints:
"test_inh_check_a_check" CHECK (a::double precision > 10.2::double precision) "test_inh_check_a_check" CHECK (a::double precision > 10.2::double precision)
Inherits: test_inh_check Inherits: test_inh_check
@ -1972,10 +1972,10 @@ ALTER TABLE test_inh_check ADD CONSTRAINT bmerged CHECK (b > 1);
NOTICE: merging constraint "bmerged" with inherited definition NOTICE: merging constraint "bmerged" with inherited definition
\d test_inh_check \d test_inh_check
Table "public.test_inh_check" Table "public.test_inh_check"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+------------------+----------- --------+------------------+-----------+----------+---------
a | numeric | a | numeric | | |
b | double precision | b | double precision | | |
Check constraints: Check constraints:
"bmerged" CHECK (b > 1::double precision) "bmerged" CHECK (b > 1::double precision)
"bnoinherit" CHECK (b > 100::double precision) NO INHERIT "bnoinherit" CHECK (b > 100::double precision) NO INHERIT
@ -1984,10 +1984,10 @@ Number of child tables: 1 (Use \d+ to list them.)
\d test_inh_check_child \d test_inh_check_child
Table "public.test_inh_check_child" Table "public.test_inh_check_child"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+------------------+----------- --------+------------------+-----------+----------+---------
a | numeric | a | numeric | | |
b | double precision | b | double precision | | |
Check constraints: Check constraints:
"blocal" CHECK (b < 1000::double precision) "blocal" CHECK (b < 1000::double precision)
"bmerged" CHECK (b > 1::double precision) "bmerged" CHECK (b > 1::double precision)
@ -2012,10 +2012,10 @@ ALTER TABLE test_inh_check ALTER COLUMN b TYPE numeric;
NOTICE: merging constraint "bmerged" with inherited definition NOTICE: merging constraint "bmerged" with inherited definition
\d test_inh_check \d test_inh_check
Table "public.test_inh_check" Table "public.test_inh_check"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | numeric | a | numeric | | |
b | numeric | b | numeric | | |
Check constraints: Check constraints:
"bmerged" CHECK (b::double precision > 1::double precision) "bmerged" CHECK (b::double precision > 1::double precision)
"bnoinherit" CHECK (b::double precision > 100::double precision) NO INHERIT "bnoinherit" CHECK (b::double precision > 100::double precision) NO INHERIT
@ -2024,10 +2024,10 @@ Number of child tables: 1 (Use \d+ to list them.)
\d test_inh_check_child \d test_inh_check_child
Table "public.test_inh_check_child" Table "public.test_inh_check_child"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | numeric | a | numeric | | |
b | numeric | b | numeric | | |
Check constraints: Check constraints:
"blocal" CHECK (b::double precision < 1000::double precision) "blocal" CHECK (b::double precision < 1000::double precision)
"bmerged" CHECK (b::double precision > 1::double precision) "bmerged" CHECK (b::double precision > 1::double precision)
@ -2057,10 +2057,10 @@ ANALYZE check_fk_presence_2;
ROLLBACK; ROLLBACK;
\d check_fk_presence_2 \d check_fk_presence_2
Table "public.check_fk_presence_2" Table "public.check_fk_presence_2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
id | integer | id | integer | | |
t | text | t | text | | |
Foreign-key constraints: Foreign-key constraints:
"check_fk_presence_2_id_fkey" FOREIGN KEY (id) REFERENCES check_fk_presence_1(id) "check_fk_presence_2_id_fkey" FOREIGN KEY (id) REFERENCES check_fk_presence_1(id)
@ -2415,44 +2415,44 @@ drop cascades to text search dictionary dict
CREATE TYPE test_type AS (a int); CREATE TYPE test_type AS (a int);
\d test_type \d test_type
Composite type "public.test_type" Composite type "public.test_type"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
ALTER TYPE nosuchtype ADD ATTRIBUTE b text; -- fails ALTER TYPE nosuchtype ADD ATTRIBUTE b text; -- fails
ERROR: relation "nosuchtype" does not exist ERROR: relation "nosuchtype" does not exist
ALTER TYPE test_type ADD ATTRIBUTE b text; ALTER TYPE test_type ADD ATTRIBUTE b text;
\d test_type \d test_type
Composite type "public.test_type" Composite type "public.test_type"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | text | b | text | | |
ALTER TYPE test_type ADD ATTRIBUTE b text; -- fails ALTER TYPE test_type ADD ATTRIBUTE b text; -- fails
ERROR: column "b" of relation "test_type" already exists ERROR: column "b" of relation "test_type" already exists
ALTER TYPE test_type ALTER ATTRIBUTE b SET DATA TYPE varchar; ALTER TYPE test_type ALTER ATTRIBUTE b SET DATA TYPE varchar;
\d test_type \d test_type
Composite type "public.test_type" Composite type "public.test_type"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+-------------------+----------- --------+-------------------+-----------+----------+---------
a | integer | a | integer | | |
b | character varying | b | character varying | | |
ALTER TYPE test_type ALTER ATTRIBUTE b SET DATA TYPE integer; ALTER TYPE test_type ALTER ATTRIBUTE b SET DATA TYPE integer;
\d test_type \d test_type
Composite type "public.test_type" Composite type "public.test_type"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | integer | b | integer | | |
ALTER TYPE test_type DROP ATTRIBUTE b; ALTER TYPE test_type DROP ATTRIBUTE b;
\d test_type \d test_type
Composite type "public.test_type" Composite type "public.test_type"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
ALTER TYPE test_type DROP ATTRIBUTE c; -- fails ALTER TYPE test_type DROP ATTRIBUTE c; -- fails
ERROR: column "c" of relation "test_type" does not exist ERROR: column "c" of relation "test_type" does not exist
@ -2461,18 +2461,18 @@ NOTICE: column "c" of relation "test_type" does not exist, skipping
ALTER TYPE test_type DROP ATTRIBUTE a, ADD ATTRIBUTE d boolean; ALTER TYPE test_type DROP ATTRIBUTE a, ADD ATTRIBUTE d boolean;
\d test_type \d test_type
Composite type "public.test_type" Composite type "public.test_type"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
d | boolean | d | boolean | | |
ALTER TYPE test_type RENAME ATTRIBUTE a TO aa; ALTER TYPE test_type RENAME ATTRIBUTE a TO aa;
ERROR: column "a" does not exist ERROR: column "a" does not exist
ALTER TYPE test_type RENAME ATTRIBUTE d TO dd; ALTER TYPE test_type RENAME ATTRIBUTE d TO dd;
\d test_type \d test_type
Composite type "public.test_type" Composite type "public.test_type"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
dd | boolean | dd | boolean | | |
DROP TYPE test_type; DROP TYPE test_type;
CREATE TYPE test_type1 AS (a int, b text); CREATE TYPE test_type1 AS (a int, b text);
@ -2484,17 +2484,17 @@ CREATE TABLE test_tbl2 OF test_type2;
CREATE TABLE test_tbl2_subclass () INHERITS (test_tbl2); CREATE TABLE test_tbl2_subclass () INHERITS (test_tbl2);
\d test_type2 \d test_type2
Composite type "public.test_type2" Composite type "public.test_type2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | text | b | text | | |
\d test_tbl2 \d test_tbl2
Table "public.test_tbl2" Table "public.test_tbl2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | text | b | text | | |
Number of child tables: 1 (Use \d+ to list them.) Number of child tables: 1 (Use \d+ to list them.)
Typed table of type: test_type2 Typed table of type: test_type2
@ -2504,19 +2504,19 @@ HINT: Use ALTER ... CASCADE to alter the typed tables too.
ALTER TYPE test_type2 ADD ATTRIBUTE c text CASCADE; ALTER TYPE test_type2 ADD ATTRIBUTE c text CASCADE;
\d test_type2 \d test_type2
Composite type "public.test_type2" Composite type "public.test_type2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | text | b | text | | |
c | text | c | text | | |
\d test_tbl2 \d test_tbl2
Table "public.test_tbl2" Table "public.test_tbl2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | text | b | text | | |
c | text | c | text | | |
Number of child tables: 1 (Use \d+ to list them.) Number of child tables: 1 (Use \d+ to list them.)
Typed table of type: test_type2 Typed table of type: test_type2
@ -2526,19 +2526,19 @@ HINT: Use ALTER ... CASCADE to alter the typed tables too.
ALTER TYPE test_type2 ALTER ATTRIBUTE b TYPE varchar CASCADE; ALTER TYPE test_type2 ALTER ATTRIBUTE b TYPE varchar CASCADE;
\d test_type2 \d test_type2
Composite type "public.test_type2" Composite type "public.test_type2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+-------------------+----------- --------+-------------------+-----------+----------+---------
a | integer | a | integer | | |
b | character varying | b | character varying | | |
c | text | c | text | | |
\d test_tbl2 \d test_tbl2
Table "public.test_tbl2" Table "public.test_tbl2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+-------------------+----------- --------+-------------------+-----------+----------+---------
a | integer | a | integer | | |
b | character varying | b | character varying | | |
c | text | c | text | | |
Number of child tables: 1 (Use \d+ to list them.) Number of child tables: 1 (Use \d+ to list them.)
Typed table of type: test_type2 Typed table of type: test_type2
@ -2548,17 +2548,17 @@ HINT: Use ALTER ... CASCADE to alter the typed tables too.
ALTER TYPE test_type2 DROP ATTRIBUTE b CASCADE; ALTER TYPE test_type2 DROP ATTRIBUTE b CASCADE;
\d test_type2 \d test_type2
Composite type "public.test_type2" Composite type "public.test_type2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
c | text | c | text | | |
\d test_tbl2 \d test_tbl2
Table "public.test_tbl2" Table "public.test_tbl2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
c | text | c | text | | |
Number of child tables: 1 (Use \d+ to list them.) Number of child tables: 1 (Use \d+ to list them.)
Typed table of type: test_type2 Typed table of type: test_type2
@ -2568,26 +2568,26 @@ HINT: Use ALTER ... CASCADE to alter the typed tables too.
ALTER TYPE test_type2 RENAME ATTRIBUTE a TO aa CASCADE; ALTER TYPE test_type2 RENAME ATTRIBUTE a TO aa CASCADE;
\d test_type2 \d test_type2
Composite type "public.test_type2" Composite type "public.test_type2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
aa | integer | aa | integer | | |
c | text | c | text | | |
\d test_tbl2 \d test_tbl2
Table "public.test_tbl2" Table "public.test_tbl2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
aa | integer | aa | integer | | |
c | text | c | text | | |
Number of child tables: 1 (Use \d+ to list them.) Number of child tables: 1 (Use \d+ to list them.)
Typed table of type: test_type2 Typed table of type: test_type2
\d test_tbl2_subclass \d test_tbl2_subclass
Table "public.test_tbl2_subclass" Table "public.test_tbl2_subclass"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
aa | integer | aa | integer | | |
c | text | c | text | | |
Inherits: test_tbl2 Inherits: test_tbl2
DROP TABLE test_tbl2_subclass; DROP TABLE test_tbl2_subclass;
@ -2632,10 +2632,10 @@ ALTER TABLE tt7 OF tt_t1; -- reassign an already-typed table
ALTER TABLE tt7 NOT OF; ALTER TABLE tt7 NOT OF;
\d tt7 \d tt7
Table "public.tt7" Table "public.tt7"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+--------------+----------- --------+--------------+-----------+----------+---------
x | integer | x | integer | | |
y | numeric(8,2) | y | numeric(8,2) | | |
-- make sure we can drop a constraint on the parent but it remains on the child -- make sure we can drop a constraint on the parent but it remains on the child
CREATE TABLE test_drop_constr_parent (c text CHECK (c IS NOT NULL)); CREATE TABLE test_drop_constr_parent (c text CHECK (c IS NOT NULL));
@ -2672,10 +2672,10 @@ ALTER TABLE IF EXISTS tt8 RENAME COLUMN f TO f1;
ALTER TABLE IF EXISTS tt8 SET SCHEMA alter2; ALTER TABLE IF EXISTS tt8 SET SCHEMA alter2;
\d alter2.tt8 \d alter2.tt8
Table "alter2.tt8" Table "alter2.tt8"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+-------------------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
f1 | integer | not null default 0 f1 | integer | | not null | 0
Indexes: Indexes:
"xxx" PRIMARY KEY, btree (f1) "xxx" PRIMARY KEY, btree (f1)
Check constraints: Check constraints:
@ -2889,38 +2889,38 @@ DROP TABLE logged1;
CREATE TABLE test_add_column(c1 integer); CREATE TABLE test_add_column(c1 integer);
\d test_add_column \d test_add_column
Table "public.test_add_column" Table "public.test_add_column"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
c1 | integer | c1 | integer | | |
ALTER TABLE test_add_column ALTER TABLE test_add_column
ADD COLUMN c2 integer; ADD COLUMN c2 integer;
\d test_add_column \d test_add_column
Table "public.test_add_column" Table "public.test_add_column"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
c1 | integer | c1 | integer | | |
c2 | integer | c2 | integer | | |
ALTER TABLE test_add_column ALTER TABLE test_add_column
ADD COLUMN c2 integer; -- fail because c2 already exists ADD COLUMN c2 integer; -- fail because c2 already exists
ERROR: column "c2" of relation "test_add_column" already exists ERROR: column "c2" of relation "test_add_column" already exists
\d test_add_column \d test_add_column
Table "public.test_add_column" Table "public.test_add_column"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
c1 | integer | c1 | integer | | |
c2 | integer | c2 | integer | | |
ALTER TABLE test_add_column ALTER TABLE test_add_column
ADD COLUMN IF NOT EXISTS c2 integer; -- skipping because c2 already exists ADD COLUMN IF NOT EXISTS c2 integer; -- skipping because c2 already exists
NOTICE: column "c2" of relation "test_add_column" already exists, skipping NOTICE: column "c2" of relation "test_add_column" already exists, skipping
\d test_add_column \d test_add_column
Table "public.test_add_column" Table "public.test_add_column"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
c1 | integer | c1 | integer | | |
c2 | integer | c2 | integer | | |
ALTER TABLE test_add_column ALTER TABLE test_add_column
ADD COLUMN c2 integer, -- fail because c2 already exists ADD COLUMN c2 integer, -- fail because c2 already exists
@ -2928,10 +2928,10 @@ ALTER TABLE test_add_column
ERROR: column "c2" of relation "test_add_column" already exists ERROR: column "c2" of relation "test_add_column" already exists
\d test_add_column \d test_add_column
Table "public.test_add_column" Table "public.test_add_column"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
c1 | integer | c1 | integer | | |
c2 | integer | c2 | integer | | |
ALTER TABLE test_add_column ALTER TABLE test_add_column
ADD COLUMN IF NOT EXISTS c2 integer, -- skipping because c2 already exists ADD COLUMN IF NOT EXISTS c2 integer, -- skipping because c2 already exists
@ -2939,11 +2939,11 @@ ALTER TABLE test_add_column
NOTICE: column "c2" of relation "test_add_column" already exists, skipping NOTICE: column "c2" of relation "test_add_column" already exists, skipping
\d test_add_column \d test_add_column
Table "public.test_add_column" Table "public.test_add_column"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
c1 | integer | c1 | integer | | |
c2 | integer | c2 | integer | | |
c3 | integer | c3 | integer | | |
ALTER TABLE test_add_column ALTER TABLE test_add_column
ADD COLUMN IF NOT EXISTS c2 integer, -- skipping because c2 already exists ADD COLUMN IF NOT EXISTS c2 integer, -- skipping because c2 already exists
@ -2952,11 +2952,11 @@ NOTICE: column "c2" of relation "test_add_column" already exists, skipping
NOTICE: column "c3" of relation "test_add_column" already exists, skipping NOTICE: column "c3" of relation "test_add_column" already exists, skipping
\d test_add_column \d test_add_column
Table "public.test_add_column" Table "public.test_add_column"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
c1 | integer | c1 | integer | | |
c2 | integer | c2 | integer | | |
c3 | integer | c3 | integer | | |
ALTER TABLE test_add_column ALTER TABLE test_add_column
ADD COLUMN IF NOT EXISTS c2 integer, -- skipping because c2 already exists ADD COLUMN IF NOT EXISTS c2 integer, -- skipping because c2 already exists
@ -2966,11 +2966,11 @@ NOTICE: column "c2" of relation "test_add_column" already exists, skipping
NOTICE: column "c3" of relation "test_add_column" already exists, skipping NOTICE: column "c3" of relation "test_add_column" already exists, skipping
\d test_add_column \d test_add_column
Table "public.test_add_column" Table "public.test_add_column"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
c1 | integer | c1 | integer | | |
c2 | integer | c2 | integer | | |
c3 | integer | c3 | integer | | |
c4 | integer | c4 | integer | | |
DROP TABLE test_add_column; DROP TABLE test_add_column;

28
src/test/regress/expected/collate.linux.utf8.out
Unescape View File

@ -10,10 +10,10 @@ CREATE TABLE collate_test1 (
); );
\d collate_test1 \d collate_test1
Table "public.collate_test1" Table "public.collate_test1"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+------------------------ --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | text | collate en_US not null b | text | en_US | not null |
CREATE TABLE collate_test_fail ( CREATE TABLE collate_test_fail (
a int, a int,
@ -41,10 +41,10 @@ CREATE TABLE collate_test_like (
); );
\d collate_test_like \d collate_test_like
Table "public.collate_test_like" Table "public.collate_test_like"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+------------------------ --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | text | collate en_US not null b | text | en_US | not null |
CREATE TABLE collate_test2 ( CREATE TABLE collate_test2 (
a int, a int,
@ -1045,15 +1045,15 @@ drop cascades to view collate_dep_test3
drop cascades to index collate_dep_test4i drop cascades to index collate_dep_test4i
\d collate_dep_test1 \d collate_dep_test1
Table "public.collate_dep_test1" Table "public.collate_dep_test1"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
\d collate_dep_test2 \d collate_dep_test2
Composite type "public.collate_dep_test2" Composite type "public.collate_dep_test2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
x | integer | x | integer | | |
DROP TABLE collate_dep_test1, collate_dep_test4t; DROP TABLE collate_dep_test1, collate_dep_test4t;
DROP TYPE collate_dep_test2; DROP TYPE collate_dep_test2;

16
src/test/regress/expected/collate.out
Unescape View File

@ -17,10 +17,10 @@ CREATE TABLE collate_test1 (
); );
\d collate_test1 \d collate_test1
Table "collate_tests.collate_test1" Table "collate_tests.collate_test1"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+-------------------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | text | collate C not null b | text | C | not null |
CREATE TABLE collate_test_fail ( CREATE TABLE collate_test_fail (
a int COLLATE "C", a int COLLATE "C",
@ -34,10 +34,10 @@ CREATE TABLE collate_test_like (
); );
\d collate_test_like \d collate_test_like
Table "collate_tests.collate_test_like" Table "collate_tests.collate_test_like"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+-------------------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | text | collate C not null b | text | C | not null |
CREATE TABLE collate_test2 ( CREATE TABLE collate_test2 (
a int, a int,

6
src/test/regress/expected/copy2.out
Unescape View File

@ -439,9 +439,9 @@ end $$ language plpgsql immutable;
alter table check_con_tbl add check (check_con_function(check_con_tbl.*)); alter table check_con_tbl add check (check_con_function(check_con_tbl.*));
\d+ check_con_tbl \d+ check_con_tbl
Table "public.check_con_tbl" Table "public.check_con_tbl"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+---------+--------------+------------- --------+---------+-----------+----------+---------+---------+--------------+-------------
f1 | integer | | plain | | f1 | integer | | | | plain | |
Check constraints: Check constraints:
"check_con_tbl_check" CHECK (check_con_function(check_con_tbl.*)) "check_con_tbl_check" CHECK (check_con_function(check_con_tbl.*))

44
src/test/regress/expected/create_index.out
Unescape View File

@ -2453,10 +2453,10 @@ DELETE FROM concur_heap WHERE f1 = 'b';
VACUUM FULL concur_heap; VACUUM FULL concur_heap;
\d concur_heap \d concur_heap
Table "public.concur_heap" Table "public.concur_heap"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+------+----------- --------+------+-----------+----------+---------
f1 | text | f1 | text | | |
f2 | text | f2 | text | | |
Indexes: Indexes:
"concur_index2" UNIQUE, btree (f1) "concur_index2" UNIQUE, btree (f1)
"concur_index3" UNIQUE, btree (f2) INVALID "concur_index3" UNIQUE, btree (f2) INVALID
@ -2469,10 +2469,10 @@ Indexes:
REINDEX TABLE concur_heap; REINDEX TABLE concur_heap;
\d concur_heap \d concur_heap
Table "public.concur_heap" Table "public.concur_heap"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+------+----------- --------+------+-----------+----------+---------
f1 | text | f1 | text | | |
f2 | text | f2 | text | | |
Indexes: Indexes:
"concur_index2" UNIQUE, btree (f1) "concur_index2" UNIQUE, btree (f1)
"concur_index3" UNIQUE, btree (f2) "concur_index3" UNIQUE, btree (f2)
@ -2503,10 +2503,10 @@ DROP INDEX CONCURRENTLY "concur_index1";
DROP INDEX CONCURRENTLY "concur_heap_expr_idx"; DROP INDEX CONCURRENTLY "concur_heap_expr_idx";
\d concur_heap \d concur_heap
Table "public.concur_heap" Table "public.concur_heap"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+------+----------- --------+------+-----------+----------+---------
f1 | text | f1 | text | | |
f2 | text | f2 | text | | |
Indexes: Indexes:
"std_index" btree (f2) "std_index" btree (f2)
@ -2521,11 +2521,11 @@ CREATE UNIQUE INDEX cwi_uniq_idx ON cwi_test(a , b);
ALTER TABLE cwi_test ADD primary key USING INDEX cwi_uniq_idx; ALTER TABLE cwi_test ADD primary key USING INDEX cwi_uniq_idx;
\d cwi_test \d cwi_test
Table "public.cwi_test" Table "public.cwi_test"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+-----------------------+----------- --------+-----------------------+-----------+----------+---------
a | integer | not null a | integer | | not null |
b | character varying(10) | not null b | character varying(10) | | not null |
c | character(1) | c | character(1) | | |
Indexes: Indexes:
"cwi_uniq_idx" PRIMARY KEY, btree (a, b) "cwi_uniq_idx" PRIMARY KEY, btree (a, b)
@ -2544,11 +2544,11 @@ ALTER TABLE cwi_test DROP CONSTRAINT cwi_uniq_idx,
NOTICE: ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index "cwi_uniq2_idx" to "cwi_replaced_pkey" NOTICE: ALTER TABLE / ADD CONSTRAINT USING INDEX will rename index "cwi_uniq2_idx" to "cwi_replaced_pkey"
\d cwi_test \d cwi_test
Table "public.cwi_test" Table "public.cwi_test"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+-----------------------+----------- --------+-----------------------+-----------+----------+---------
a | integer | not null a | integer | | not null |
b | character varying(10) | not null b | character varying(10) | | not null |
c | character(1) | c | character(1) | | |
Indexes: Indexes:
"cwi_replaced_pkey" PRIMARY KEY, btree (b, a) "cwi_replaced_pkey" PRIMARY KEY, btree (b, a)

56
src/test/regress/expected/create_table_like.out
Unescape View File

@ -110,20 +110,20 @@ ALTER TABLE ctlt4 ALTER COLUMN c SET STORAGE EXTERNAL;
CREATE TABLE ctlt12_storage (LIKE ctlt1 INCLUDING STORAGE, LIKE ctlt2 INCLUDING STORAGE); CREATE TABLE ctlt12_storage (LIKE ctlt1 INCLUDING STORAGE, LIKE ctlt2 INCLUDING STORAGE);
\d+ ctlt12_storage \d+ ctlt12_storage
Table "public.ctlt12_storage" Table "public.ctlt12_storage"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+------+-----------+----------+--------------+------------- --------+------+-----------+----------+---------+----------+--------------+-------------
a | text | not null | main | | a | text | | not null | | main | |
b | text | | extended | | b | text | | | | extended | |
c | text | | external | | c | text | | | | external | |
CREATE TABLE ctlt12_comments (LIKE ctlt1 INCLUDING COMMENTS, LIKE ctlt2 INCLUDING COMMENTS); CREATE TABLE ctlt12_comments (LIKE ctlt1 INCLUDING COMMENTS, LIKE ctlt2 INCLUDING COMMENTS);
\d+ ctlt12_comments \d+ ctlt12_comments
Table "public.ctlt12_comments" Table "public.ctlt12_comments"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+------+-----------+----------+--------------+------------- --------+------+-----------+----------+---------+----------+--------------+-------------
a | text | not null | extended | | A a | text | | not null | | extended | | A
b | text | | extended | | B b | text | | | | extended | | B
c | text | | extended | | C c | text | | | | extended | | C
CREATE TABLE ctlt1_inh (LIKE ctlt1 INCLUDING CONSTRAINTS INCLUDING COMMENTS) INHERITS (ctlt1); CREATE TABLE ctlt1_inh (LIKE ctlt1 INCLUDING CONSTRAINTS INCLUDING COMMENTS) INHERITS (ctlt1);
NOTICE: merging column "a" with inherited definition NOTICE: merging column "a" with inherited definition
@ -131,10 +131,10 @@ NOTICE: merging column "b" with inherited definition
NOTICE: merging constraint "ctlt1_a_check" with inherited definition NOTICE: merging constraint "ctlt1_a_check" with inherited definition
\d+ ctlt1_inh \d+ ctlt1_inh
Table "public.ctlt1_inh" Table "public.ctlt1_inh"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+------+-----------+----------+--------------+------------- --------+------+-----------+----------+---------+----------+--------------+-------------
a | text | not null | main | | A a | text | | not null | | main | | A
b | text | | extended | | B b | text | | | | extended | | B
Check constraints: Check constraints:
"ctlt1_a_check" CHECK (length(a) > 2) "ctlt1_a_check" CHECK (length(a) > 2)
Inherits: ctlt1 Inherits: ctlt1
@ -149,11 +149,11 @@ CREATE TABLE ctlt13_inh () INHERITS (ctlt1, ctlt3);
NOTICE: merging multiple inherited definitions of column "a" NOTICE: merging multiple inherited definitions of column "a"
\d+ ctlt13_inh \d+ ctlt13_inh
Table "public.ctlt13_inh" Table "public.ctlt13_inh"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+------+-----------+----------+--------------+------------- --------+------+-----------+----------+---------+----------+--------------+-------------
a | text | not null | main | | a | text | | not null | | main | |
b | text | | extended | | b | text | | | | extended | |
c | text | | external | | c | text | | | | external | |
Check constraints: Check constraints:
"ctlt1_a_check" CHECK (length(a) > 2) "ctlt1_a_check" CHECK (length(a) > 2)
"ctlt3_a_check" CHECK (length(a) < 5) "ctlt3_a_check" CHECK (length(a) < 5)
@ -164,11 +164,11 @@ CREATE TABLE ctlt13_like (LIKE ctlt3 INCLUDING CONSTRAINTS INCLUDING COMMENTS IN
NOTICE: merging column "a" with inherited definition NOTICE: merging column "a" with inherited definition
\d+ ctlt13_like \d+ ctlt13_like
Table "public.ctlt13_like" Table "public.ctlt13_like"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+------+-----------+----------+--------------+------------- --------+------+-----------+----------+---------+----------+--------------+-------------
a | text | not null | main | | A3 a | text | | not null | | main | | A3
b | text | | extended | | b | text | | | | extended | |
c | text | | external | | C c | text | | | | external | | C
Check constraints: Check constraints:
"ctlt1_a_check" CHECK (length(a) > 2) "ctlt1_a_check" CHECK (length(a) > 2)
"ctlt3_a_check" CHECK (length(a) < 5) "ctlt3_a_check" CHECK (length(a) < 5)
@ -183,10 +183,10 @@ SELECT description FROM pg_description, pg_constraint c WHERE classoid = 'pg_con
CREATE TABLE ctlt_all (LIKE ctlt1 INCLUDING ALL); CREATE TABLE ctlt_all (LIKE ctlt1 INCLUDING ALL);
\d+ ctlt_all \d+ ctlt_all
Table "public.ctlt_all" Table "public.ctlt_all"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+------+-----------+----------+--------------+------------- --------+------+-----------+----------+---------+----------+--------------+-------------
a | text | not null | main | | A a | text | | not null | | main | | A
b | text | | extended | | B b | text | | | | extended | | B
Indexes: Indexes:
"ctlt_all_pkey" PRIMARY KEY, btree (a) "ctlt_all_pkey" PRIMARY KEY, btree (a)
"ctlt_all_b_idx" btree (b) "ctlt_all_b_idx" btree (b)

240
src/test/regress/expected/create_view.out
Unescape View File

@ -306,11 +306,11 @@ CREATE VIEW aliased_view_4 AS
where exists (select 1 from tt1 where temp_view_test.tt1.y1 = tt1.f1); where exists (select 1 from tt1 where temp_view_test.tt1.y1 = tt1.f1);
\d+ aliased_view_1 \d+ aliased_view_1
View "testviewschm2.aliased_view_1" View "testviewschm2.aliased_view_1"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.f1, SELECT tt1.f1,
tt1.f2, tt1.f2,
@ -322,11 +322,11 @@ View definition:
\d+ aliased_view_2 \d+ aliased_view_2
View "testviewschm2.aliased_view_2" View "testviewschm2.aliased_view_2"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a1.f1, SELECT a1.f1,
a1.f2, a1.f2,
@ -338,11 +338,11 @@ View definition:
\d+ aliased_view_3 \d+ aliased_view_3
View "testviewschm2.aliased_view_3" View "testviewschm2.aliased_view_3"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.f1, SELECT tt1.f1,
tt1.f2, tt1.f2,
@ -354,11 +354,11 @@ View definition:
\d+ aliased_view_4 \d+ aliased_view_4
View "testviewschm2.aliased_view_4" View "testviewschm2.aliased_view_4"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
y1 | integer | | plain | y1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.y1, SELECT tt1.y1,
tt1.f2, tt1.f2,
@ -371,11 +371,11 @@ View definition:
ALTER TABLE tx1 RENAME TO a1; ALTER TABLE tx1 RENAME TO a1;
\d+ aliased_view_1 \d+ aliased_view_1
View "testviewschm2.aliased_view_1" View "testviewschm2.aliased_view_1"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.f1, SELECT tt1.f1,
tt1.f2, tt1.f2,
@ -387,11 +387,11 @@ View definition:
\d+ aliased_view_2 \d+ aliased_view_2
View "testviewschm2.aliased_view_2" View "testviewschm2.aliased_view_2"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a1.f1, SELECT a1.f1,
a1.f2, a1.f2,
@ -403,11 +403,11 @@ View definition:
\d+ aliased_view_3 \d+ aliased_view_3
View "testviewschm2.aliased_view_3" View "testviewschm2.aliased_view_3"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.f1, SELECT tt1.f1,
tt1.f2, tt1.f2,
@ -419,11 +419,11 @@ View definition:
\d+ aliased_view_4 \d+ aliased_view_4
View "testviewschm2.aliased_view_4" View "testviewschm2.aliased_view_4"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
y1 | integer | | plain | y1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.y1, SELECT tt1.y1,
tt1.f2, tt1.f2,
@ -436,11 +436,11 @@ View definition:
ALTER TABLE tt1 RENAME TO a2; ALTER TABLE tt1 RENAME TO a2;
\d+ aliased_view_1 \d+ aliased_view_1
View "testviewschm2.aliased_view_1" View "testviewschm2.aliased_view_1"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a2.f1, SELECT a2.f1,
a2.f2, a2.f2,
@ -452,11 +452,11 @@ View definition:
\d+ aliased_view_2 \d+ aliased_view_2
View "testviewschm2.aliased_view_2" View "testviewschm2.aliased_view_2"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a1.f1, SELECT a1.f1,
a1.f2, a1.f2,
@ -468,11 +468,11 @@ View definition:
\d+ aliased_view_3 \d+ aliased_view_3
View "testviewschm2.aliased_view_3" View "testviewschm2.aliased_view_3"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a2.f1, SELECT a2.f1,
a2.f2, a2.f2,
@ -484,11 +484,11 @@ View definition:
\d+ aliased_view_4 \d+ aliased_view_4
View "testviewschm2.aliased_view_4" View "testviewschm2.aliased_view_4"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
y1 | integer | | plain | y1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.y1, SELECT tt1.y1,
tt1.f2, tt1.f2,
@ -501,11 +501,11 @@ View definition:
ALTER TABLE a1 RENAME TO tt1; ALTER TABLE a1 RENAME TO tt1;
\d+ aliased_view_1 \d+ aliased_view_1
View "testviewschm2.aliased_view_1" View "testviewschm2.aliased_view_1"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a2.f1, SELECT a2.f1,
a2.f2, a2.f2,
@ -517,11 +517,11 @@ View definition:
\d+ aliased_view_2 \d+ aliased_view_2
View "testviewschm2.aliased_view_2" View "testviewschm2.aliased_view_2"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a1.f1, SELECT a1.f1,
a1.f2, a1.f2,
@ -533,11 +533,11 @@ View definition:
\d+ aliased_view_3 \d+ aliased_view_3
View "testviewschm2.aliased_view_3" View "testviewschm2.aliased_view_3"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a2.f1, SELECT a2.f1,
a2.f2, a2.f2,
@ -549,11 +549,11 @@ View definition:
\d+ aliased_view_4 \d+ aliased_view_4
View "testviewschm2.aliased_view_4" View "testviewschm2.aliased_view_4"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
y1 | integer | | plain | y1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.y1, SELECT tt1.y1,
tt1.f2, tt1.f2,
@ -567,11 +567,11 @@ ALTER TABLE a2 RENAME TO tx1;
ALTER TABLE tx1 SET SCHEMA temp_view_test; ALTER TABLE tx1 SET SCHEMA temp_view_test;
\d+ aliased_view_1 \d+ aliased_view_1
View "testviewschm2.aliased_view_1" View "testviewschm2.aliased_view_1"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tx1.f1, SELECT tx1.f1,
tx1.f2, tx1.f2,
@ -583,11 +583,11 @@ View definition:
\d+ aliased_view_2 \d+ aliased_view_2
View "testviewschm2.aliased_view_2" View "testviewschm2.aliased_view_2"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a1.f1, SELECT a1.f1,
a1.f2, a1.f2,
@ -599,11 +599,11 @@ View definition:
\d+ aliased_view_3 \d+ aliased_view_3
View "testviewschm2.aliased_view_3" View "testviewschm2.aliased_view_3"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tx1.f1, SELECT tx1.f1,
tx1.f2, tx1.f2,
@ -615,11 +615,11 @@ View definition:
\d+ aliased_view_4 \d+ aliased_view_4
View "testviewschm2.aliased_view_4" View "testviewschm2.aliased_view_4"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
y1 | integer | | plain | y1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tt1.y1, SELECT tt1.y1,
tt1.f2, tt1.f2,
@ -634,11 +634,11 @@ ALTER TABLE temp_view_test.tmp1 SET SCHEMA testviewschm2;
ALTER TABLE tmp1 RENAME TO tx1; ALTER TABLE tmp1 RENAME TO tx1;
\d+ aliased_view_1 \d+ aliased_view_1
View "testviewschm2.aliased_view_1" View "testviewschm2.aliased_view_1"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tx1.f1, SELECT tx1.f1,
tx1.f2, tx1.f2,
@ -650,11 +650,11 @@ View definition:
\d+ aliased_view_2 \d+ aliased_view_2
View "testviewschm2.aliased_view_2" View "testviewschm2.aliased_view_2"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT a1.f1, SELECT a1.f1,
a1.f2, a1.f2,
@ -666,11 +666,11 @@ View definition:
\d+ aliased_view_3 \d+ aliased_view_3
View "testviewschm2.aliased_view_3" View "testviewschm2.aliased_view_3"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
f1 | integer | | plain | f1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tx1.f1, SELECT tx1.f1,
tx1.f2, tx1.f2,
@ -682,11 +682,11 @@ View definition:
\d+ aliased_view_4 \d+ aliased_view_4
View "testviewschm2.aliased_view_4" View "testviewschm2.aliased_view_4"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+----------+------------- --------+---------+-----------+----------+---------+----------+-------------
y1 | integer | | plain | y1 | integer | | | | plain |
f2 | integer | | plain | f2 | integer | | | | plain |
f3 | text | | extended | f3 | text | | | | extended |
View definition: View definition:
SELECT tx1.y1, SELECT tx1.y1,
tx1.f2, tx1.f2,

426
src/test/regress/expected/foreign_data.out
Unescape View File

@ -703,11 +703,11 @@ COMMENT ON FOREIGN TABLE ft1 IS 'ft1';
COMMENT ON COLUMN ft1.c1 IS 'ft1.c1'; COMMENT ON COLUMN ft1.c1 IS 'ft1.c1';
\d+ ft1 \d+ ft1
Foreign table "public.ft1" Foreign table "public.ft1"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+--------------------------------+----------+--------------+------------- --------+---------+-----------+----------+---------+--------------------------------+----------+--------------+-------------
c1 | integer | not null | ("param 1" 'val1') | plain | | ft1.c1 c1 | integer | | not null | | ("param 1" 'val1') | plain | | ft1.c1
c2 | text | | (param2 'val2', param3 'val3') | extended | | c2 | text | | | | (param2 'val2', param3 'val3') | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
Check constraints: Check constraints:
"ft1_c2_check" CHECK (c2 <> ''::text) "ft1_c2_check" CHECK (c2 <> ''::text)
"ft1_c3_check" CHECK (c3 >= '01-01-1994'::date AND c3 <= '01-31-1994'::date) "ft1_c3_check" CHECK (c3 >= '01-01-1994'::date AND c3 <= '01-31-1994'::date)
@ -758,18 +758,18 @@ ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET STATISTICS -1;
ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET STORAGE PLAIN; ALTER FOREIGN TABLE ft1 ALTER COLUMN c8 SET STORAGE PLAIN;
\d+ ft1 \d+ ft1
Foreign table "public.ft1" Foreign table "public.ft1"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+--------------------------------+----------+--------------+------------- --------+---------+-----------+----------+---------+--------------------------------+----------+--------------+-------------
c1 | integer | not null | ("param 1" 'val1') | plain | 10000 | c1 | integer | | not null | | ("param 1" 'val1') | plain | 10000 |
c2 | text | | (param2 'val2', param3 'val3') | extended | | c2 | text | | | | (param2 'val2', param3 'val3') | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
c4 | integer | default 0 | | plain | | c4 | integer | | | 0 | | plain | |
c5 | integer | | | plain | | c5 | integer | | | | | plain | |
c6 | integer | not null | | plain | | c6 | integer | | not null | | | plain | |
c7 | integer | | (p1 'v1', p2 'v2') | plain | | c7 | integer | | | | (p1 'v1', p2 'v2') | plain | |
c8 | text | | (p2 'V2') | plain | | c8 | text | | | | (p2 'V2') | plain | |
c9 | integer | | | plain | | c9 | integer | | | | | plain | |
c10 | integer | | (p1 'v1') | plain | | c10 | integer | | | | (p1 'v1') | plain | |
Check constraints: Check constraints:
"ft1_c2_check" CHECK (c2 <> ''::text) "ft1_c2_check" CHECK (c2 <> ''::text)
"ft1_c3_check" CHECK (c3 >= '01-01-1994'::date AND c3 <= '01-31-1994'::date) "ft1_c3_check" CHECK (c3 >= '01-01-1994'::date AND c3 <= '01-31-1994'::date)
@ -808,17 +808,17 @@ ALTER FOREIGN TABLE foreign_schema.ft1 RENAME c1 TO foreign_column_1;
ALTER FOREIGN TABLE foreign_schema.ft1 RENAME TO foreign_table_1; ALTER FOREIGN TABLE foreign_schema.ft1 RENAME TO foreign_table_1;
\d foreign_schema.foreign_table_1 \d foreign_schema.foreign_table_1
Foreign table "foreign_schema.foreign_table_1" Foreign table "foreign_schema.foreign_table_1"
Column | Type | Modifiers | FDW Options Column | Type | Collation | Nullable | Default | FDW Options
------------------+---------+-----------+-------------------------------- ------------------+---------+-----------+----------+---------+--------------------------------
foreign_column_1 | integer | not null | ("param 1" 'val1') foreign_column_1 | integer | | not null | | ("param 1" 'val1')
c2 | text | | (param2 'val2', param3 'val3') c2 | text | | | | (param2 'val2', param3 'val3')
c3 | date | | c3 | date | | | |
c4 | integer | default 0 | c4 | integer | | | 0 |
c5 | integer | | c5 | integer | | | |
c6 | integer | not null | c6 | integer | | not null | |
c7 | integer | | (p1 'v1', p2 'v2') c7 | integer | | | | (p1 'v1', p2 'v2')
c8 | text | | (p2 'V2') c8 | text | | | | (p2 'V2')
c10 | integer | | (p1 'v1') c10 | integer | | | | (p1 'v1')
Check constraints: Check constraints:
"ft1_c2_check" CHECK (c2 <> ''::text) "ft1_c2_check" CHECK (c2 <> ''::text)
"ft1_c3_check" CHECK (c3 >= '01-01-1994'::date AND c3 <= '01-31-1994'::date) "ft1_c3_check" CHECK (c3 >= '01-01-1994'::date AND c3 <= '01-31-1994'::date)
@ -1242,20 +1242,20 @@ CREATE FOREIGN TABLE ft2 () INHERITS (pt1)
SERVER s0 OPTIONS (delimiter ',', quote '"', "be quoted" 'value'); SERVER s0 OPTIONS (delimiter ',', quote '"', "be quoted" 'value');
\d+ pt1 \d+ pt1
Table "public.pt1" Table "public.pt1"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | | c1 | integer | | not null | | plain | |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
Child tables: ft2 Child tables: ft2
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | | c1 | integer | | not null | | | plain | |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
Server: s0 Server: s0
FDW Options: (delimiter ',', quote '"', "be quoted" 'value') FDW Options: (delimiter ',', quote '"', "be quoted" 'value')
Inherits: pt1 Inherits: pt1
@ -1263,11 +1263,11 @@ Inherits: pt1
DROP FOREIGN TABLE ft2; DROP FOREIGN TABLE ft2;
\d+ pt1 \d+ pt1
Table "public.pt1" Table "public.pt1"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | | c1 | integer | | not null | | plain | |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
CREATE FOREIGN TABLE ft2 ( CREATE FOREIGN TABLE ft2 (
c1 integer NOT NULL, c1 integer NOT NULL,
@ -1276,31 +1276,31 @@ CREATE FOREIGN TABLE ft2 (
) SERVER s0 OPTIONS (delimiter ',', quote '"', "be quoted" 'value'); ) SERVER s0 OPTIONS (delimiter ',', quote '"', "be quoted" 'value');
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | | c1 | integer | | not null | | | plain | |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
Server: s0 Server: s0
FDW Options: (delimiter ',', quote '"', "be quoted" 'value') FDW Options: (delimiter ',', quote '"', "be quoted" 'value')
ALTER FOREIGN TABLE ft2 INHERIT pt1; ALTER FOREIGN TABLE ft2 INHERIT pt1;
\d+ pt1 \d+ pt1
Table "public.pt1" Table "public.pt1"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | | c1 | integer | | not null | | plain | |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
Child tables: ft2 Child tables: ft2
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | | c1 | integer | | not null | | | plain | |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
Server: s0 Server: s0
FDW Options: (delimiter ',', quote '"', "be quoted" 'value') FDW Options: (delimiter ',', quote '"', "be quoted" 'value')
Inherits: pt1 Inherits: pt1
@ -1317,11 +1317,11 @@ NOTICE: merging column "c2" with inherited definition
NOTICE: merging column "c3" with inherited definition NOTICE: merging column "c3" with inherited definition
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | | c1 | integer | | not null | | | plain | |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
Server: s0 Server: s0
FDW Options: (delimiter ',', quote '"', "be quoted" 'value') FDW Options: (delimiter ',', quote '"', "be quoted" 'value')
Inherits: pt1 Inherits: pt1
@ -1330,20 +1330,20 @@ Child tables: ct3,
\d+ ct3 \d+ ct3
Table "public.ct3" Table "public.ct3"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | | c1 | integer | | not null | | plain | |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
Inherits: ft2 Inherits: ft2
\d+ ft3 \d+ ft3
Foreign table "public.ft3" Foreign table "public.ft3"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | | c1 | integer | | not null | | | plain | |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
Server: s0 Server: s0
Inherits: ft2 Inherits: ft2
@ -1355,30 +1355,30 @@ ALTER TABLE pt1 ADD COLUMN c7 integer NOT NULL;
ALTER TABLE pt1 ADD COLUMN c8 integer; ALTER TABLE pt1 ADD COLUMN c8 integer;
\d+ pt1 \d+ pt1
Table "public.pt1" Table "public.pt1"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | | c1 | integer | | not null | | plain | |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
c4 | integer | | plain | | c4 | integer | | | | plain | |
c5 | integer | default 0 | plain | | c5 | integer | | | 0 | plain | |
c6 | integer | | plain | | c6 | integer | | | | plain | |
c7 | integer | not null | plain | | c7 | integer | | not null | | plain | |
c8 | integer | | plain | | c8 | integer | | | | plain | |
Child tables: ft2 Child tables: ft2
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | | c1 | integer | | not null | | | plain | |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
c4 | integer | | | plain | | c4 | integer | | | | | plain | |
c5 | integer | default 0 | | plain | | c5 | integer | | | 0 | | plain | |
c6 | integer | | | plain | | c6 | integer | | | | | plain | |
c7 | integer | not null | | plain | | c7 | integer | | not null | | | plain | |
c8 | integer | | | plain | | c8 | integer | | | | | plain | |
Server: s0 Server: s0
FDW Options: (delimiter ',', quote '"', "be quoted" 'value') FDW Options: (delimiter ',', quote '"', "be quoted" 'value')
Inherits: pt1 Inherits: pt1
@ -1387,30 +1387,30 @@ Child tables: ct3,
\d+ ct3 \d+ ct3
Table "public.ct3" Table "public.ct3"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | | c1 | integer | | not null | | plain | |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
c4 | integer | | plain | | c4 | integer | | | | plain | |
c5 | integer | default 0 | plain | | c5 | integer | | | 0 | plain | |
c6 | integer | | plain | | c6 | integer | | | | plain | |
c7 | integer | not null | plain | | c7 | integer | | not null | | plain | |
c8 | integer | | plain | | c8 | integer | | | | plain | |
Inherits: ft2 Inherits: ft2
\d+ ft3 \d+ ft3
Foreign table "public.ft3" Foreign table "public.ft3"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | | c1 | integer | | not null | | | plain | |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
c4 | integer | | | plain | | c4 | integer | | | | | plain | |
c5 | integer | default 0 | | plain | | c5 | integer | | | 0 | | plain | |
c6 | integer | | | plain | | c6 | integer | | | | | plain | |
c7 | integer | not null | | plain | | c7 | integer | | not null | | | plain | |
c8 | integer | | | plain | | c8 | integer | | | | | plain | |
Server: s0 Server: s0
Inherits: ft2 Inherits: ft2
@ -1429,30 +1429,30 @@ ALTER TABLE pt1 ALTER COLUMN c8 SET STATISTICS -1;
ALTER TABLE pt1 ALTER COLUMN c8 SET STORAGE EXTERNAL; ALTER TABLE pt1 ALTER COLUMN c8 SET STORAGE EXTERNAL;
\d+ pt1 \d+ pt1
Table "public.pt1" Table "public.pt1"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | 10000 | c1 | integer | | not null | | plain | 10000 |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
c4 | integer | default 0 | plain | | c4 | integer | | | 0 | plain | |
c5 | integer | | plain | | c5 | integer | | | | plain | |
c6 | integer | not null | plain | | c6 | integer | | not null | | plain | |
c7 | integer | | plain | | c7 | integer | | | | plain | |
c8 | text | | external | | c8 | text | | | | external | |
Child tables: ft2 Child tables: ft2
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | 10000 | c1 | integer | | not null | | | plain | 10000 |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
c4 | integer | default 0 | | plain | | c4 | integer | | | 0 | | plain | |
c5 | integer | | | plain | | c5 | integer | | | | | plain | |
c6 | integer | not null | | plain | | c6 | integer | | not null | | | plain | |
c7 | integer | | | plain | | c7 | integer | | | | | plain | |
c8 | text | | | external | | c8 | text | | | | | external | |
Server: s0 Server: s0
FDW Options: (delimiter ',', quote '"', "be quoted" 'value') FDW Options: (delimiter ',', quote '"', "be quoted" 'value')
Inherits: pt1 Inherits: pt1
@ -1467,20 +1467,20 @@ ALTER TABLE pt1 DROP COLUMN c7;
ALTER TABLE pt1 DROP COLUMN c8; ALTER TABLE pt1 DROP COLUMN c8;
\d+ pt1 \d+ pt1
Table "public.pt1" Table "public.pt1"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | 10000 | c1 | integer | | not null | | plain | 10000 |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
Child tables: ft2 Child tables: ft2
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | 10000 | c1 | integer | | not null | | | plain | 10000 |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
Server: s0 Server: s0
FDW Options: (delimiter ',', quote '"', "be quoted" 'value') FDW Options: (delimiter ',', quote '"', "be quoted" 'value')
Inherits: pt1 Inherits: pt1
@ -1504,11 +1504,11 @@ SELECT relname, conname, contype, conislocal, coninhcount, connoinherit
-- child does not inherit NO INHERIT constraints -- child does not inherit NO INHERIT constraints
\d+ pt1 \d+ pt1
Table "public.pt1" Table "public.pt1"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | 10000 | c1 | integer | | not null | | plain | 10000 |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
Check constraints: Check constraints:
"pt1chk1" CHECK (c1 > 0) NO INHERIT "pt1chk1" CHECK (c1 > 0) NO INHERIT
"pt1chk2" CHECK (c2 <> ''::text) "pt1chk2" CHECK (c2 <> ''::text)
@ -1516,11 +1516,11 @@ Child tables: ft2
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | 10000 | c1 | integer | | not null | | | plain | 10000 |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
Check constraints: Check constraints:
"pt1chk2" CHECK (c2 <> ''::text) "pt1chk2" CHECK (c2 <> ''::text)
Server: s0 Server: s0
@ -1551,11 +1551,11 @@ ALTER FOREIGN TABLE ft2 INHERIT pt1;
-- child does not inherit NO INHERIT constraints -- child does not inherit NO INHERIT constraints
\d+ pt1 \d+ pt1
Table "public.pt1" Table "public.pt1"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | 10000 | c1 | integer | | not null | | plain | 10000 |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
Check constraints: Check constraints:
"pt1chk1" CHECK (c1 > 0) NO INHERIT "pt1chk1" CHECK (c1 > 0) NO INHERIT
"pt1chk2" CHECK (c2 <> ''::text) "pt1chk2" CHECK (c2 <> ''::text)
@ -1563,11 +1563,11 @@ Child tables: ft2
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | | c1 | integer | | not null | | | plain | |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
Check constraints: Check constraints:
"pt1chk2" CHECK (c2 <> ''::text) "pt1chk2" CHECK (c2 <> ''::text)
Server: s0 Server: s0
@ -1582,22 +1582,22 @@ INSERT INTO pt1 VALUES (1, 'pt1'::text, '1994-01-01'::date);
ALTER TABLE pt1 ADD CONSTRAINT pt1chk3 CHECK (c2 <> '') NOT VALID; ALTER TABLE pt1 ADD CONSTRAINT pt1chk3 CHECK (c2 <> '') NOT VALID;
\d+ pt1 \d+ pt1
Table "public.pt1" Table "public.pt1"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | 10000 | c1 | integer | | not null | | plain | 10000 |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
Check constraints: Check constraints:
"pt1chk3" CHECK (c2 <> ''::text) NOT VALID "pt1chk3" CHECK (c2 <> ''::text) NOT VALID
Child tables: ft2 Child tables: ft2
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | | c1 | integer | | not null | | | plain | |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
Check constraints: Check constraints:
"pt1chk2" CHECK (c2 <> ''::text) "pt1chk2" CHECK (c2 <> ''::text)
"pt1chk3" CHECK (c2 <> ''::text) NOT VALID "pt1chk3" CHECK (c2 <> ''::text) NOT VALID
@ -1609,22 +1609,22 @@ Inherits: pt1
ALTER TABLE pt1 VALIDATE CONSTRAINT pt1chk3; ALTER TABLE pt1 VALIDATE CONSTRAINT pt1chk3;
\d+ pt1 \d+ pt1
Table "public.pt1" Table "public.pt1"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | 10000 | c1 | integer | | not null | | plain | 10000 |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
Check constraints: Check constraints:
"pt1chk3" CHECK (c2 <> ''::text) "pt1chk3" CHECK (c2 <> ''::text)
Child tables: ft2 Child tables: ft2
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | | c1 | integer | | not null | | | plain | |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
Check constraints: Check constraints:
"pt1chk2" CHECK (c2 <> ''::text) "pt1chk2" CHECK (c2 <> ''::text)
"pt1chk3" CHECK (c2 <> ''::text) "pt1chk3" CHECK (c2 <> ''::text)
@ -1636,11 +1636,11 @@ Inherits: pt1
ALTER TABLE pt1 SET WITH OIDS; ALTER TABLE pt1 SET WITH OIDS;
\d+ pt1 \d+ pt1
Table "public.pt1" Table "public.pt1"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | 10000 | c1 | integer | | not null | | plain | 10000 |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
Check constraints: Check constraints:
"pt1chk3" CHECK (c2 <> ''::text) "pt1chk3" CHECK (c2 <> ''::text)
Child tables: ft2 Child tables: ft2
@ -1648,11 +1648,11 @@ Has OIDs: yes
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | | c1 | integer | | not null | | | plain | |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
Check constraints: Check constraints:
"pt1chk2" CHECK (c2 <> ''::text) "pt1chk2" CHECK (c2 <> ''::text)
"pt1chk3" CHECK (c2 <> ''::text) "pt1chk3" CHECK (c2 <> ''::text)
@ -1666,22 +1666,22 @@ ERROR: cannot drop inherited column "oid"
ALTER TABLE pt1 SET WITHOUT OIDS; ALTER TABLE pt1 SET WITHOUT OIDS;
\d+ pt1 \d+ pt1
Table "public.pt1" Table "public.pt1"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
c1 | integer | not null | plain | 10000 | c1 | integer | | not null | | plain | 10000 |
c2 | text | | extended | | c2 | text | | | | extended | |
c3 | date | | plain | | c3 | date | | | | plain | |
Check constraints: Check constraints:
"pt1chk3" CHECK (c2 <> ''::text) "pt1chk3" CHECK (c2 <> ''::text)
Child tables: ft2 Child tables: ft2
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
c1 | integer | not null | | plain | | c1 | integer | | not null | | | plain | |
c2 | text | | | extended | | c2 | text | | | | | extended | |
c3 | date | | | plain | | c3 | date | | | | | plain | |
Check constraints: Check constraints:
"pt1chk2" CHECK (c2 <> ''::text) "pt1chk2" CHECK (c2 <> ''::text)
"pt1chk3" CHECK (c2 <> ''::text) "pt1chk3" CHECK (c2 <> ''::text)
@ -1697,22 +1697,22 @@ ALTER TABLE pt1 RENAME COLUMN c3 TO f3;
ALTER TABLE pt1 RENAME CONSTRAINT pt1chk3 TO f2_check; ALTER TABLE pt1 RENAME CONSTRAINT pt1chk3 TO f2_check;
\d+ pt1 \d+ pt1
Table "public.pt1" Table "public.pt1"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
f1 | integer | not null | plain | 10000 | f1 | integer | | not null | | plain | 10000 |
f2 | text | | extended | | f2 | text | | | | extended | |
f3 | date | | plain | | f3 | date | | | | plain | |
Check constraints: Check constraints:
"f2_check" CHECK (f2 <> ''::text) "f2_check" CHECK (f2 <> ''::text)
Child tables: ft2 Child tables: ft2
\d+ ft2 \d+ ft2
Foreign table "public.ft2" Foreign table "public.ft2"
Column | Type | Modifiers | FDW Options | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | FDW Options | Storage | Stats target | Description
--------+---------+-----------+-------------+----------+--------------+------------- --------+---------+-----------+----------+---------+-------------+----------+--------------+-------------
f1 | integer | not null | | plain | | f1 | integer | | not null | | | plain | |
f2 | text | | | extended | | f2 | text | | | | | extended | |
f3 | date | | | plain | | f3 | date | | | | | plain | |
Check constraints: Check constraints:
"f2_check" CHECK (f2 <> ''::text) "f2_check" CHECK (f2 <> ''::text)
"pt1chk2" CHECK (f2 <> ''::text) "pt1chk2" CHECK (f2 <> ''::text)

188
src/test/regress/expected/inherit.out
Unescape View File

@ -628,9 +628,9 @@ select pc.relname, pgc.conname, pgc.contype, pgc.conislocal, pgc.coninhcount, pg
create table c1 () inherits (p1); create table c1 () inherits (p1);
\d p1 \d p1
Table "public.p1" Table "public.p1"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
ff1 | integer | ff1 | integer | | |
Check constraints: Check constraints:
"p1chk" CHECK (ff1 > 0) NO INHERIT "p1chk" CHECK (ff1 > 0) NO INHERIT
"p2chk" CHECK (ff1 > 10) "p2chk" CHECK (ff1 > 10)
@ -638,9 +638,9 @@ Number of child tables: 1 (Use \d+ to list them.)
\d c1 \d c1
Table "public.c1" Table "public.c1"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
ff1 | integer | ff1 | integer | | |
Check constraints: Check constraints:
"p2chk" CHECK (ff1 > 10) "p2chk" CHECK (ff1 > 10)
Inherits: p1 Inherits: p1
@ -807,11 +807,11 @@ DETAIL: Failing row contains (1, -1, 2).
create table c2(f3 int) inherits(p1,p2); create table c2(f3 int) inherits(p1,p2);
\d c2 \d c2
Table "public.c2" Table "public.c2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
f1 | integer | f1 | integer | | |
f2 | integer | f2 | integer | | |
f3 | integer | f3 | integer | | |
Check constraints: Check constraints:
"p2_f2_check" CHECK (f2 > 0) "p2_f2_check" CHECK (f2 > 0)
Inherits: p1, Inherits: p1,
@ -823,12 +823,12 @@ NOTICE: merging multiple inherited definitions of column "f2"
NOTICE: merging multiple inherited definitions of column "f3" NOTICE: merging multiple inherited definitions of column "f3"
\d c3 \d c3
Table "public.c3" Table "public.c3"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
f1 | integer | f1 | integer | | |
f2 | integer | f2 | integer | | |
f3 | integer | f3 | integer | | |
f4 | integer | f4 | integer | | |
Check constraints: Check constraints:
"p2_f2_check" CHECK (f2 > 0) "p2_f2_check" CHECK (f2 > 0)
Inherits: c1, Inherits: c1,
@ -845,12 +845,12 @@ create table cc1 (f2 text, f3 int) inherits (pp1);
alter table pp1 add column a1 int check (a1 > 0); alter table pp1 add column a1 int check (a1 > 0);
\d cc1 \d cc1
Table "public.cc1" Table "public.cc1"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
f1 | integer | f1 | integer | | |
f2 | text | f2 | text | | |
f3 | integer | f3 | integer | | |
a1 | integer | a1 | integer | | |
Check constraints: Check constraints:
"pp1_a1_check" CHECK (a1 > 0) "pp1_a1_check" CHECK (a1 > 0)
Inherits: pp1 Inherits: pp1
@ -860,13 +860,13 @@ NOTICE: merging multiple inherited definitions of column "f1"
NOTICE: merging multiple inherited definitions of column "a1" NOTICE: merging multiple inherited definitions of column "a1"
\d cc2 \d cc2
Table "public.cc2" Table "public.cc2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+------------------+----------- --------+------------------+-----------+----------+---------
f1 | integer | f1 | integer | | |
a1 | integer | a1 | integer | | |
f2 | text | f2 | text | | |
f3 | integer | f3 | integer | | |
f4 | double precision | f4 | double precision | | |
Check constraints: Check constraints:
"pp1_a1_check" CHECK (a1 > 0) "pp1_a1_check" CHECK (a1 > 0)
Inherits: pp1, Inherits: pp1,
@ -877,14 +877,14 @@ NOTICE: merging definition of column "a2" for child "cc2"
NOTICE: merging constraint "pp1_a2_check" with inherited definition NOTICE: merging constraint "pp1_a2_check" with inherited definition
\d cc2 \d cc2
Table "public.cc2" Table "public.cc2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+------------------+----------- --------+------------------+-----------+----------+---------
f1 | integer | f1 | integer | | |
a1 | integer | a1 | integer | | |
f2 | text | f2 | text | | |
f3 | integer | f3 | integer | | |
f4 | double precision | f4 | double precision | | |
a2 | integer | a2 | integer | | |
Check constraints: Check constraints:
"pp1_a1_check" CHECK (a1 > 0) "pp1_a1_check" CHECK (a1 > 0)
"pp1_a2_check" CHECK (a2 > 0) "pp1_a2_check" CHECK (a2 > 0)
@ -908,12 +908,12 @@ ERROR: cannot rename inherited column "aa"
ALTER TABLE inhts RENAME d TO dd; ALTER TABLE inhts RENAME d TO dd;
\d+ inhts \d+ inhts
Table "public.inhts" Table "public.inhts"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+---------+--------------+------------- --------+---------+-----------+----------+---------+---------+--------------+-------------
aa | integer | | plain | | aa | integer | | | | plain | |
b | integer | | plain | | b | integer | | | | plain | |
c | integer | | plain | | c | integer | | | | plain | |
dd | integer | | plain | | dd | integer | | | | plain | |
Inherits: inht1, Inherits: inht1,
inhs1 inhs1
@ -927,13 +927,13 @@ NOTICE: merging multiple inherited definitions of column "b"
ALTER TABLE inht1 RENAME aa TO aaa; ALTER TABLE inht1 RENAME aa TO aaa;
\d+ inht4 \d+ inht4
Table "public.inht4" Table "public.inht4"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+---------+--------------+------------- --------+---------+-----------+----------+---------+---------+--------------+-------------
aaa | integer | | plain | | aaa | integer | | | | plain | |
b | integer | | plain | | b | integer | | | | plain | |
x | integer | | plain | | x | integer | | | | plain | |
y | integer | | plain | | y | integer | | | | plain | |
z | integer | | plain | | z | integer | | | | plain | |
Inherits: inht2, Inherits: inht2,
inht3 inht3
@ -944,13 +944,13 @@ ALTER TABLE inht1 RENAME b TO bb; -- to be failed
ERROR: cannot rename inherited column "b" ERROR: cannot rename inherited column "b"
\d+ inhts \d+ inhts
Table "public.inhts" Table "public.inhts"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+---------+--------------+------------- --------+---------+-----------+----------+---------+---------+--------------+-------------
aaaa | integer | | plain | | aaaa | integer | | | | plain | |
b | integer | | plain | | b | integer | | | | plain | |
x | integer | | plain | | x | integer | | | | plain | |
c | integer | | plain | | c | integer | | | | plain | |
d | integer | | plain | | d | integer | | | | plain | |
Inherits: inht2, Inherits: inht2,
inhs1 inhs1
@ -991,11 +991,11 @@ CREATE TABLE test_constraints (id int, val1 varchar, val2 int, UNIQUE(val1, val2
CREATE TABLE test_constraints_inh () INHERITS (test_constraints); CREATE TABLE test_constraints_inh () INHERITS (test_constraints);
\d+ test_constraints \d+ test_constraints
Table "public.test_constraints" Table "public.test_constraints"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+-------------------+-----------+----------+--------------+------------- --------+-------------------+-----------+----------+---------+----------+--------------+-------------
id | integer | | plain | | id | integer | | | | plain | |
val1 | character varying | | extended | | val1 | character varying | | | | extended | |
val2 | integer | | plain | | val2 | integer | | | | plain | |
Indexes: Indexes:
"test_constraints_val1_val2_key" UNIQUE CONSTRAINT, btree (val1, val2) "test_constraints_val1_val2_key" UNIQUE CONSTRAINT, btree (val1, val2)
Child tables: test_constraints_inh Child tables: test_constraints_inh
@ -1003,20 +1003,20 @@ Child tables: test_constraints_inh
ALTER TABLE ONLY test_constraints DROP CONSTRAINT test_constraints_val1_val2_key; ALTER TABLE ONLY test_constraints DROP CONSTRAINT test_constraints_val1_val2_key;
\d+ test_constraints \d+ test_constraints
Table "public.test_constraints" Table "public.test_constraints"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+-------------------+-----------+----------+--------------+------------- --------+-------------------+-----------+----------+---------+----------+--------------+-------------
id | integer | | plain | | id | integer | | | | plain | |
val1 | character varying | | extended | | val1 | character varying | | | | extended | |
val2 | integer | | plain | | val2 | integer | | | | plain | |
Child tables: test_constraints_inh Child tables: test_constraints_inh
\d+ test_constraints_inh \d+ test_constraints_inh
Table "public.test_constraints_inh" Table "public.test_constraints_inh"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+-------------------+-----------+----------+--------------+------------- --------+-------------------+-----------+----------+---------+----------+--------------+-------------
id | integer | | plain | | id | integer | | | | plain | |
val1 | character varying | | extended | | val1 | character varying | | | | extended | |
val2 | integer | | plain | | val2 | integer | | | | plain | |
Inherits: test_constraints Inherits: test_constraints
DROP TABLE test_constraints_inh; DROP TABLE test_constraints_inh;
@ -1028,9 +1028,9 @@ CREATE TABLE test_ex_constraints (
CREATE TABLE test_ex_constraints_inh () INHERITS (test_ex_constraints); CREATE TABLE test_ex_constraints_inh () INHERITS (test_ex_constraints);
\d+ test_ex_constraints \d+ test_ex_constraints
Table "public.test_ex_constraints" Table "public.test_ex_constraints"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+--------+-----------+---------+--------------+------------- --------+--------+-----------+----------+---------+---------+--------------+-------------
c | circle | | plain | | c | circle | | | | plain | |
Indexes: Indexes:
"test_ex_constraints_c_excl" EXCLUDE USING gist (c WITH &&) "test_ex_constraints_c_excl" EXCLUDE USING gist (c WITH &&)
Child tables: test_ex_constraints_inh Child tables: test_ex_constraints_inh
@ -1038,16 +1038,16 @@ Child tables: test_ex_constraints_inh
ALTER TABLE test_ex_constraints DROP CONSTRAINT test_ex_constraints_c_excl; ALTER TABLE test_ex_constraints DROP CONSTRAINT test_ex_constraints_c_excl;
\d+ test_ex_constraints \d+ test_ex_constraints
Table "public.test_ex_constraints" Table "public.test_ex_constraints"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+--------+-----------+---------+--------------+------------- --------+--------+-----------+----------+---------+---------+--------------+-------------
c | circle | | plain | | c | circle | | | | plain | |
Child tables: test_ex_constraints_inh Child tables: test_ex_constraints_inh
\d+ test_ex_constraints_inh \d+ test_ex_constraints_inh
Table "public.test_ex_constraints_inh" Table "public.test_ex_constraints_inh"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+--------+-----------+---------+--------------+------------- --------+--------+-----------+----------+---------+---------+--------------+-------------
c | circle | | plain | | c | circle | | | | plain | |
Inherits: test_ex_constraints Inherits: test_ex_constraints
DROP TABLE test_ex_constraints_inh; DROP TABLE test_ex_constraints_inh;
@ -1058,9 +1058,9 @@ CREATE TABLE test_foreign_constraints(id1 int REFERENCES test_primary_constraint
CREATE TABLE test_foreign_constraints_inh () INHERITS (test_foreign_constraints); CREATE TABLE test_foreign_constraints_inh () INHERITS (test_foreign_constraints);
\d+ test_primary_constraints \d+ test_primary_constraints
Table "public.test_primary_constraints" Table "public.test_primary_constraints"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+---------+--------------+------------- --------+---------+-----------+----------+---------+---------+--------------+-------------
id | integer | not null | plain | | id | integer | | not null | | plain | |
Indexes: Indexes:
"test_primary_constraints_pkey" PRIMARY KEY, btree (id) "test_primary_constraints_pkey" PRIMARY KEY, btree (id)
Referenced by: Referenced by:
@ -1068,9 +1068,9 @@ Referenced by:
\d+ test_foreign_constraints \d+ test_foreign_constraints
Table "public.test_foreign_constraints" Table "public.test_foreign_constraints"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+---------+--------------+------------- --------+---------+-----------+----------+---------+---------+--------------+-------------
id1 | integer | | plain | | id1 | integer | | | | plain | |
Foreign-key constraints: Foreign-key constraints:
"test_foreign_constraints_id1_fkey" FOREIGN KEY (id1) REFERENCES test_primary_constraints(id) "test_foreign_constraints_id1_fkey" FOREIGN KEY (id1) REFERENCES test_primary_constraints(id)
Child tables: test_foreign_constraints_inh Child tables: test_foreign_constraints_inh
@ -1078,16 +1078,16 @@ Child tables: test_foreign_constraints_inh
ALTER TABLE test_foreign_constraints DROP CONSTRAINT test_foreign_constraints_id1_fkey; ALTER TABLE test_foreign_constraints DROP CONSTRAINT test_foreign_constraints_id1_fkey;
\d+ test_foreign_constraints \d+ test_foreign_constraints
Table "public.test_foreign_constraints" Table "public.test_foreign_constraints"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+---------+--------------+------------- --------+---------+-----------+----------+---------+---------+--------------+-------------
id1 | integer | | plain | | id1 | integer | | | | plain | |
Child tables: test_foreign_constraints_inh Child tables: test_foreign_constraints_inh
\d+ test_foreign_constraints_inh \d+ test_foreign_constraints_inh
Table "public.test_foreign_constraints_inh" Table "public.test_foreign_constraints_inh"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+---------+--------------+------------- --------+---------+-----------+----------+---------+---------+--------------+-------------
id1 | integer | | plain | | id1 | integer | | | | plain | |
Inherits: test_foreign_constraints Inherits: test_foreign_constraints
DROP TABLE test_foreign_constraints_inh; DROP TABLE test_foreign_constraints_inh;

8
src/test/regress/expected/insert.out
Unescape View File

@ -143,10 +143,10 @@ create rule irule3 as on insert to inserttest2 do also
select new.f1, new.f2; select new.f1, new.f2;
\d+ inserttest2 \d+ inserttest2
Table "public.inserttest2" Table "public.inserttest2"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+--------+-----------+----------+--------------+------------- --------+--------+-----------+----------+---------+----------+--------------+-------------
f1 | bigint | | plain | | f1 | bigint | | | | plain | |
f2 | text | | extended | | f2 | text | | | | extended | |
Rules: Rules:
irule1 AS irule1 AS
ON INSERT TO inserttest2 DO INSERT INTO inserttest (f3.if2[1], f3.if2[2]) ON INSERT TO inserttest2 DO INSERT INTO inserttest (f3.if2[1], f3.if2[2])

58
src/test/regress/expected/matview.out
Unescape View File

@ -95,10 +95,10 @@ CREATE INDEX mvtest_aa ON mvtest_bb (grandtot);
-- check that plans seem reasonable -- check that plans seem reasonable
\d+ mvtest_tvm \d+ mvtest_tvm
Materialized view "public.mvtest_tvm" Materialized view "public.mvtest_tvm"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
type | text | | extended | | type | text | | | | extended | |
totamt | numeric | | main | | totamt | numeric | | | | main | |
View definition: View definition:
SELECT mvtest_tv.type, SELECT mvtest_tv.type,
mvtest_tv.totamt mvtest_tv.totamt
@ -107,10 +107,10 @@ View definition:
\d+ mvtest_tvm \d+ mvtest_tvm
Materialized view "public.mvtest_tvm" Materialized view "public.mvtest_tvm"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
type | text | | extended | | type | text | | | | extended | |
totamt | numeric | | main | | totamt | numeric | | | | main | |
View definition: View definition:
SELECT mvtest_tv.type, SELECT mvtest_tv.type,
mvtest_tv.totamt mvtest_tv.totamt
@ -119,18 +119,18 @@ View definition:
\d+ mvtest_tvvm \d+ mvtest_tvvm
Materialized view "public.mvtest_tvvm" Materialized view "public.mvtest_tvvm"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
----------+---------+-----------+---------+--------------+------------- ----------+---------+-----------+----------+---------+---------+--------------+-------------
grandtot | numeric | | main | | grandtot | numeric | | | | main | |
View definition: View definition:
SELECT mvtest_tvv.grandtot SELECT mvtest_tvv.grandtot
FROM mvtest_tvv; FROM mvtest_tvv;
\d+ mvtest_bb \d+ mvtest_bb
Materialized view "public.mvtest_bb" Materialized view "public.mvtest_bb"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
----------+---------+-----------+---------+--------------+------------- ----------+---------+-----------+----------+---------+---------+--------------+-------------
grandtot | numeric | | main | | grandtot | numeric | | | | main | |
Indexes: Indexes:
"mvtest_aa" btree (grandtot) "mvtest_aa" btree (grandtot)
View definition: View definition:
@ -143,9 +143,9 @@ ALTER MATERIALIZED VIEW mvtest_tvm SET SCHEMA mvtest_mvschema;
\d+ mvtest_tvm \d+ mvtest_tvm
\d+ mvtest_tvmm \d+ mvtest_tvmm
Materialized view "public.mvtest_tvmm" Materialized view "public.mvtest_tvmm"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
----------+---------+-----------+---------+--------------+------------- ----------+---------+-----------+----------+---------+---------+--------------+-------------
grandtot | numeric | | main | | grandtot | numeric | | | | main | |
Indexes: Indexes:
"mvtest_tvmm_expr" UNIQUE, btree ((grandtot > 0::numeric)) "mvtest_tvmm_expr" UNIQUE, btree ((grandtot > 0::numeric))
"mvtest_tvmm_pred" UNIQUE, btree (grandtot) WHERE grandtot < 0::numeric "mvtest_tvmm_pred" UNIQUE, btree (grandtot) WHERE grandtot < 0::numeric
@ -156,10 +156,10 @@ View definition:
SET search_path = mvtest_mvschema, public; SET search_path = mvtest_mvschema, public;
\d+ mvtest_tvm \d+ mvtest_tvm
Materialized view "mvtest_mvschema.mvtest_tvm" Materialized view "mvtest_mvschema.mvtest_tvm"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+----------+--------------+------------- --------+---------+-----------+----------+---------+----------+--------------+-------------
type | text | | extended | | type | text | | | | extended | |
totamt | numeric | | main | | totamt | numeric | | | | main | |
View definition: View definition:
SELECT mvtest_tv.type, SELECT mvtest_tv.type,
mvtest_tv.totamt mvtest_tv.totamt
@ -341,10 +341,10 @@ CREATE VIEW mvtest_vt1 AS SELECT 1 moo;
CREATE VIEW mvtest_vt2 AS SELECT moo, 2*moo FROM mvtest_vt1 UNION ALL SELECT moo, 3*moo FROM mvtest_vt1; CREATE VIEW mvtest_vt2 AS SELECT moo, 2*moo FROM mvtest_vt1 UNION ALL SELECT moo, 3*moo FROM mvtest_vt1;
\d+ mvtest_vt2 \d+ mvtest_vt2
View "public.mvtest_vt2" View "public.mvtest_vt2"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
----------+---------+-----------+---------+------------- ----------+---------+-----------+----------+---------+---------+-------------
moo | integer | | plain | moo | integer | | | | plain |
?column? | integer | | plain | ?column? | integer | | | | plain |
View definition: View definition:
SELECT mvtest_vt1.moo, SELECT mvtest_vt1.moo,
2 * mvtest_vt1.moo 2 * mvtest_vt1.moo
@ -357,10 +357,10 @@ UNION ALL
CREATE MATERIALIZED VIEW mv_test2 AS SELECT moo, 2*moo FROM mvtest_vt2 UNION ALL SELECT moo, 3*moo FROM mvtest_vt2; CREATE MATERIALIZED VIEW mv_test2 AS SELECT moo, 2*moo FROM mvtest_vt2 UNION ALL SELECT moo, 3*moo FROM mvtest_vt2;
\d+ mv_test2 \d+ mv_test2
Materialized view "public.mv_test2" Materialized view "public.mv_test2"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
----------+---------+-----------+---------+--------------+------------- ----------+---------+-----------+----------+---------+---------+--------------+-------------
moo | integer | | plain | | moo | integer | | | | plain | |
?column? | integer | | plain | | ?column? | integer | | | | plain | |
View definition: View definition:
SELECT mvtest_vt2.moo, SELECT mvtest_vt2.moo,
2 * mvtest_vt2.moo 2 * mvtest_vt2.moo

12
src/test/regress/expected/polymorphism.out
Unescape View File

@ -1496,12 +1496,12 @@ select * from dfview;
\d+ dfview \d+ dfview
View "public.dfview" View "public.dfview"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+--------+-----------+---------+------------- --------+--------+-----------+----------+---------+---------+-------------
q1 | bigint | | plain | q1 | bigint | | | | plain |
q2 | bigint | | plain | q2 | bigint | | | | plain |
c3 | bigint | | plain | c3 | bigint | | | | plain |
c4 | bigint | | plain | c4 | bigint | | | | plain |
View definition: View definition:
SELECT int8_tbl.q1, SELECT int8_tbl.q1,
int8_tbl.q2, int8_tbl.q2,

6
src/test/regress/expected/prepared_xacts.out
Unescape View File

@ -219,9 +219,9 @@ rollback;
COMMIT PREPARED 'regress-one'; COMMIT PREPARED 'regress-one';
\d pxtest2 \d pxtest2
Table "public.pxtest2" Table "public.pxtest2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
SELECT * FROM pxtest2; SELECT * FROM pxtest2;
a a

36
src/test/regress/expected/replica_identity.out
Unescape View File

@ -78,12 +78,12 @@ SELECT relreplident FROM pg_class WHERE oid = 'test_replica_identity'::regclass;
\d test_replica_identity \d test_replica_identity
Table "public.test_replica_identity" Table "public.test_replica_identity"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+-------------------------------------------------------------------- --------+---------+-----------+----------+---------------------------------------------------
id | integer | not null default nextval('test_replica_identity_id_seq'::regclass) id | integer | | not null | nextval('test_replica_identity_id_seq'::regclass)
keya | text | not null keya | text | | not null |
keyb | text | not null keyb | text | | not null |
nonkey | text | nonkey | text | | |
Indexes: Indexes:
"test_replica_identity_pkey" PRIMARY KEY, btree (id) REPLICA IDENTITY "test_replica_identity_pkey" PRIMARY KEY, btree (id) REPLICA IDENTITY
"test_replica_identity_expr" UNIQUE, btree (keya, keyb, (3)) "test_replica_identity_expr" UNIQUE, btree (keya, keyb, (3))
@ -111,12 +111,12 @@ SELECT relreplident FROM pg_class WHERE oid = 'test_replica_identity'::regclass;
\d test_replica_identity \d test_replica_identity
Table "public.test_replica_identity" Table "public.test_replica_identity"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+-------------------------------------------------------------------- --------+---------+-----------+----------+---------------------------------------------------
id | integer | not null default nextval('test_replica_identity_id_seq'::regclass) id | integer | | not null | nextval('test_replica_identity_id_seq'::regclass)
keya | text | not null keya | text | | not null |
keyb | text | not null keyb | text | | not null |
nonkey | text | nonkey | text | | |
Indexes: Indexes:
"test_replica_identity_pkey" PRIMARY KEY, btree (id) "test_replica_identity_pkey" PRIMARY KEY, btree (id)
"test_replica_identity_expr" UNIQUE, btree (keya, keyb, (3)) "test_replica_identity_expr" UNIQUE, btree (keya, keyb, (3))
@ -160,12 +160,12 @@ SELECT relreplident FROM pg_class WHERE oid = 'test_replica_identity'::regclass;
\d+ test_replica_identity \d+ test_replica_identity
Table "public.test_replica_identity" Table "public.test_replica_identity"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+--------------------------------------------------------------------+----------+--------------+------------- --------+---------+-----------+----------+---------------------------------------------------+----------+--------------+-------------
id | integer | not null default nextval('test_replica_identity_id_seq'::regclass) | plain | | id | integer | | not null | nextval('test_replica_identity_id_seq'::regclass) | plain | |
keya | text | not null | extended | | keya | text | | not null | | extended | |
keyb | text | not null | extended | | keyb | text | | not null | | extended | |
nonkey | text | | extended | | nonkey | text | | | | extended | |
Indexes: Indexes:
"test_replica_identity_pkey" PRIMARY KEY, btree (id) "test_replica_identity_pkey" PRIMARY KEY, btree (id)
"test_replica_identity_expr" UNIQUE, btree (keya, keyb, (3)) "test_replica_identity_expr" UNIQUE, btree (keya, keyb, (3))

54
src/test/regress/expected/rules.out
Unescape View File

@ -2708,10 +2708,10 @@ select * from rules_log;
create rule r3 as on delete to rules_src do notify rules_src_deletion; create rule r3 as on delete to rules_src do notify rules_src_deletion;
\d+ rules_src \d+ rules_src
Table "public.rules_src" Table "public.rules_src"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+---------+--------------+------------- --------+---------+-----------+----------+---------+---------+--------------+-------------
f1 | integer | | plain | | f1 | integer | | | | plain | |
f2 | integer | | plain | | f2 | integer | | | | plain | |
Rules: Rules:
r1 AS r1 AS
ON UPDATE TO rules_src DO INSERT INTO rules_log (f1, f2, tag) VALUES (old.f1,old.f2,'old'::text), (new.f1,new.f2,'new'::text) ON UPDATE TO rules_src DO INSERT INTO rules_log (f1, f2, tag) VALUES (old.f1,old.f2,'old'::text), (new.f1,new.f2,'new'::text)
@ -2728,10 +2728,10 @@ create rule r4 as on insert to rules_src do instead insert into rules_log AS trg
create rule r5 as on update to rules_src do instead UPDATE rules_log AS trgt SET tag = 'updated' WHERE trgt.f1 = new.f1; create rule r5 as on update to rules_src do instead UPDATE rules_log AS trgt SET tag = 'updated' WHERE trgt.f1 = new.f1;
\d+ rules_src \d+ rules_src
Table "public.rules_src" Table "public.rules_src"
Column | Type | Modifiers | Storage | Stats target | Description Column | Type | Collation | Nullable | Default | Storage | Stats target | Description
--------+---------+-----------+---------+--------------+------------- --------+---------+-----------+----------+---------+---------+--------------+-------------
f1 | integer | | plain | | f1 | integer | | | | plain | |
f2 | integer | | plain | | f2 | integer | | | | plain | |
Rules: Rules:
r1 AS r1 AS
ON UPDATE TO rules_src DO INSERT INTO rules_log (f1, f2, tag) VALUES (old.f1,old.f2,'old'::text), (new.f1,new.f2,'new'::text) ON UPDATE TO rules_src DO INSERT INTO rules_log (f1, f2, tag) VALUES (old.f1,old.f2,'old'::text), (new.f1,new.f2,'new'::text)
@ -2768,9 +2768,9 @@ SELECT * FROM rule_v1;
\d+ rule_v1 \d+ rule_v1
View "public.rule_v1" View "public.rule_v1"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
a | integer | | plain | a | integer | | | | plain |
View definition: View definition:
SELECT rule_t1.a SELECT rule_t1.a
FROM rule_t1; FROM rule_t1;
@ -2796,10 +2796,10 @@ DROP TABLE rule_t1;
create view rule_v1 as values(1,2); create view rule_v1 as values(1,2);
\d+ rule_v1 \d+ rule_v1
View "public.rule_v1" View "public.rule_v1"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
---------+---------+-----------+---------+------------- ---------+---------+-----------+----------+---------+---------+-------------
column1 | integer | | plain | column1 | integer | | | | plain |
column2 | integer | | plain | column2 | integer | | | | plain |
View definition: View definition:
VALUES (1,2); VALUES (1,2);
@ -2807,10 +2807,10 @@ drop view rule_v1;
create view rule_v1(x) as values(1,2); create view rule_v1(x) as values(1,2);
\d+ rule_v1 \d+ rule_v1
View "public.rule_v1" View "public.rule_v1"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
---------+---------+-----------+---------+------------- ---------+---------+-----------+----------+---------+---------+-------------
x | integer | | plain | x | integer | | | | plain |
column2 | integer | | plain | column2 | integer | | | | plain |
View definition: View definition:
SELECT "*VALUES*".column1 AS x, SELECT "*VALUES*".column1 AS x,
"*VALUES*".column2 "*VALUES*".column2
@ -2820,10 +2820,10 @@ drop view rule_v1;
create view rule_v1(x) as select * from (values(1,2)) v; create view rule_v1(x) as select * from (values(1,2)) v;
\d+ rule_v1 \d+ rule_v1
View "public.rule_v1" View "public.rule_v1"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
---------+---------+-----------+---------+------------- ---------+---------+-----------+----------+---------+---------+-------------
x | integer | | plain | x | integer | | | | plain |
column2 | integer | | plain | column2 | integer | | | | plain |
View definition: View definition:
SELECT v.column1 AS x, SELECT v.column1 AS x,
v.column2 v.column2
@ -2833,10 +2833,10 @@ drop view rule_v1;
create view rule_v1(x) as select * from (values(1,2)) v(q,w); create view rule_v1(x) as select * from (values(1,2)) v(q,w);
\d+ rule_v1 \d+ rule_v1
View "public.rule_v1" View "public.rule_v1"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
x | integer | | plain | x | integer | | | | plain |
w | integer | | plain | w | integer | | | | plain |
View definition: View definition:
SELECT v.q AS x, SELECT v.q AS x,
v.w v.w

12
src/test/regress/expected/tablesample.out
Unescape View File

@ -70,18 +70,18 @@ CREATE VIEW test_tablesample_v2 AS
SELECT id FROM test_tablesample TABLESAMPLE SYSTEM (99); SELECT id FROM test_tablesample TABLESAMPLE SYSTEM (99);
\d+ test_tablesample_v1 \d+ test_tablesample_v1
View "public.test_tablesample_v1" View "public.test_tablesample_v1"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
id | integer | | plain | id | integer | | | | plain |
View definition: View definition:
SELECT test_tablesample.id SELECT test_tablesample.id
FROM test_tablesample TABLESAMPLE system ((10 * 2)) REPEATABLE (2); FROM test_tablesample TABLESAMPLE system ((10 * 2)) REPEATABLE (2);
\d+ test_tablesample_v2 \d+ test_tablesample_v2
View "public.test_tablesample_v2" View "public.test_tablesample_v2"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
id | integer | | plain | id | integer | | | | plain |
View definition: View definition:
SELECT test_tablesample.id SELECT test_tablesample.id
FROM test_tablesample TABLESAMPLE system (99); FROM test_tablesample TABLESAMPLE system (99);

16
src/test/regress/expected/triggers.out
Unescape View File

@ -1060,10 +1060,10 @@ DELETE 1
-- Describe view should list triggers -- Describe view should list triggers
\d main_view \d main_view
View "public.main_view" View "public.main_view"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
a | integer | a | integer | | |
b | integer | b | integer | | |
Triggers: Triggers:
after_del_stmt_trig AFTER DELETE ON main_view FOR EACH STATEMENT EXECUTE PROCEDURE view_trigger('after_view_del_stmt') after_del_stmt_trig AFTER DELETE ON main_view FOR EACH STATEMENT EXECUTE PROCEDURE view_trigger('after_view_del_stmt')
after_ins_stmt_trig AFTER INSERT ON main_view FOR EACH STATEMENT EXECUTE PROCEDURE view_trigger('after_view_ins_stmt') after_ins_stmt_trig AFTER INSERT ON main_view FOR EACH STATEMENT EXECUTE PROCEDURE view_trigger('after_view_ins_stmt')
@ -1080,10 +1080,10 @@ DROP TRIGGER instead_of_insert_trig ON main_view;
DROP TRIGGER instead_of_delete_trig ON main_view; DROP TRIGGER instead_of_delete_trig ON main_view;
\d+ main_view \d+ main_view
View "public.main_view" View "public.main_view"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
a | integer | | plain | a | integer | | | | plain |
b | integer | | plain | b | integer | | | | plain |
View definition: View definition:
SELECT main_table.a, SELECT main_table.a,
main_table.b main_table.b

24
src/test/regress/expected/typed_table.out
Unescape View File

@ -11,10 +11,10 @@ SELECT * FROM persons;
\d persons \d persons
Table "public.persons" Table "public.persons"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
id | integer | id | integer | | |
name | text | name | text | | |
Typed table of type: person_type Typed table of type: person_type
CREATE FUNCTION get_all_persons() RETURNS SETOF person_type CREATE FUNCTION get_all_persons() RETURNS SETOF person_type
@ -47,10 +47,10 @@ CREATE TABLE persons2 OF person_type (
); );
\d persons2 \d persons2
Table "public.persons2" Table "public.persons2"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+----------- --------+---------+-----------+----------+---------
id | integer | not null id | integer | | not null |
name | text | name | text | | |
Indexes: Indexes:
"persons2_pkey" PRIMARY KEY, btree (id) "persons2_pkey" PRIMARY KEY, btree (id)
"persons2_name_key" UNIQUE CONSTRAINT, btree (name) "persons2_name_key" UNIQUE CONSTRAINT, btree (name)
@ -62,10 +62,10 @@ CREATE TABLE persons3 OF person_type (
); );
\d persons3 \d persons3
Table "public.persons3" Table "public.persons3"
Column | Type | Modifiers Column | Type | Collation | Nullable | Default
--------+---------+------------------ --------+---------+-----------+----------+----------
id | integer | not null id | integer | | not null |
name | text | default ''::text name | text | | | ''::text
Indexes: Indexes:
"persons3_pkey" PRIMARY KEY, btree (id) "persons3_pkey" PRIMARY KEY, btree (id)
Typed table of type: person_type Typed table of type: person_type

26
src/test/regress/expected/updatable_views.out
Unescape View File

@ -1434,10 +1434,10 @@ CREATE VIEW rw_view1 AS SELECT * FROM base_tbl WHERE a < b
WITH LOCAL CHECK OPTION; WITH LOCAL CHECK OPTION;
\d+ rw_view1 \d+ rw_view1
View "public.rw_view1" View "public.rw_view1"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
a | integer | | plain | a | integer | | | | plain |
b | integer | | plain | b | integer | | | | plain |
View definition: View definition:
SELECT base_tbl.a, SELECT base_tbl.a,
base_tbl.b base_tbl.b
@ -1488,9 +1488,9 @@ CREATE VIEW rw_view2 AS SELECT * FROM rw_view1 WHERE a < 10
WITH CHECK OPTION; -- implicitly cascaded WITH CHECK OPTION; -- implicitly cascaded
\d+ rw_view2 \d+ rw_view2
View "public.rw_view2" View "public.rw_view2"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
a | integer | | plain | a | integer | | | | plain |
View definition: View definition:
SELECT rw_view1.a SELECT rw_view1.a
FROM rw_view1 FROM rw_view1
@ -1528,9 +1528,9 @@ CREATE OR REPLACE VIEW rw_view2 AS SELECT * FROM rw_view1 WHERE a < 10
WITH LOCAL CHECK OPTION; WITH LOCAL CHECK OPTION;
\d+ rw_view2 \d+ rw_view2
View "public.rw_view2" View "public.rw_view2"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
a | integer | | plain | a | integer | | | | plain |
View definition: View definition:
SELECT rw_view1.a SELECT rw_view1.a
FROM rw_view1 FROM rw_view1
@ -1569,9 +1569,9 @@ DETAIL: Failing row contains (30).
ALTER VIEW rw_view2 RESET (check_option); ALTER VIEW rw_view2 RESET (check_option);
\d+ rw_view2 \d+ rw_view2
View "public.rw_view2" View "public.rw_view2"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+---------+-----------+---------+------------- --------+---------+-----------+----------+---------+---------+-------------
a | integer | | plain | a | integer | | | | plain |
View definition: View definition:
SELECT rw_view1.a SELECT rw_view1.a
FROM rw_view1 FROM rw_view1

6
src/test/regress/expected/with.out
Unescape View File

@ -355,9 +355,9 @@ UNION ALL
SELECT sum(n) FROM t; SELECT sum(n) FROM t;
\d+ sums_1_100 \d+ sums_1_100
View "public.sums_1_100" View "public.sums_1_100"
Column | Type | Modifiers | Storage | Description Column | Type | Collation | Nullable | Default | Storage | Description
--------+--------+-----------+---------+------------- --------+--------+-----------+----------+---------+---------+-------------
sum | bigint | | plain | sum | bigint | | | | plain |
View definition: View definition:
WITH RECURSIVE t(n) AS ( WITH RECURSIVE t(n) AS (
VALUES (1) VALUES (1)

Write Preview
Loading…
Cancel
Save