diff --git a/doc/src/sgml/ref/alter_aggregate.sgml b/doc/src/sgml/ref/alter_aggregate.sgml
index 26c5dc0175..571a50a502 100644
--- a/doc/src/sgml/ref/alter_aggregate.sgml
+++ b/doc/src/sgml/ref/alter_aggregate.sgml
@@ -21,9 +21,9 @@ PostgreSQL documentation
-ALTER AGGREGATE name ( type [ , ... ] ) RENAME TO new_name
-ALTER AGGREGATE name ( type [ , ... ] ) OWNER TO new_owner
-ALTER AGGREGATE name ( type [ , ... ] ) SET SCHEMA new_schema
+ALTER AGGREGATE name ( argtype [ , ... ] ) RENAME TO new_name
+ALTER AGGREGATE name ( argtype [ , ... ] ) OWNER TO new_owner
+ALTER AGGREGATE name ( argtype [ , ... ] ) SET SCHEMA new_schema
@@ -62,7 +62,7 @@ ALTER AGGREGATE name ( type
- type
+ argtype
An input data type on which the aggregate function operates.
diff --git a/doc/src/sgml/ref/alter_extension.sgml b/doc/src/sgml/ref/alter_extension.sgml
index cbe5043fef..6916da3f9d 100644
--- a/doc/src/sgml/ref/alter_extension.sgml
+++ b/doc/src/sgml/ref/alter_extension.sgml
@@ -23,10 +23,10 @@ PostgreSQL documentation
-ALTER EXTENSION extension_name UPDATE [ TO new_version ]
-ALTER EXTENSION extension_name SET SCHEMA new_schema
-ALTER EXTENSION extension_name ADD member_object
-ALTER EXTENSION extension_name DROP member_object
+ALTER EXTENSION name UPDATE [ TO new_version ]
+ALTER EXTENSION name SET SCHEMA new_schema
+ALTER EXTENSION name ADD member_object
+ALTER EXTENSION name DROP member_object
where member_object is:
@@ -126,7 +126,7 @@ ALTER EXTENSION extension_name DROP
- extension_name
+ name
The name of an installed extension.
diff --git a/doc/src/sgml/ref/alter_foreign_table.sgml b/doc/src/sgml/ref/alter_foreign_table.sgml
index c3f33a50ae..f0b3129ab0 100644
--- a/doc/src/sgml/ref/alter_foreign_table.sgml
+++ b/doc/src/sgml/ref/alter_foreign_table.sgml
@@ -24,7 +24,7 @@ PostgreSQL documentation
ALTER FOREIGN TABLE [ IF EXISTS ] name
action [, ... ]
ALTER FOREIGN TABLE [ IF EXISTS ] name
- RENAME [ COLUMN ] column TO new_column
+ RENAME [ COLUMN ] column_name TO new_column_name
ALTER FOREIGN TABLE [ IF EXISTS ] name
RENAME TO new_name
ALTER FOREIGN TABLE [ IF EXISTS ] name
@@ -32,14 +32,14 @@ ALTER FOREIGN TABLE [ IF EXISTS ] namewhere action is one of:
- ADD [ COLUMN ] column type [ NULL | NOT NULL ]
- DROP [ COLUMN ] [ IF EXISTS ] column [ RESTRICT | CASCADE ]
- ALTER [ COLUMN ] column [ SET DATA ] TYPE type
- ALTER [ COLUMN ] column { SET | DROP } NOT NULL
- ALTER [ COLUMN ] column SET STATISTICS integer
- ALTER [ COLUMN ] column SET ( attribute_option = value [, ... ] )
- ALTER [ COLUMN ] column RESET ( attribute_option [, ... ] )
- ALTER [ COLUMN ] column OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ])
+ ADD [ COLUMN ] column_name data_type [ NULL | NOT NULL ]
+ DROP [ COLUMN ] [ IF EXISTS ] column_name [ RESTRICT | CASCADE ]
+ ALTER [ COLUMN ] column_name [ SET DATA ] TYPE data_type
+ ALTER [ COLUMN ] column_name { SET | DROP } NOT NULL
+ ALTER [ COLUMN ] column_name SET STATISTICS integer
+ ALTER [ COLUMN ] column_name SET ( attribute_option = value [, ... ] )
+ ALTER [ COLUMN ] column_name RESET ( attribute_option [, ... ] )
+ ALTER [ COLUMN ] column_name OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ])
OWNER TO new_owner
OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ])
@@ -216,7 +216,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] name
- column
+ column_name
Name of a new or existing column.
@@ -225,7 +225,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] name
- new_column
+ new_column_name
New name for an existing column.
@@ -243,7 +243,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] name
- type
+ data_type
Data type of the new column, or new data type for an existing
diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml
index 6ddd461fe9..204ca11f0b 100644
--- a/doc/src/sgml/ref/alter_sequence.sgml
+++ b/doc/src/sgml/ref/alter_sequence.sgml
@@ -28,7 +28,7 @@ ALTER SEQUENCE [ IF EXISTS ] name [
[ START [ WITH ] start ]
[ RESTART [ [ WITH ] restart ] ]
[ CACHE cache ] [ [ NO ] CYCLE ]
- [ OWNED BY { table.column | NONE } ]
+ [ OWNED BY { table_name.column_name | NONE } ]
ALTER SEQUENCE [ IF EXISTS ] name OWNER TO new_owner
ALTER SEQUENCE [ IF EXISTS ] name RENAME TO new_name
ALTER SEQUENCE [ IF EXISTS ] name SET SCHEMA new_schema
@@ -203,7 +203,7 @@ ALTER SEQUENCE [ IF EXISTS ] name S
- OWNED BY table.column
+ OWNED BY table_name.column_name
OWNED BY NONE
diff --git a/doc/src/sgml/ref/alter_server.sgml b/doc/src/sgml/ref/alter_server.sgml
index 248efd9163..08afde1dd0 100644
--- a/doc/src/sgml/ref/alter_server.sgml
+++ b/doc/src/sgml/ref/alter_server.sgml
@@ -21,10 +21,10 @@ PostgreSQL documentation
-ALTER SERVER server_name [ VERSION 'new_version' ]
+ALTER SERVER name [ VERSION 'new_version' ]
[ OPTIONS ( [ ADD | SET | DROP ] option ['value'] [, ... ] ) ]
-ALTER SERVER server_name OWNER TO new_owner
-ALTER SERVER server_name RENAME TO new_name
+ALTER SERVER name OWNER TO new_owner
+ALTER SERVER name RENAME TO new_name
@@ -53,7 +53,7 @@ ALTER SERVER server_name RENAME TO
- server_name
+ name
The name of an existing server.
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 04e3e54172..3f61d7d45f 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -24,7 +24,7 @@ PostgreSQL documentation
ALTER TABLE [ IF EXISTS ] [ ONLY ] name [ * ]
action [, ... ]
ALTER TABLE [ IF EXISTS ] [ ONLY ] name [ * ]
- RENAME [ COLUMN ] column TO new_column
+ RENAME [ COLUMN ] column_name TO new_column_name
ALTER TABLE [ IF EXISTS ] [ ONLY ] name [ * ]
RENAME CONSTRAINT constraint_name TO new_constraint_name
ALTER TABLE [ IF EXISTS ] name
@@ -34,16 +34,16 @@ ALTER TABLE [ IF EXISTS ] name
where action is one of:
- ADD [ COLUMN ] column data_type [ COLLATE collation ] [ column_constraint [ ... ] ]
- DROP [ COLUMN ] [ IF EXISTS ] column [ RESTRICT | CASCADE ]
- ALTER [ COLUMN ] column [ SET DATA ] TYPE data_type [ COLLATE collation ] [ USING expression ]
- ALTER [ COLUMN ] column SET DEFAULT expression
- ALTER [ COLUMN ] column DROP DEFAULT
- ALTER [ COLUMN ] column { SET | DROP } NOT NULL
- ALTER [ COLUMN ] column SET STATISTICS integer
- ALTER [ COLUMN ] column SET ( attribute_option = value [, ... ] )
- ALTER [ COLUMN ] column RESET ( attribute_option [, ... ] )
- ALTER [ COLUMN ] column SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }
+ ADD [ COLUMN ] column_name data_type [ COLLATE collation ] [ column_constraint [ ... ] ]
+ DROP [ COLUMN ] [ IF EXISTS ] column_name [ RESTRICT | CASCADE ]
+ ALTER [ COLUMN ] column_name [ SET DATA ] TYPE data_type [ COLLATE collation ] [ USING expression ]
+ ALTER [ COLUMN ] column_name SET DEFAULT expression
+ ALTER [ COLUMN ] column_name DROP DEFAULT
+ ALTER [ COLUMN ] column_name { SET | DROP } NOT NULL
+ ALTER [ COLUMN ] column_name SET STATISTICS integer
+ ALTER [ COLUMN ] column_name SET ( attribute_option = value [, ... ] )
+ ALTER [ COLUMN ] column_name RESET ( attribute_option [, ... ] )
+ ALTER [ COLUMN ] column_name SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }
ADD table_constraint [ NOT VALID ]
ADD table_constraint_using_index
VALIDATE CONSTRAINT constraint_name
@@ -634,7 +634,7 @@ ALTER TABLE [ IF EXISTS ] name
- column
+ column_name
Name of a new or existing column.
@@ -643,7 +643,7 @@ ALTER TABLE [ IF EXISTS ] name
- new_column
+ new_column_name
New name for an existing column.
diff --git a/doc/src/sgml/ref/alter_trigger.sgml b/doc/src/sgml/ref/alter_trigger.sgml
index 90c2e3d141..0d70167024 100644
--- a/doc/src/sgml/ref/alter_trigger.sgml
+++ b/doc/src/sgml/ref/alter_trigger.sgml
@@ -21,7 +21,7 @@ PostgreSQL documentation
-ALTER TRIGGER name ON table RENAME TO new_name
+ALTER TRIGGER name ON table_name RENAME TO new_name
@@ -54,7 +54,7 @@ ALTER TRIGGER name ON
- table
+ table_name
The name of the table on which this trigger acts.
diff --git a/doc/src/sgml/ref/alter_view.sgml b/doc/src/sgml/ref/alter_view.sgml
index c518d93649..521f05b84a 100644
--- a/doc/src/sgml/ref/alter_view.sgml
+++ b/doc/src/sgml/ref/alter_view.sgml
@@ -21,8 +21,8 @@ PostgreSQL documentation
-ALTER VIEW [ IF EXISTS ] name ALTER [ COLUMN ] column SET DEFAULT expression
-ALTER VIEW [ IF EXISTS ] name ALTER [ COLUMN ] column DROP DEFAULT
+ALTER VIEW [ IF EXISTS ] name ALTER [ COLUMN ] column_name SET DEFAULT expression
+ALTER VIEW [ IF EXISTS ] name ALTER [ COLUMN ] column_name DROP DEFAULT
ALTER VIEW [ IF EXISTS ] name OWNER TO new_owner
ALTER VIEW [ IF EXISTS ] name RENAME TO new_name
ALTER VIEW [ IF EXISTS ] name SET SCHEMA new_schema
diff --git a/doc/src/sgml/ref/analyze.sgml b/doc/src/sgml/ref/analyze.sgml
index 52b2114889..8063e3752e 100644
--- a/doc/src/sgml/ref/analyze.sgml
+++ b/doc/src/sgml/ref/analyze.sgml
@@ -21,7 +21,7 @@ PostgreSQL documentation
-ANALYZE [ VERBOSE ] [ table [ ( column [, ...] ) ] ]
+ANALYZE [ VERBOSE ] [ table_name [ ( column_name [, ...] ) ] ]
@@ -59,7 +59,7 @@ ANALYZE [ VERBOSE ] [ table [ (
- table
+ table_name
The name (possibly schema-qualified) of a specific table to
@@ -70,7 +70,7 @@ ANALYZE [ VERBOSE ] [ table [ (
- column
+ column_name
The name of a specific column to analyze. Defaults to all columns.
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index a73b02276c..4e4e834e06 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -22,11 +22,11 @@ PostgreSQL documentation
-COPY table_name [ ( column [, ...] ) ]
+COPY table_name [ ( column_name [, ...] ) ]
FROM { 'filename' | STDIN }
[ [ WITH ] ( option [, ...] ) ]
-COPY { table_name [ ( column [, ...] ) ] | ( query ) }
+COPY { table_name [ ( column_name [, ...] ) ] | ( query ) }
TO { 'filename' | STDOUT }
[ [ WITH ] ( option [, ...] ) ]
@@ -39,8 +39,8 @@ COPY { table_name [ ( boolean ]
QUOTE 'quote_character'
ESCAPE 'escape_character'
- FORCE_QUOTE { ( column [, ...] ) | * }
- FORCE_NOT_NULL ( column [, ...] ) |
+ FORCE_QUOTE { ( column_name [, ...] ) | * }
+ FORCE_NOT_NULL ( column_name [, ...] ) |
ENCODING 'encoding_name'
@@ -91,7 +91,7 @@ COPY { table_name [ (
- column
+ column_name
An optional list of columns to be copied. If no column list is
@@ -864,7 +864,7 @@ ZW ZIMBABWE
version 9.0 and is still supported:
-COPY table_name [ ( column [, ...] ) ]
+COPY table_name [ ( column_name [, ...] ) ]
FROM { 'filename' | STDIN }
[ [ WITH ]
[ BINARY ]
@@ -874,9 +874,9 @@ COPY table_name [ ( quote' ]
[ ESCAPE [ AS ] 'escape' ]
- [ FORCE NOT NULL column [, ...] ] ] ]
+ [ FORCE NOT NULL column_name [, ...] ] ] ]
-COPY { table_name [ ( column [, ...] ) ] | ( query ) }
+COPY { table_name [ ( column_name [, ...] ) ] | ( query ) }
TO { 'filename' | STDOUT }
[ [ WITH ]
[ BINARY ]
@@ -886,7 +886,7 @@ COPY { table_name [ ( quote' ]
[ ESCAPE [ AS ] 'escape' ]
- [ FORCE QUOTE { column [, ...] | * } ] ] ]
+ [ FORCE QUOTE { column_name [, ...] | * } ] ] ]
Note that in this syntax, BINARY and CSV are
diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml
index 4e0ed5616c..91cf7018c0 100644
--- a/doc/src/sgml/ref/create_database.sgml
+++ b/doc/src/sgml/ref/create_database.sgml
@@ -27,7 +27,7 @@ CREATE DATABASE name
[ ENCODING [=] encoding ]
[ LC_COLLATE [=] lc_collate ]
[ LC_CTYPE [=] lc_ctype ]
- [ TABLESPACE [=] tablespace ]
+ [ TABLESPACE [=] tablespace_name ]
[ CONNECTION LIMIT [=] connlimit ] ]
@@ -139,7 +139,7 @@ CREATE DATABASE name
- tablespace
+ tablespace_name
The name of the tablespace that will be associated with the
diff --git a/doc/src/sgml/ref/create_extension.sgml b/doc/src/sgml/ref/create_extension.sgml
index 9ec0fa2fe1..4f3b9a5698 100644
--- a/doc/src/sgml/ref/create_extension.sgml
+++ b/doc/src/sgml/ref/create_extension.sgml
@@ -22,7 +22,7 @@ PostgreSQL documentation
CREATE EXTENSION [ IF NOT EXISTS ] extension_name
- [ WITH ] [ SCHEMA schema ]
+ [ WITH ] [ SCHEMA schema_name ]
[ VERSION version ]
[ FROM old_version ]
@@ -85,7 +85,7 @@ CREATE EXTENSION [ IF NOT EXISTS ] extension_name
- schema
+ schema_name
The name of the schema in which to install the extension's
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index 99a7e205a1..2ab6470367 100644
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -21,10 +21,10 @@ PostgreSQL documentation
-CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ name ] ON table [ USING method ]
- ( { column | ( expression ) } [ COLLATE collation ] [ opclass ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [, ...] )
+CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ name ] ON table_name [ USING method ]
+ ( { column_name | ( expression ) } [ COLLATE collation ] [ opclass ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [, ...] )
[ WITH ( storage_parameter = value [, ... ] ) ]
- [ TABLESPACE tablespace ]
+ [ TABLESPACE tablespace_name ]
[ WHERE predicate ]
@@ -140,7 +140,7 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ name
- table
+ table_name
The name (possibly schema-qualified) of the table to be indexed.
@@ -161,7 +161,7 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ name
- column
+ column_name
The name of a column of the table.
@@ -253,7 +253,7 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ name
- tablespace
+ tablespace_name
The tablespace in which to create the index. If not specified,
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
index 8bccf7f1f1..d4c3392129 100644
--- a/doc/src/sgml/ref/create_rule.sgml
+++ b/doc/src/sgml/ref/create_rule.sgml
@@ -22,7 +22,7 @@ PostgreSQL documentation
CREATE [ OR REPLACE ] RULE name AS ON event
- TO table [ WHERE condition ]
+ TO table_name [ WHERE condition ]
DO [ ALSO | INSTEAD ] { NOTHING | command | ( command ; command ... ) }
@@ -125,7 +125,7 @@ CREATE [ OR REPLACE ] RULE name AS
- table
+ table_name
The name (optionally schema-qualified) of the table or view the
diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml
index 367f440b6c..38d160d4ac 100644
--- a/doc/src/sgml/ref/create_sequence.sgml
+++ b/doc/src/sgml/ref/create_sequence.sgml
@@ -24,7 +24,7 @@ PostgreSQL documentation
CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]
[ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]
[ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]
- [ OWNED BY { table.column | NONE } ]
+ [ OWNED BY { table_name.column_name | NONE } ]
@@ -197,7 +197,7 @@ SELECT * FROM name;
- OWNED BY table.column
+ OWNED BY table_name.column_name
OWNED BY NONE
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index 1d7d31287f..08632d3172 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -30,7 +30,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
[ INHERITS ( parent_table [, ... ] ) ]
[ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]
[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]
-[ TABLESPACE tablespace ]
+[ TABLESPACE tablespace_name ]
CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] table_name
OF type_name [ (
@@ -40,7 +40,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
) ]
[ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]
[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]
-[ TABLESPACE tablespace ]
+[ TABLESPACE tablespace_name ]
where column_constraint is:
@@ -73,11 +73,11 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
index_parameters in UNIQUE, PRIMARY KEY, and EXCLUDE constraints are:
[ WITH ( storage_parameter [= value] [, ... ] ) ]
-[ USING INDEX TABLESPACE tablespace ]
+[ USING INDEX TABLESPACE tablespace_name ]
exclude_element in an EXCLUDE constraint is:
-{ column | ( expression ) } [ opclass ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ]
+{ column_name | ( expression ) } [ opclass ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ]
@@ -573,7 +573,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
REFERENCES reftable [ ( refcolumn ) ] [ MATCH matchtype ] [ ON DELETE action ] [ ON UPDATE action ] (column constraint)
- FOREIGN KEY ( column [, ... ] )
+ FOREIGN KEY ( column_name [, ... ] )
REFERENCES reftable [ ( refcolumn [, ... ] ) ]
[ MATCH matchtype ]
[ ON DELETE action ]
@@ -825,10 +825,10 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
- TABLESPACE tablespace
+ TABLESPACE tablespace_name
- The tablespace is the name
+ The tablespace_name is the name
of the tablespace in which the new table is to be created.
If not specified,
is consulted, or
@@ -838,7 +838,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
- USING INDEX TABLESPACE tablespace
+ USING INDEX TABLESPACE tablespace_name
This clause allows selection of the tablespace in which the index
diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml
index 29d161940c..9739417a70 100644
--- a/doc/src/sgml/ref/create_table_as.sgml
+++ b/doc/src/sgml/ref/create_table_as.sgml
@@ -25,7 +25,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE column_name [, ...] ) ]
[ WITH ( storage_parameter [= value] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]
[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]
- [ TABLESPACE tablespace ]
+ [ TABLESPACE tablespace_name ]
AS query
[ WITH [ NO ] DATA ]
@@ -184,10 +184,10 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE
- TABLESPACE tablespace
+ TABLESPACE tablespace_name
- The tablespace is the name
+ The tablespace_name is the name
of the tablespace in which the new table is to be created.
If not specified,
is consulted, or
diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index aed07a9dfb..0f87b1fc96 100644
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -22,7 +22,7 @@ PostgreSQL documentation
CREATE [ CONSTRAINT ] TRIGGER name { BEFORE | AFTER | INSTEAD OF } { event [ OR ... ] }
- ON table
+ ON table_name
[ FROM referenced_table_name ]
{ NOT DEFERRABLE | [ DEFERRABLE ] { INITIALLY IMMEDIATE | INITIALLY DEFERRED } }
[ FOR [ EACH ] { ROW | STATEMENT } ]
@@ -241,7 +241,7 @@ UPDATE OF column_name1 [, column_name2
- table
+ table_name
The name (optionally schema-qualified) of the table or view the trigger
diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml
index 6366b15811..2a9841d706 100644
--- a/doc/src/sgml/ref/delete.sgml
+++ b/doc/src/sgml/ref/delete.sgml
@@ -22,7 +22,7 @@ PostgreSQL documentation
[ WITH [ RECURSIVE ] with_query [, ...] ]
-DELETE FROM [ ONLY ] table [ [ AS ] alias ]
+DELETE FROM [ ONLY ] table_name [ [ AS ] alias ]
[ USING using_list ]
[ WHERE condition | WHERE CURRENT OF cursor_name ]
[ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]
@@ -107,7 +107,7 @@ DELETE FROM [ ONLY ] table [ [ AS ]
- table
+ table_name
The name (optionally schema-qualified) of an existing table.
@@ -178,7 +178,7 @@ DELETE FROM [ ONLY ] table [ [ AS ]
An expression to be computed and returned by the DELETE
command after each row is deleted. The expression can use any
- column names of the table
+ column names of the table named by table_name
or table(s) listed in USING.
Write * to return all columns.
diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml
index dd8aafa74d..1ed152f6a0 100644
--- a/doc/src/sgml/ref/drop_aggregate.sgml
+++ b/doc/src/sgml/ref/drop_aggregate.sgml
@@ -21,7 +21,7 @@ PostgreSQL documentation
-DROP AGGREGATE [ IF EXISTS ] name ( type [ , ... ] ) [ CASCADE | RESTRICT ]
+DROP AGGREGATE [ IF EXISTS ] name ( argtype [ , ... ] ) [ CASCADE | RESTRICT ]
@@ -60,7 +60,7 @@ DROP AGGREGATE [ IF EXISTS ] name (
- type
+ argtype
An input data type on which the aggregate function operates.
diff --git a/doc/src/sgml/ref/drop_extension.sgml b/doc/src/sgml/ref/drop_extension.sgml
index 979a6ebc15..bcc5cfe780 100644
--- a/doc/src/sgml/ref/drop_extension.sgml
+++ b/doc/src/sgml/ref/drop_extension.sgml
@@ -21,7 +21,7 @@ PostgreSQL documentation
-DROP EXTENSION [ IF EXISTS ] extension_name [, ...] [ CASCADE | RESTRICT ]
+DROP EXTENSION [ IF EXISTS ] name [, ...] [ CASCADE | RESTRICT ]
@@ -54,7 +54,7 @@ DROP EXTENSION [ IF EXISTS ] extension_name
- extension_name
+ name
The name of an installed extension.
diff --git a/doc/src/sgml/ref/drop_rule.sgml b/doc/src/sgml/ref/drop_rule.sgml
index b7ff6e6078..ca52347209 100644
--- a/doc/src/sgml/ref/drop_rule.sgml
+++ b/doc/src/sgml/ref/drop_rule.sgml
@@ -21,7 +21,7 @@ PostgreSQL documentation
-DROP RULE [ IF EXISTS ] name ON table [ CASCADE | RESTRICT ]
+DROP RULE [ IF EXISTS ] name ON table_name [ CASCADE | RESTRICT ]
@@ -58,7 +58,7 @@ DROP RULE [ IF EXISTS ] name ON
- table
+ table_name
The name (optionally schema-qualified) of the table or view that
diff --git a/doc/src/sgml/ref/drop_server.sgml b/doc/src/sgml/ref/drop_server.sgml
index 6a64e83ebe..a6e6743357 100644
--- a/doc/src/sgml/ref/drop_server.sgml
+++ b/doc/src/sgml/ref/drop_server.sgml
@@ -21,7 +21,7 @@ PostgreSQL documentation
-DROP SERVER [ IF EXISTS ] server_name [ CASCADE | RESTRICT ]
+DROP SERVER [ IF EXISTS ] name [ CASCADE | RESTRICT ]
@@ -50,7 +50,7 @@ DROP SERVER [ IF EXISTS ] server_name
- server_name
+ name
The name of an existing server.
diff --git a/doc/src/sgml/ref/drop_tablespace.sgml b/doc/src/sgml/ref/drop_tablespace.sgml
index 107e049c8c..1db6ecd59a 100644
--- a/doc/src/sgml/ref/drop_tablespace.sgml
+++ b/doc/src/sgml/ref/drop_tablespace.sgml
@@ -21,7 +21,7 @@ PostgreSQL documentation
-DROP TABLESPACE [ IF EXISTS ] tablespace_name
+DROP TABLESPACE [ IF EXISTS ] name
@@ -60,7 +60,7 @@ DROP TABLESPACE [ IF EXISTS ] tablespace_name
- tablespace_name
+ name
The name of a tablespace.
diff --git a/doc/src/sgml/ref/drop_trigger.sgml b/doc/src/sgml/ref/drop_trigger.sgml
index 2fcc690db7..3ec6cc7f05 100644
--- a/doc/src/sgml/ref/drop_trigger.sgml
+++ b/doc/src/sgml/ref/drop_trigger.sgml
@@ -21,7 +21,7 @@ PostgreSQL documentation
-DROP TRIGGER [ IF EXISTS ] name ON table [ CASCADE | RESTRICT ]
+DROP TRIGGER [ IF EXISTS ] name ON table_name [ CASCADE | RESTRICT ]
@@ -60,7 +60,7 @@ DROP TRIGGER [ IF EXISTS ] name ON
- table
+ table_name
The name (optionally schema-qualified) of the table for which
diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml
index 05f98bb6bb..fb81af425d 100644
--- a/doc/src/sgml/ref/grant.sgml
+++ b/doc/src/sgml/ref/grant.sgml
@@ -27,8 +27,8 @@ GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }
| ALL TABLES IN SCHEMA schema_name [, ...] }
TO { [ GROUP ] role_name | PUBLIC } [, ...] [ WITH GRANT OPTION ]
-GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )
- [, ...] | ALL [ PRIVILEGES ] ( column [, ...] ) }
+GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( column_name [, ...] )
+ [, ...] | ALL [ PRIVILEGES ] ( column_name [, ...] ) }
ON [ TABLE ] table_name [, ...]
TO { [ GROUP ] role_name | PUBLIC } [, ...] [ WITH GRANT OPTION ]
diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml
index 6aae3396d2..a3930beb38 100644
--- a/doc/src/sgml/ref/insert.sgml
+++ b/doc/src/sgml/ref/insert.sgml
@@ -22,7 +22,7 @@ PostgreSQL documentation
[ WITH [ RECURSIVE ] with_query [, ...] ]
-INSERT INTO table [ ( column [, ...] ) ]
+INSERT INTO table_name [ ( column_name [, ...] ) ]
{ DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) [, ...] | query }
[ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]
@@ -106,7 +106,7 @@ INSERT INTO table [ (
- table
+ table_name
The name (optionally schema-qualified) of an existing table.
@@ -115,10 +115,10 @@ INSERT INTO table [ (
- column
+ column_name
- The name of a column in table.
+ The name of a column in the table named by table_name.
The column name can be qualified with a subfield name or array
subscript, if needed. (Inserting into only some fields of a
composite column leaves the other fields null.)
@@ -139,8 +139,7 @@ INSERT INTO table [ ( expression
- An expression or value to assign to the corresponding column.
+ An expression or value to assign to the corresponding column.
@@ -149,7 +148,7 @@ INSERT INTO table [ ( DEFAULT
- The corresponding column will be filled with
+ The corresponding column will be filled with
its default value.
@@ -173,7 +172,7 @@ INSERT INTO table [ (
An expression to be computed and returned by the INSERT
command after each row is inserted. The expression can use any
- column names of the table.
+ column names of the table named by table_name.
Write * to return all columns of the inserted row(s).
diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgml
index 202a2a35ab..d2c5a4a505 100644
--- a/doc/src/sgml/ref/revoke.sgml
+++ b/doc/src/sgml/ref/revoke.sgml
@@ -30,8 +30,8 @@ REVOKE [ GRANT OPTION FOR ]
[ CASCADE | RESTRICT ]
REVOKE [ GRANT OPTION FOR ]
- { { SELECT | INSERT | UPDATE | REFERENCES } ( column [, ...] )
- [, ...] | ALL [ PRIVILEGES ] ( column [, ...] ) }
+ { { SELECT | INSERT | UPDATE | REFERENCES } ( column_name [, ...] )
+ [, ...] | ALL [ PRIVILEGES ] ( column_name [, ...] ) }
ON [ TABLE ] table_name [, ...]
FROM { [ GROUP ] role_name | PUBLIC } [, ...]
[ CASCADE | RESTRICT ]
diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml
index 1c0e21536b..c575374dd0 100644
--- a/doc/src/sgml/ref/update.sgml
+++ b/doc/src/sgml/ref/update.sgml
@@ -22,9 +22,9 @@ PostgreSQL documentation
[ WITH [ RECURSIVE ] with_query [, ...] ]
-UPDATE [ ONLY ] table [ [ AS ] alias ]
- SET { column = { expression | DEFAULT } |
- ( column [, ...] ) = ( { expression | DEFAULT } [, ...] ) } [, ...]
+UPDATE [ ONLY ] table_name [ [ AS ] alias ]
+ SET { column_name = { expression | DEFAULT } |
+ ( column_name [, ...] ) = ( { expression | DEFAULT } [, ...] ) } [, ...]
[ FROM from_list ]
[ WHERE condition | WHERE CURRENT OF cursor_name ]
[ RETURNING * | output_expression [ [ AS ] output_name ] [, ...] ]
@@ -93,7 +93,7 @@ UPDATE [ ONLY ] table [ [ AS ]
- table
+ table_name
The name (optionally schema-qualified) of the table to update.
@@ -115,11 +115,11 @@ UPDATE [ ONLY ] table [ [ AS ]
- column
+ column_name
- The name of a column in table.
+ The name of a column in the table named by table_name.
The column name can be qualified with a subfield name or array
subscript, if needed. Do not include the table's name in the
specification of a target column — for example,
@@ -198,7 +198,7 @@ UPDATE [ ONLY ] table [ [ AS ]
An expression to be computed and returned by the UPDATE
command after each row is updated. The expression can use any
- column names of the table
+ column names of the table named by table_name
or table(s) listed in FROM.
Write * to return all columns.
diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml
index f05babc76a..eb71581dfd 100644
--- a/doc/src/sgml/ref/vacuum.sgml
+++ b/doc/src/sgml/ref/vacuum.sgml
@@ -21,9 +21,9 @@ PostgreSQL documentation
-VACUUM [ ( { FULL | FREEZE | VERBOSE | ANALYZE } [, ...] ) ] [ table [ (column [, ...] ) ] ]
-VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]
-VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column [, ...] ) ] ]
+VACUUM [ ( { FULL | FREEZE | VERBOSE | ANALYZE } [, ...] ) ] [ table_name [ (column_name [, ...] ) ] ]
+VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table_name ]
+VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table_name [ (column_name [, ...] ) ] ]
@@ -127,7 +127,7 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [
- table
+ table_name
The name (optionally schema-qualified) of a specific table to
@@ -137,7 +137,7 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [
- column
+ column_name
The name of a specific column to analyze. Defaults to all columns.