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 13AAFE53B for ; Tue, 22 Jan 2013 06:33:32 +0000 (UTC) Received: (qmail 5934 invoked by uid 500); 22 Jan 2013 06:33:31 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 5850 invoked by uid 500); 22 Jan 2013 06:33:31 -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 5828 invoked by uid 500); 22 Jan 2013 06:33:30 -0000 Received: (qmail 5822 invoked by uid 99); 22 Jan 2013 06:33:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Jan 2013 06:33:30 +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; Tue, 22 Jan 2013 06:33:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A19252388A32; Tue, 22 Jan 2013 06:33:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1436761 - in /db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql: outlets/ templates/ddl/ templates/ddl/derby/ templates/ddl/hsqldb/ templates/ddl/mssql/ templates/ddl/mysql/ templates/ddl/oracle/ t... Date: Tue, 22 Jan 2013 06:33:09 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130122063309.A19252388A32@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Tue Jan 22 06:33:08 2013 New Revision: 1436761 URL: http://svn.apache.org/viewvc?rev=1436761&view=rev Log: TORQUE-256: Drop schema missing for create schema TORQUE-255: onDelete="setnull" not working Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/dropDatabaseSchema.vm Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/foreignKey.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/foreignKey.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/foreignKey.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/foreignKey.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/foreignKey.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/foreignKey.vm Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml?rev=1436761&r1=1436760&r2=1436761&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/outlets/ddl.xml Tue Jan 22 06:33:08 2013 @@ -38,6 +38,9 @@ + + + + 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=1436761&r1=1436760&r2=1436761&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 Tue Jan 22 06:33:08 2013 @@ -18,12 +18,18 @@ ALTER TABLE $torqueGen.getParent().getAt ADD CONSTRAINT $name FOREIGN KEY ($localColumnNames) REFERENCES $foreignTable ($foreignColumnNames)## -#if ($onUpdate) +#if ($onUpdate == "setnull") - ON UPDATE $onUpdate## + ON UPDATE SET NULL## +#elseif ($onUpdate) + + ON UPDATE ${onUpdate.toUpperCase()}## #end -#if ($onDelete) +#if ($onDelete == "setnull") + + ON DELETE SET NULL## +#elseif ($onDelete) - ON DELETE $onDelete## + ON DELETE ${onDelete.toUpperCase()}## #end ; Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/dropDatabaseSchema.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/dropDatabaseSchema.vm?rev=1436761&view=auto ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/dropDatabaseSchema.vm (added) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/dropDatabaseSchema.vm Tue Jan 22 06:33:08 2013 @@ -0,0 +1,19 @@ +## Licensed to the Apache Software Foundation (ASF) under one +## or more contributor license agreements. See the NOTICE file +## distributed with this work for additional information +## regarding copyright ownership. The ASF licenses this file +## to you under the Apache License, Version 2.0 (the +## "License"); you may not use this file except in compliance +## with the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, +## software distributed under the License is distributed on an +## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +## KIND, either express or implied. See the License for the +## specific language governing permissions and limitations +## under the License. +## + +DROP SCHEMA ${name}; Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/foreignKey.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/foreignKey.vm?rev=1436761&r1=1436760&r2=1436761&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/foreignKey.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/hsqldb/foreignKey.vm Tue Jan 22 06:33:08 2013 @@ -18,12 +18,18 @@ ALTER TABLE $torqueGen.getParent().getAt ADD CONSTRAINT $name FOREIGN KEY ($localColumnNames) REFERENCES $foreignTable ($foreignColumnNames)## -#if ($onUpdate) +#if ($onUpdate == "setnull") - ON UPDATE $onUpdate## + ON UPDATE SET NULL## +#elseif ($onUpdate) + + ON UPDATE ${onUpdate.toUpperCase()}## #end -#if ($onDelete) +#if ($onDelete == "setnull") + + ON DELETE SET NULL## +#elseif ($onDelete) - ON DELETE $onDelete## + ON DELETE ${onDelete.toUpperCase()}## #end ; Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/foreignKey.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/foreignKey.vm?rev=1436761&r1=1436760&r2=1436761&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/foreignKey.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/foreignKey.vm Tue Jan 22 06:33:08 2013 @@ -20,13 +20,19 @@ ALTER TABLE $tableName ADD CONSTRAINT $name FOREIGN KEY ($localColumnNames) REFERENCES $foreignTable ($foreignColumnNames)## -#if ($onUpdate) +#if ($onUpdate == "setnull") - ON UPDATE $onUpdate + ON UPDATE SET NULL## +#elseif ($onUpdate) + + ON UPDATE ${onUpdate.toUpperCase()}## #end -#if ($onDelete) +#if ($onDelete == "setnull") + + ON DELETE SET NULL## +#elseif ($onDelete) - ON DELETE $onDelete + ON DELETE ${onDelete.toUpperCase()}## #end END ; Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/foreignKey.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/foreignKey.vm?rev=1436761&r1=1436760&r2=1436761&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/foreignKey.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/foreignKey.vm Tue Jan 22 06:33:08 2013 @@ -18,13 +18,19 @@ ALTER TABLE $torqueGen.getParent().getAt ADD CONSTRAINT $name FOREIGN KEY ($localColumnNames) REFERENCES $foreignTable ($foreignColumnNames)## -#if ($onUpdate) +#if ($onUpdate == "setnull") - ON UPDATE $onUpdate## + ON UPDATE SET NULL## +#elseif ($onUpdate) + + ON UPDATE ${onUpdate.toUpperCase()}## #end -#if ($onDelete) +#if ($onDelete == "setnull") + + ON DELETE SET NULL## +#elseif ($onDelete) - ON DELETE $onDelete## + ON DELETE ${onDelete.toUpperCase()}## #end ; Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/foreignKey.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/foreignKey.vm?rev=1436761&r1=1436760&r2=1436761&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/foreignKey.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/foreignKey.vm Tue Jan 22 06:33:08 2013 @@ -18,15 +18,18 @@ ALTER TABLE $torqueGen.getParent().getAt ADD CONSTRAINT $name FOREIGN KEY ($localColumnNames) REFERENCES $foreignTable ($foreignColumnNames)## -#if ($onUpdate && !$onUpdate.equalsIgnoreCase("cascade")) +#if ($onUpdate == "setnull") - ON UPDATE $onUpdate## + ON UPDATE SET NULL## +#elseif ($onUpdate) + + ON UPDATE ${onUpdate.toUpperCase()}## #end -#if ($onDelete) - #if ( $onDelete.equalsIgnoreCase("setnull") ) - #set( $onDelete = "SET NULL" ) - #end +#if ($onDelete == "setnull") + + ON DELETE SET NULL## +#elseif ($onDelete) - ON DELETE $onDelete## + ON DELETE ${onDelete.toUpperCase()}## #end ; Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/foreignKey.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/foreignKey.vm?rev=1436761&r1=1436760&r2=1436761&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/foreignKey.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/foreignKey.vm Tue Jan 22 06:33:08 2013 @@ -18,12 +18,18 @@ ALTER TABLE $torqueGen.getParent().getAt ADD CONSTRAINT $name FOREIGN KEY ($localColumnNames) REFERENCES $foreignTable ($foreignColumnNames)## -#if ($onUpdate) +#if ($onUpdate == "setnull") - ON UPDATE $onUpdate## + ON UPDATE SET NULL## +#elseif ($onUpdate) + + ON UPDATE ${onUpdate.toUpperCase()}## #end -#if ($onDelete) +#if ($onDelete == "setnull") + + ON DELETE SET NULL## +#elseif ($onDelete) - ON DELETE $onDelete## + ON DELETE ${onDelete.toUpperCase()}## #end ; --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org