mpoeschl 2002/12/20 09:20:53
Modified: src/templates/om Object.vm ObjectWithManager.vm
xdocs changes.xml
Added: src/rttest/org/apache/torque/util CopyTest.java
Log:
TRQS47: bug in torque generated copy() method
Revision Changes Path
1.1
jakarta-turbine-torque/src/rttest/org/apache/torque/util/CopyTest.java
Index: CopyTest.java
===================================================================
package org.apache.torque.util;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import org.apache.log4j.Category;
import org.apache.torque.BaseTestCase;
import org.apache.torque.test.Author;
import org.apache.torque.test.AuthorPeer;
import org.apache.torque.test.Book;
/**
* Test code for TorqueObject.copy().
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Maczewski</a>
* @version $Id $
*/
public class CopyTest extends BaseTestCase
{
/**
* Creates a new instance.
*/
public CopyTest(String name)
{
super(name);
}
public void setUp()
{
super.setUp();
}
/**
* does some inserts.
*/
public void testCopyObject() throws Exception
{
Author author = new Author();
author.setName("Author to be copied");
author.save();
for (int j = 1; j <= 10; j++)
{
Book book = new Book();
book.setAuthor(author);
book.setTitle("Book " + j + " - " + author.getName());
book.setIsbn("unknown");
book.save();
}
assertTrue("Number of books before copy should be 10, was "
+ author.getBooks().size(), author.getBooks().size() == 10);
Author authorCopy = author.copy();
authorCopy.save();
author = AuthorPeer.retrieveByPK(author.getPrimaryKey());
assertTrue("Number of books in original object should be 10, was "
+ author.getBooks().size(), author.getBooks().size() == 10);
assertTrue("Number of books after copy should be 10, was "
+ author.getBooks().size(), authorCopy.getBooks().size() == 10);
}
}
1.57 +15 -16 jakarta-turbine-torque/src/templates/om/Object.vm
Index: Object.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/Object.vm,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- Object.vm 18 Dec 2002 13:56:03 -0000 1.56
+++ Object.vm 20 Dec 2002 17:20:52 -0000 1.57
@@ -1420,8 +1420,22 @@
copyObj.set${col.JavaName}($col.Name.toLowerCase());
#end
+#foreach ($col in $table.Columns)
+ #if ($col.isPrimaryKey())
+ #if($col.Primitive)
+ #set ($coldefval = "0")
+ #set ($coldefval = $col.DefaultValue)
+ copyObj.set${col.JavaName}($coldefval);
+ #else
+ #set ( $pkid = "null" )
+ #set ( $cjtype = $col.JavaNative )
+ copyObj.set${col.JavaName}((${cjtype})${pkid});
+ #end
+ #end
+#end
+
+
#if ($complexObjectModel)
- copyObj.setNew(false);
#set ( $list = "List " )
#foreach ($fk in $table.Referrers)
#set ( $tblFK = $fk.Table )
@@ -1448,27 +1462,12 @@
{
$className obj = ($className) v.get(i);
copyObj.add$pCollNameNoS(obj.copy());
- ((Persistent) v.get(i)).setNew(true);
}
#set ( $list = "" )
#end
#end
- copyObj.setNew(true);
#end
-#foreach ($col in $table.Columns)
- #if ($col.isPrimaryKey())
- #if($col.Primitive)
- #set ($coldefval = "0")
- #set ($coldefval = $col.DefaultValue)
- copyObj.set${col.JavaName}($coldefval);
- #else
- #set ( $pkid = "null" )
- #set ( $cjtype = $col.JavaNative )
- copyObj.set${col.JavaName}((${cjtype})${pkid});
- #end
- #end
-#end
return copyObj;
}
#end
1.32 +15 -18 jakarta-turbine-torque/src/templates/om/ObjectWithManager.vm
Index: ObjectWithManager.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/ObjectWithManager.vm,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ObjectWithManager.vm 18 Dec 2002 13:56:04 -0000 1.31
+++ ObjectWithManager.vm 20 Dec 2002 17:20:52 -0000 1.32
@@ -1377,8 +1377,7 @@
* Makes a copy of this object.
* It creates a new object filling in the simple attributes.
#if ($complexObjectModel)
- * It then fills all the association collections and sets the
- * related objects to isNew=true.
+ * It then fills all the association collections.
#end
*/
#if ($table.ChildrenColumn || $table.isAbstract())
@@ -1393,8 +1392,21 @@
copyObj.set${col.JavaName}($col.Name.toLowerCase());
#end
+#foreach ($col in $table.Columns)
+ #if ($col.isPrimaryKey())
+ #if($col.Primitive)
+ #set ($coldefval = "0")
+ #set ($coldefval = $col.DefaultValue)
+ copyObj.set${col.JavaName}($coldefval);
+ #else
+ #set ( $pkid = "null" )
+ #set ( $cjtype = $col.JavaNative )
+ copyObj.set${col.JavaName}((${cjtype})${pkid});
+ #end
+ #end
+#end
+
#if ($complexObjectModel)
- copyObj.setNew(false);
#set ( $list = "List " )
#foreach ($fk in $table.Referrers)
#set ( $tblFK = $fk.Table )
@@ -1421,27 +1433,12 @@
{
$className obj = ($className) v.get(i);
copyObj.add$pCollNameNoS(obj.copy());
- ((Persistent)v.get(i)).setNew(true);
}
#set ( $list = "" )
#end
#end
- copyObj.setNew(true);
#end
-#foreach ($col in $table.Columns)
- #if ($col.isPrimaryKey())
- #if($col.Primitive)
- #set ($coldefval = "0")
- #set ($coldefval = $col.DefaultValue)
- copyObj.set${col.JavaName}($coldefval);
- #else
- #set ( $pkid = "null" )
- #set ( $cjtype = $col.JavaNative )
- copyObj.set${col.JavaName}((${cjtype})${pkid});
- #end
- #end
-#end
return copyObj;
}
#end
1.61 +3 -0 jakarta-turbine-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/xdocs/changes.xml,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- changes.xml 20 Dec 2002 16:39:21 -0000 1.60
+++ changes.xml 20 Dec 2002 17:20:53 -0000 1.61
@@ -53,6 +53,9 @@
TRQS29, TRQS93: fix endless loop in Monitor
</li>
<li>
+ TRQS47: bug in torque generated copy() method
+ </li>
+ <li>
TRQS90: SQLScanner reports wrong line numbers in Window platforms and
behaves incorrectly when finding the minus sign
</li>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
