Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 24722C9D2 for ; Thu, 25 Jul 2013 15:18:08 +0000 (UTC) Received: (qmail 64500 invoked by uid 500); 25 Jul 2013 15:18:08 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 63451 invoked by uid 500); 25 Jul 2013 15:18:02 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 63397 invoked by uid 99); 25 Jul 2013 15:17:58 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jul 2013 15:17:58 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 25 Jul 2013 15:17:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D16BD238890D; Thu, 25 Jul 2013 15:17:35 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1507006 - /db/derby/docs/branches/10.9/src/ref/rrefsqlj16095.dita Date: Thu, 25 Jul 2013 15:17:35 -0000 To: derby-commits@db.apache.org From: chaase3@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130725151735.D16BD238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chaase3 Date: Thu Jul 25 15:17:35 2013 New Revision: 1507006 URL: http://svn.apache.org/r1507006 Log: DERBY-6298 Documentation implies column NOT NULL constraint cannot be named, but it can be. Merged patch DERBY-6298-2.diff to 10.9 doc branch from trunk revision 1506977. Modified: db/derby/docs/branches/10.9/src/ref/rrefsqlj16095.dita Modified: db/derby/docs/branches/10.9/src/ref/rrefsqlj16095.dita URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.9/src/ref/rrefsqlj16095.dita?rev=1507006&r1=1507005&r2=1507006&view=diff ============================================================================== --- db/derby/docs/branches/10.9/src/ref/rrefsqlj16095.dita (original) +++ db/derby/docs/branches/10.9/src/ref/rrefsqlj16095.dita Thu Jul 25 15:17:35 2013 @@ -21,17 +21,13 @@ limitations under the License. Column-level-constraint - { + [CONSTRAINT constraint-Name] +{ NOT NULL | - [ [CONSTRAINT constraint-Name] - { - CHECK (searchCondition) | - { - PRIMARY KEY | - UNIQUE | - REFERENCES clause - } - } + CHECK (searchCondition) | + PRIMARY KEY | + UNIQUE | + REFERENCES clause }