@@ -59,8 +59,8 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
5959
6060[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ]
6161{ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] |
62- UNIQUE ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] ) <replaceable class="PARAMETER">index_parameters</replaceable> <optional>INCLUDING (<replaceable class="PARAMETER">column_name</replaceable> [, ...])</optional> |
63- PRIMARY KEY ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] ) <replaceable class="PARAMETER">index_parameters</replaceable> <optional>INCLUDING (<replaceable class="PARAMETER">column_name</replaceable> [, ...])</optional> |
62+ UNIQUE ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] ) <replaceable class="PARAMETER">index_parameters</replaceable> <optional>INCLUDE (<replaceable class="PARAMETER">column_name</replaceable> [, ...])</optional> |
63+ PRIMARY KEY ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] ) <replaceable class="PARAMETER">index_parameters</replaceable> <optional>INCLUDE (<replaceable class="PARAMETER">column_name</replaceable> [, ...])</optional> |
6464 EXCLUDE [ USING <replaceable class="parameter">index_method</replaceable> ] ( <replaceable class="parameter">exclude_element</replaceable> WITH <replaceable class="parameter">operator</replaceable> [, ... ] ) <replaceable class="parameter">index_parameters</replaceable> [ WHERE ( <replaceable class="parameter">predicate</replaceable> ) ] |
6565 FOREIGN KEY ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] ) REFERENCES <replaceable class="PARAMETER">reftable</replaceable> [ ( <replaceable class="PARAMETER">refcolumn</replaceable> [, ... ] ) ]
6666 [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE <replaceable class="parameter">action</replaceable> ] [ ON UPDATE <replaceable class="parameter">action</replaceable> ] }
@@ -486,7 +486,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
486486 <varlistentry>
487487 <term><literal>UNIQUE</> (column constraint)</term>
488488 <term><literal>UNIQUE ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] )
489- <optional>INCLUDING ( <replaceable class="PARAMETER">column_name</replaceable> [, ...])</optional></> (table constraint)</term>
489+ <optional>INCLUDE ( <replaceable class="PARAMETER">column_name</replaceable> [, ...])</optional></> (table constraint)</term>
490490 <listitem>
491491 <para>
492492 The <literal>UNIQUE</literal> constraint specifies that a
@@ -511,12 +511,12 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
511511 <para>
512512 Adding a unique constraint will automatically create a unique btree
513513 index on the column or group of columns used in the constraint.
514- Optional clause <literal>INCLUDING </literal> allows to add into the index
514+ Optional clause <literal>INCLUDE </literal> allows to add into the index
515515 a portion of columns on which the uniqueness is not enforced upon.
516516 Note, that althogh constraint is not enforced upon included columns, it still
517517 depends on them. Consequently, some operations on these columns (e.g. <literal>DROP COLUMN</literal>)
518518 can cause cascade constraint and index deletion.
519- See paragraph about <literal>INCLUDING </literal> in
519+ See paragraph about <literal>INCLUDE </literal> in
520520 <xref linkend="SQL-CREATEINDEX"> for more information.
521521 </para>
522522
@@ -526,7 +526,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
526526 <varlistentry>
527527 <term><literal>PRIMARY KEY</> (column constraint)</term>
528528 <term><literal>PRIMARY KEY ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] )
529- <optional>INCLUDING ( <replaceable class="PARAMETER">column_name</replaceable> [, ...])</optional></> (table constraint)</term>
529+ <optional>INCLUDE ( <replaceable class="PARAMETER">column_name</replaceable> [, ...])</optional></> (table constraint)</term>
530530 <listitem>
531531 <para>
532532 The <literal>PRIMARY KEY</> constraint specifies that a column or
@@ -553,12 +553,12 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
553553 <para>
554554 Adding a <literal>PRIMARY KEY</literal> constraint will automatically create a unique btree
555555 index on the column or group of columns used in the constraint.
556- Optional clause <literal>INCLUDING </literal> allows to add into the index
556+ An optional clause <literal>INCLUDE </literal> allows to add into the index
557557 a portion of columns on which the constraint is not enforced upon.
558558 Note, that althogh constraint is not enforced upon included columns, it still
559559 depends on them. Consequently, some operations on these columns (e.g. <literal>DROP COLUMN</literal>)
560560 can cause cascade constraint and index deletion.
561- See paragraph about <literal>INCLUDING </literal> in
561+ See paragraph about <literal>INCLUDE </literal> in
562562 <xref linkend="SQL-CREATEINDEX"> for more information.
563563 </para>
564564 </listitem>