Return-Path: X-Original-To: apmail-db-torque-dev-archive@www.apache.org Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 182E818D40 for ; Fri, 8 Apr 2016 08:09:43 +0000 (UTC) Received: (qmail 2433 invoked by uid 500); 8 Apr 2016 08:09:42 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 2378 invoked by uid 500); 8 Apr 2016 08:09:42 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 2367 invoked by uid 500); 8 Apr 2016 08:09:42 -0000 Received: (qmail 2364 invoked by uid 99); 8 Apr 2016 08:09:42 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Apr 2016 08:09:42 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id D556AC064A for ; Fri, 8 Apr 2016 08:09:41 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 52-w8IlWbjdK for ; Fri, 8 Apr 2016 08:09:40 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id 8643C5F239 for ; Fri, 8 Apr 2016 08:09:40 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id B7DFDE0098 for ; Fri, 8 Apr 2016 08:09:39 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 5D34D3A0330 for ; Fri, 8 Apr 2016 08:09:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1738219 - in /db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby: foreignKey.groovy foreignKey.vm Date: Fri, 08 Apr 2016 08:09:39 -0000 To: torque-commits@db.apache.org From: tv@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160408080939.5D34D3A0330@svn01-us-west.apache.org> Author: tv Date: Fri Apr 8 08:09:38 2016 New Revision: 1738219 URL: http://svn.apache.org/viewvc?rev=1738219&view=rev Log: Fix foreign key references for Derby Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.groovy db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.vm Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.groovy URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.groovy?rev=1738219&r1=1738218&r2=1738219&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.groovy (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.groovy Fri Apr 8 08:09:38 2016 @@ -30,6 +30,11 @@ if (foreignKey.onUpdate == "setnull") result += """ ON UPDATE SET NULL""" } +else if (foreignKey.onUpdate == "none") +{ + result += """ + ON UPDATE NO ACTION""" +} else if (foreignKey.onUpdate) { result += """ @@ -41,6 +46,12 @@ if (foreignKey.onDelete == "setnull") ON DELETE SET NULL""" } +else if (foreignKey.onDelete == "none") +{ + result += """ + + ON DELETE NO ACTION""" +} else if (foreignKey.onDelete) { result += """ Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.vm?rev=1738219&r1=1738218&r2=1738219&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.vm Fri Apr 8 08:09:38 2016 @@ -21,6 +21,9 @@ ALTER TABLE $torqueGen.getParent().getAt #if ($onUpdate == "setnull") ON UPDATE SET NULL## +#elseif ($onUpdate == "none") + + ON UPDATE NO ACTION## #elseif ($onUpdate) ON UPDATE ${onUpdate.toUpperCase()}## @@ -28,6 +31,9 @@ ALTER TABLE $torqueGen.getParent().getAt #if ($onDelete == "setnull") ON DELETE SET NULL## +#elseif ($onDelete == "none") + + ON DELETE NO ACTION## #elseif ($onDelete) ON DELETE ${onDelete.toUpperCase()}## --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org