From c15de02f6193edf6a1f014efbe88c4ce47c64201 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 28 Nov 2006 01:09:01 +0000
Subject: [PATCH] Fix inheritance description to note that not-null constraints
 are inherited, per Taiki Yamaguchi.

---
 doc/src/sgml/ddl.sgml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 8a3b2ebc7f3..dee6bc70340 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.68 2006/11/21 03:44:55 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.69 2006/11/28 01:09:01 tgl Exp $ -->
 
 <chapter id="ddl">
  <title>Data Definition</title>
@@ -2055,10 +2055,9 @@ VALUES ('New York', NULL, NULL, 'NY');
   </para>
 
   <para>
-   Check constraints can be defined on tables within an inheritance
-   hierarchy. All check constraints on a parent table are
-   automatically inherited by all of its children.  Other types of
-   constraints are not inherited, however.
+   All check constraints and not-null constraints on a parent table are
+   automatically inherited by its children.  Other types of constraints
+   (unique, primary key, and foreign key constraints) are not inherited.
   </para>
 
   <para>
@@ -2070,7 +2069,8 @@ VALUES ('New York', NULL, NULL, 'NY');
    so that there is only one such column in the child table.  To be merged,
    columns must have the same data types, else an error is raised.  The
    merged column will have copies of all the check constraints coming from
-   any one of the column definitions it came from.
+   any one of the column definitions it came from, and will be marked not-null
+   if any of them are.
   </para>
 
   <para>
-- 
GitLab