From torque-dev-return-11037-apmail-db-torque-dev-archive=db.apache.org@db.apache.org Fri May 4 12:16:42 2012 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 97C84C934 for ; Fri, 4 May 2012 12:16:42 +0000 (UTC) Received: (qmail 66609 invoked by uid 500); 4 May 2012 12:16:41 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 66550 invoked by uid 500); 4 May 2012 12:16:41 -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 66542 invoked by uid 500); 4 May 2012 12:16:41 -0000 Received: (qmail 66538 invoked by uid 99); 4 May 2012 12:16:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 May 2012 12:16:41 +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; Fri, 04 May 2012 12:16:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 68F0C23889B3; Fri, 4 May 2012 12:16:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1333900 - in /db/torque/torque4/trunk: torque-templates/src/main/java/org/apache/torque/templates/transformer/om/ torque-test/src/main/schema/ torque-test/src/test/java/org/apache/torque/generated/peer/ Date: Fri, 04 May 2012 12:16:20 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120504121620.68F0C23889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Fri May 4 12:16:19 2012 New Revision: 1333900 URL: http://svn.apache.org/viewvc?rev=1333900&view=rev Log: TORQUE-142: Use current java date for CURRENT_DATE, CURRENT_TIME and CURRENT_TIMESTAMP default values if useDatabaseDefaultValue is false Added: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValueTest.java Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml Modified: db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java?rev=1333900&r1=1333899&r2=1333900&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java (original) +++ db/torque/torque4/trunk/torque-templates/src/main/java/org/apache/torque/templates/transformer/om/OMColumnTransformer.java Fri May 4 12:16:19 2012 @@ -603,8 +603,11 @@ public class OMColumnTransformer String fieldDefaultValue; if (defaultAttributeValue != null) { + boolean useDatabaseDefaultValue = "true".equals( + columnElement.getAttribute( + TorqueSchemaAttributeName.USE_DATABASE_DEFAULT_VALUE)); fieldDefaultValue = getDefaultValueWithDefaultSet( - javaType, defaultAttributeValue); + javaType, defaultAttributeValue, useDatabaseDefaultValue); } else { @@ -621,12 +624,15 @@ public class OMColumnTransformer * * @param javaType The java type of the column. * @param defaultValue The default value from the schema. + * @param useDatabaseDefaultValue whether the database default value should + * be used. * * @return The java default value. */ protected String getDefaultValueWithDefaultSet( JavaType javaType, - String defaultValue) + String defaultValue, + boolean useDatabaseDefaultValue) { boolean primitiveFieldType = javaType.isPrimitive(); String fieldDefaultValue; @@ -686,7 +692,19 @@ public class OMColumnTransformer || "CURRENT_TIME".equalsIgnoreCase(defaultValue) || "CURRENT_TIMESTAMP".equalsIgnoreCase(defaultValue)) { - fieldDefaultValue = "null"; + if (useDatabaseDefaultValue) + { + // if the database default value is used do not use + // current time in java as it might be different + fieldDefaultValue = "null"; + } + else + { + // the database does not provide a default so use + // java current time. + fieldDefaultValue = "new " + javaType.getFullClassName() + + "()"; + } } else { Modified: db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml?rev=1333900&r1=1333899&r2=1333900&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml Fri May 4 12:16:19 2012 @@ -70,7 +70,7 @@ + description="Table which has a column which uses CURRENT_DATE from the database as default">
+ + + + + +
Added: db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValueTest.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValueTest.java?rev=1333900&view=auto ============================================================================== --- db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValueTest.java (added) +++ db/torque/torque4/trunk/torque-test/src/test/java/org/apache/torque/generated/peer/DefaultValueTest.java Fri May 4 12:16:19 2012 @@ -0,0 +1,84 @@ +package org.apache.torque.generated.peer; + +import java.util.Date; + +import org.apache.torque.BaseDatabaseTestCase; +import org.apache.torque.test.JavaDefaultTable; + +/* + * 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. + */ + +/** + * Tests that the default attribute works for columns. + * + * @version $Id: UseDefaultValueFromDatabaseTest.java 1333015 2012-05-02 12:36:03Z tfischer $ + */ +public class DefaultValueTest extends BaseDatabaseTestCase +{ + /** + * Checks that if CURRENT_DATE is used as default value + * then an object is constructed with current java time. + * + * @throws Exception if an error occurs. + */ + public void testCurrentDateAsJavaDefault() throws Exception + { + Date currentDateBefore = new Date(); + JavaDefaultTable javaDefaultTable + = new JavaDefaultTable(); + Date currentDateAfter = new Date(); + + assertFalse( + "currentDate should be >= currentDateBefore", + javaDefaultTable.getCurrentDateValue().before( + currentDateBefore)); + assertFalse( + "currentDate should be <= currentDateAfter", + javaDefaultTable.getCurrentDateValue().after( + currentDateAfter)); + } + + /** + * Checks that we can set a default value to an Integer column. + * + * @throws Exception if an error occurs. + */ + public void testIntegerDefault() throws Exception + { + JavaDefaultTable javaDefaultTable + = new JavaDefaultTable(); + + assertEquals(27, javaDefaultTable.getIntegerValue()); + } + + /** + * Checks that we can set a default value to an Varchar column. + * + * @throws Exception if an error occurs. + */ + public void testVarcharDefault() throws Exception + { + JavaDefaultTable javaDefaultTable + = new JavaDefaultTable(); + + assertEquals("Default", javaDefaultTable.getVarcharValue()); + } + + +} --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org