Return-Path: Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: (qmail 18862 invoked from network); 2 Feb 2007 21:52:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Feb 2007 21:52:27 -0000 Received: (qmail 21999 invoked by uid 500); 2 Feb 2007 21:52:33 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 21976 invoked by uid 500); 2 Feb 2007 21:52:33 -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 21965 invoked by uid 500); 2 Feb 2007 21:52:33 -0000 Received: (qmail 21961 invoked by uid 99); 2 Feb 2007 21:52:33 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Feb 2007 13:52:33 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Feb 2007 13:52:26 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 7F3F81A981A; Fri, 2 Feb 2007 13:52:06 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r502761 - in /db/torque: generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java site/trunk/xdocs/changes.xml Date: Fri, 02 Feb 2007 21:52:06 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070202215206.7F3F81A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Fri Feb 2 13:52:05 2007 New Revision: 502761 URL: http://svn.apache.org/viewvc?view=rev&rev=502761 Log: In the JDBCTransformTask in the generator, only add the attribute "default" to the column description in the generated schema if its value is not empty. Fixes TORQUE-80 Thanks to Brian Telintelo for the patch. Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java db/torque/site/trunk/xdocs/changes.xml Modified: db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java?view=diff&rev=502761&r1=502760&r2=502761 ============================================================================== --- db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java (original) +++ db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java Fri Feb 2 13:52:05 2007 @@ -33,6 +33,7 @@ import java.util.Iterator; import java.util.List; +import org.apache.commons.lang.StringUtils; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; @@ -304,7 +305,7 @@ column.setAttribute("primaryKey", "true"); } - if (defValue != null) + if (StringUtils.isNotEmpty(defValue)) { // trim out parens & quotes out of def value. // makes sense for MSSQL. not sure about others. Modified: db/torque/site/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/db/torque/site/trunk/xdocs/changes.xml?view=diff&rev=502761&r1=502760&r2=502761 ============================================================================== --- db/torque/site/trunk/xdocs/changes.xml (original) +++ db/torque/site/trunk/xdocs/changes.xml Fri Feb 2 13:52:05 2007 @@ -32,6 +32,11 @@ + + In the JdbcTransformTask of the generator, the attribute + "default&qout; is only aded to the generated schema if its value + is not empty. + Added check whether Torque is initialized in Torque.getConnection(). If Torque is not initialized, a corresponding TorqueException is thrown; --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org