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:11:00 UTC

cvs commit: jakarta-turbine-torque/src/templates/om Object.vm ObjectWithManager.vm

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 @@
     <properties>
       <title>Torque</title>
       <author email="mpoeschl@marmot.at">Martin Poeschl</author>
  +    <author email="seade@backstagetech.com.au">Scott Eade</author>
     </properties>
   
     <body>
  +
  +<section name="Torque 3.0.1">
  +<p>
  +  Changes between Torque 3.0 and 3.0.1.<br/>
  +</p>
  +
  +<subsection name="Changes that could (will) break older environments">
  +<p>
  +  <ul>
  +    <li>
  +    </li>
  +  </ul>
  +</p>
  +</subsection>
  +
  +<subsection name="Other changes">
  +<p>
  +  <ul>
  +    <li>
  +    </li>
  +  </ul>
  +</p>
  +</subsection>
  +
  +<subsection name="Fixed bugs">
  +<p>
  +  <ul>
  +    <li>
  +      TRQS122: Join methods are not generated.
  +    </li>
  +  </ul>
  +</p>
  +</subsection>
  +</section>
   
   <section name="Torque 3.0">
   <p>
  
  
  
  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) )