Return-Path: Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: (qmail 8989 invoked from network); 10 Sep 2010 04:12:40 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 10 Sep 2010 04:12:40 -0000 Received: (qmail 59498 invoked by uid 500); 10 Sep 2010 04:12:40 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 59407 invoked by uid 500); 10 Sep 2010 04:12:39 -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 59399 invoked by uid 500); 10 Sep 2010 04:12:38 -0000 Received: (qmail 59394 invoked by uid 99); 10 Sep 2010 04:12:38 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Sep 2010 04:12:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 10 Sep 2010 04:12:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6B605238890A; Fri, 10 Sep 2010 04:11:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r995662 - in /db/torque/torque4/trunk: torque-site/src/changes/ torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/ torque-templates/src/main/resources/org/apache/torque/templates/xsd/ Date: Fri, 10 Sep 2010 04:11:59 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100910041159.6B605238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Fri Sep 10 04:11:58 2010 New Revision: 995662 URL: http://svn.apache.org/viewvc?rev=995662&view=rev Log: TORQUE-131: Remove support for value 'none' of the onUpdate and onDelete attributes of the foreign-key element in the schema XML. Modified: db/torque/torque4/trunk/torque-site/src/changes/changes.xml db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd Modified: db/torque/torque4/trunk/torque-site/src/changes/changes.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-site/src/changes/changes.xml?rev=995662&r1=995661&r2=995662&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-site/src/changes/changes.xml (original) +++ db/torque/torque4/trunk/torque-site/src/changes/changes.xml Fri Sep 10 04:11:58 2010 @@ -24,6 +24,12 @@ + + Remove support for value 'none' of the onUpdate and onDelete attributes + of the foreign-key element in the schema XML. + Users who have used this value in old schema XMLs, simply remove + the attribute. + Remove the heavyIndexing attribute for the elements table and database in schema XML files. Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java?rev=995662&r1=995661&r2=995662&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/sql/SQLTransformer.java Fri Sep 10 04:11:58 2010 @@ -350,25 +350,6 @@ public class SQLTransformer implements S int fkIndex) throws SourceTransformerException { - // TODO: the 3.3 schema specifies "none" as default value - // for the attributes onUpdate and onDelete. - // This is equivalent to null. This code can be removed - // once the schema/dtd is updated - if ("none".equals(foreignKeyElement.getAttribute( - TorqueSchemaAttributeName.ON_UPDATE.getName()))) - { - foreignKeyElement.setAttribute( - TorqueSchemaAttributeName.ON_UPDATE.getName(), - null); - } - if ("none".equals(foreignKeyElement.getAttribute( - TorqueSchemaAttributeName.ON_DELETE.getName()))) - { - foreignKeyElement.setAttribute( - TorqueSchemaAttributeName.ON_DELETE.getName(), - null); - } - if (foreignKeyElement.getAttribute( TorqueSchemaAttributeName.NAME.getName()) == null) Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd?rev=995662&r1=995661&r2=995662&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd Fri Sep 10 04:11:58 2010 @@ -654,8 +654,7 @@ The name of the table that contains the - + The action to take when the referenced value in foreignTable is deleted. @@ -664,8 +663,7 @@ work if the DB server does not support t - + The action to take when the referenced value in foreignTable is updated. @@ -906,7 +904,6 @@ null = Use the value previously se - --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org