You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by se...@apache.org on 2003/01/28 03:19:43 UTC
cvs commit: jakarta-turbine-torque/src/templates/om ObjectWithManager.vm Object.vm
seade 2003/01/27 18:19:42
Modified: xdocs changes.xml
src/templates/om ObjectWithManager.vm Object.vm
Log:
Fixes a bug that was stopping the join methods from being generated.
PR: TRQS122
Revision Changes Path
1.66 +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.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- changes.xml 22 Jan 2003 21:44:03 -0000 1.65
+++ changes.xml 28 Jan 2003 02:19:42 -0000 1.66
@@ -74,6 +74,9 @@
<li>
TRQS118: Generated OM doesn't compile when using FLOAT as primary key
</li>
+ <li>
+ TRQS122: Join methods are not generated.
+ </li>
</ul>
</p>
</subsection>
1.33 +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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ObjectWithManager.vm 20 Dec 2002 17:20:52 -0000 1.32
+++ ObjectWithManager.vm 28 Jan 2003 02:19:42 -0000 1.33
@@ -656,7 +656,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.58 +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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Object.vm 20 Dec 2002 17:20:52 -0000 1.57
+++ Object.vm 28 Jan 2003 02:19:42 -0000 1.58
@@ -679,7 +679,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) )