Please check the attached minor doc changes. make the create_foreign_table.sgml, alter_foreign_table.sgml not-null description consistent with normal tables.
change doc/src/sgml/ref/create_table.sgml Parameters section from <term><literal>NOT NULL </literal></term> to <term><literal>NOT NULL [ NO INHERIT ] </literal></term>. in doc/src/sgml/ref/alter_table.sgml Adding a constraint recurses only for <literal>CHECK</literal> constraints that are not marked <literal>NO INHERIT</literal>. This sentence needs to be rephrased to: Adding a constraint recurses for <literal>CHECK</literal> and <literal>NOT NULL </literal> constraints that are not marked <literal>NO INHERIT</literal>.
diff --git a/doc/src/sgml/ref/alter_foreign_table.sgml b/doc/src/sgml/ref/alter_foreign_table.sgml index 3cb6f08fcf..115ca5c3d7 100644 --- a/doc/src/sgml/ref/alter_foreign_table.sgml +++ b/doc/src/sgml/ref/alter_foreign_table.sgml @@ -173,7 +173,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceab <para> This form adds a new constraint to a foreign table, using the same syntax as <link linkend="sql-createforeigntable"><command>CREATE FOREIGN TABLE</command></link>. - Currently only <literal>CHECK</literal> constraints are supported. + Currently both <literal>CHECK</literal> and <literal>NOT NULL</literal> constraints are supported. </para> <para> diff --git a/doc/src/sgml/ref/create_foreign_table.sgml b/doc/src/sgml/ref/create_foreign_table.sgml index dc4b907599..a73b6212ff 100644 --- a/doc/src/sgml/ref/create_foreign_table.sgml +++ b/doc/src/sgml/ref/create_foreign_table.sgml @@ -43,7 +43,7 @@ CREATE FOREIGN TABLE [ IF NOT EXISTS ] <replaceable class="parameter">table_name <phrase>where <replaceable class="parameter">column_constraint</replaceable> is:</phrase> [ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ] -{ NOT NULL | +{ NOT NULL [ NO INHERIT ] | NULL | CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] | DEFAULT <replaceable>default_expr</replaceable> | @@ -52,6 +52,7 @@ CREATE FOREIGN TABLE [ IF NOT EXISTS ] <replaceable class="parameter">table_name <phrase>and <replaceable class="parameter">table_constraint</replaceable> is:</phrase> [ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ] + NOT NULL <replaceable class="parameter">column_name</replaceable> [ NO INHERIT ] | CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] <phrase>and <replaceable class="parameter">partition_bound_spec</replaceable> is:</phrase> @@ -203,10 +204,10 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM </varlistentry> <varlistentry> - <term><literal>NOT NULL</literal></term> + <term><literal>NOT NULL</literal> [ NO INHERIT ] </term> <listitem> <para> - The column is not allowed to contain null values. + The column is not allowed to contain null values. <literal>NO INHERIT</literal> makes the not-null constraint not propagate to child tables. </para> </listitem> </varlistentry> diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml index f9a098e77a..3d3a84a405 100644 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@ -61,7 +61,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI <phrase>where <replaceable class="parameter">column_constraint</replaceable> is:</phrase> [ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ] -{ NOT NULL | +{ NOT NULL [ NO INHERIT ] | NULL | CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] | DEFAULT <replaceable>default_expr</replaceable> | @@ -815,10 +815,11 @@ WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REM </varlistentry> <varlistentry id="sql-createtable-parms-not-null"> - <term><literal>NOT NULL</literal></term> + <term><literal>NOT NULL [ NO INHERIT ] </literal></term> <listitem> <para> The column is not allowed to contain null values. + <literal>NO INHERIT</literal> makes the not-null constraint not propagate to child tables. </para> </listitem> </varlistentry>