Return-Path:
Mailing-List: contact turbine-torque-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list turbine-torque-dev@jakarta.apache.org
Received: (qmail 3326 invoked by uid 97); 28 Jan 2003 02:12:39 -0000
Received: (qmail 3312 invoked by uid 98); 28 Jan 2003 02:12:38 -0000
X-Antivirus: nagoya (v4218 created Aug 14 2002)
Received: (qmail 2951 invoked from network); 28 Jan 2003 02:12:35 -0000
Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12)
by nagoya.betaversion.org with SMTP; 28 Jan 2003 02:12:35 -0000
Received: (qmail 10007 invoked by uid 500); 28 Jan 2003 02:11:02 -0000
Received: (qmail 10000 invoked from network); 28 Jan 2003 02:11:02 -0000
Received: from icarus.apache.org (208.185.179.13)
by daedalus.apache.org with SMTP; 28 Jan 2003 02:11:02 -0000
Received: (qmail 16007 invoked by uid 1610); 28 Jan 2003 02:11:00 -0000
Date: 28 Jan 2003 02:11:00 -0000
Message-ID: <20030128021100.16002.qmail@icarus.apache.org>
From: seade@apache.org
To: jakarta-turbine-torque-cvs@apache.org
Subject: cvs commit: jakarta-turbine-torque/src/templates/om Object.vm
ObjectWithManager.vm
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
seade 2003/01/27 18:11:00
Modified: xdocs Tag: TORQUE_3_0_BRANCH changes.xml
src/templates/om Tag: TORQUE_3_0_BRANCH Object.vm
ObjectWithManager.vm
Log:
Fixes a bug that was stopping the join methods from being generated.
PR: TRQS122
Revision Changes Path
No revision
No revision
1.54.2.1 +35 -0 jakarta-turbine-torque/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/xdocs/changes.xml,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -u -r1.54 -r1.54.2.1
--- changes.xml 6 Dec 2002 17:35:20 -0000 1.54
+++ changes.xml 28 Jan 2003 02:10:59 -0000 1.54.2.1
@@ -5,9 +5,44 @@
Torque
Martin Poeschl
+ Scott Eade
+
+
+
+ Changes between Torque 3.0 and 3.0.1.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+ TRQS122: Join methods are not generated.
+
+
+
+
+
No revision
No revision
1.54.2.1 +5 -1 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.54
retrieving revision 1.54.2.1
diff -u -r1.54 -r1.54.2.1
--- Object.vm 16 Nov 2002 11:27:50 -0000 1.54
+++ Object.vm 28 Jan 2003 02:10:59 -0000 1.54.2.1
@@ -685,7 +685,11 @@
#end
#set ( $tblFK2 = $table.Database.getTable($fk2.ForeignTableName) )
- #set ( $doJoinGet = !$tblFK2.isForReferenceOnly())
+ #if ($tblFK2.isForReferenceOnly())
+ #set ($doJoinGet = false)
+ #else
+ #set ($doJoinGet = true)
+ #end
#set ( $relatedByCol2 = "" )
#foreach ($columnName in $fk2.LocalColumns)
#set ( $column = $tblFK.getColumn($columnName) )
1.29.2.1 +5 -1 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.29
retrieving revision 1.29.2.1
diff -u -r1.29 -r1.29.2.1
--- ObjectWithManager.vm 16 Nov 2002 11:27:50 -0000 1.29
+++ ObjectWithManager.vm 28 Jan 2003 02:11:00 -0000 1.29.2.1
@@ -662,7 +662,11 @@
#end
#set ( $tblFK2 = $table.Database.getTable($fk2.ForeignTableName) )
- #set ( $doJoinGet = !$tblFK2.isForReferenceOnly())
+ #if ($tblFK2.isForReferenceOnly())
+ #set ($doJoinGet = false)
+ #else
+ #set ($doJoinGet = true)
+ #end
#set ( $relatedByCol2 = "" )
#foreach ($columnName in $fk2.LocalColumns)
#set ( $column = $tblFK.getColumn($columnName) )