You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by br...@apache.org on 2001/10/24 03:19:55 UTC

cvs commit: jakarta-turbine-torque/src/templates/sql/base/sybase columns.vm

brekke      01/10/23 18:19:55

  Modified:    src/templates/om Object.vm
               src/templates/sql/base/sybase columns.vm
  Log:
  Forward porting some small fixes from jakarta-turbine-2: a misspelling in
  sybase's columns.vm and Object.vm's copy() will not copy the collections
  properly when isNew() is true, so we make it false, do the copy, and put it
  back to true.
  
  Revision  Changes    Path
  1.8       +3 -2      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Object.vm	2001/10/22 23:05:59	1.7
  +++ Object.vm	2001/10/24 01:19:55	1.8
  @@ -1119,7 +1119,7 @@
   #end 
   
   #if ($complexObjectModel)
  -
  +  copyObj.setNew(false);
     #set ( $list = "List " )
     #foreach ($fk in $table.Referrers)
       #set ( $tblFK = $fk.Table )
  @@ -1146,7 +1146,8 @@
            }
           #set ( $list = "" )
       #end
  -  #end 
  +  #end
  +  copyObj.setNew(true);
   #end
   
   #foreach ($col in $table.Columns)
  
  
  
  1.2       +1 -1      jakarta-turbine-torque/src/templates/sql/base/sybase/columns.vm
  
  Index: columns.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/templates/sql/base/sybase/columns.vm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- columns.vm	2001/08/02 05:08:40	1.1
  +++ columns.vm	2001/10/24 01:19:55	1.2
  @@ -1,7 +1,7 @@
   #foreach ($col in $table.Columns)
       #set ( $type = $dbprops.get($col.Type) )
       #set ( $size = $col.printSize() )
  -    #if ( $dbprops.get("supressDefaults") == "true" )
  +    #if ( $dbprops.get("suppressDefaults") == "true" )
           #set ( $default = "" )
       #else
           #set ( $default = $col.DefaultSetting )
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org