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 AF12135EE for ; Mon, 2 May 2011 18:20:11 +0000 (UTC) Received: (qmail 39047 invoked by uid 500); 2 May 2011 18:20:11 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 39015 invoked by uid 500); 2 May 2011 18:20:11 -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 39007 invoked by uid 500); 2 May 2011 18:20:11 -0000 Received: (qmail 39004 invoked by uid 99); 2 May 2011 18:20:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2011 18:20:11 +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; Mon, 02 May 2011 18:20:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7CAFF23888FD; Mon, 2 May 2011 18:19:48 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1098710 - /db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm Date: Mon, 02 May 2011 18:19:48 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110502181948.7CAFF23888FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Mon May 2 18:19:48 2011 New Revision: 1098710 URL: http://svn.apache.org/viewvc?rev=1098710&view=rev Log: fix handling of non-integer number primary keys Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm?rev=1098710&r1=1098709&r2=1098710&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/dbObject/base/primaryKeyMethods.vm Mon May 2 18:19:48 2011 @@ -58,15 +58,19 @@ { #if($columnFieldType == "java.math.BigDecimal") ${setter}(((NumberKey) key).getBigDecimal()); + #elseif ($columnFieldType == "Short") + ${setter}(Short.valueOf(((NumberKey) key).shortValue())); + #elseif ($columnFieldType == "Integer") + ${setter}(Integer.valueOf(((NumberKey) key).intValue())); + #elseif ($columnFieldType == "Long") + ${setter}(Long.valueOf(((NumberKey) key).longValue())); + #elseif ($columnFieldType == "Byte") + ${setter}(Byte.valueOf(((NumberKey) key).byteValue())); #elseif ($number == "true") #if ($primitive == "true") ${setter}(((NumberKey) key).${columnFieldType}Value()); #else - #if ($columnFieldType == "Integer") - #set ( $valueMethod = "intValue") - #else - #set ( $valueMethod = "${columnFieldType.substring(0,1).toLowerCase()}${columnFieldType.substring(1)}Value" ) - #end + #set ( $valueMethod = "${columnFieldType.substring(0,1).toLowerCase()}${columnFieldType.substring(1)}Value" ) ${setter}(new ${columnFieldType}(((NumberKey) key).${valueMethod}())); #end #elseif($columnFieldType == "String") --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org