henning     2004/10/20 14:43:19

  Modified:    src/generator/src/templates/om Tag: TORQUE_3_1_BRANCH
                        Object.vm ObjectWithManager.vm
               xdocs    Tag: TORQUE_3_1_BRANCH changes.xml
  Log:
  Don't print binary columns. Fixes TRQS231.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.7.2.8   +5 -0      db-torque/src/generator/src/templates/om/Object.vm
  
  Index: Object.vm
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Object.vm,v
  retrieving revision 1.7.2.7
  retrieving revision 1.7.2.8
  diff -u -r1.7.2.7 -r1.7.2.8
  --- Object.vm	20 Oct 2004 21:13:42 -0000	1.7.2.7
  +++ Object.vm	20 Oct 2004 21:43:18 -0000	1.7.2.8
  @@ -1530,7 +1530,12 @@
           str.append("$table.JavaName:\n");
   #foreach ($col in $table.Columns)
           str.append("$col.JavaName = ")
  +  #set ( $cjtype = $col.JavaNative )
  +  #if ( $cjtype == "byte[]" )
  +           .append("<binary>")
  +  #else
              .append(get${col.JavaName}())
  +  #end
              .append("\n");
   #end
           return(str.toString());
  
  
  
  1.5.2.6   +5 -0      db-torque/src/generator/src/templates/om/ObjectWithManager.vm
  
  Index: ObjectWithManager.vm
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/src/templates/om/ObjectWithManager.vm,v
  retrieving revision 1.5.2.5
  retrieving revision 1.5.2.6
  diff -u -r1.5.2.5 -r1.5.2.6
  --- ObjectWithManager.vm	20 Oct 2004 21:13:42 -0000	1.5.2.5
  +++ ObjectWithManager.vm	20 Oct 2004 21:43:18 -0000	1.5.2.6
  @@ -1499,7 +1499,12 @@
           str.append("$table.JavaName:\n");
   #foreach ($col in $table.Columns)
           str.append("$col.JavaName = ")
  +  #set ( $cjtype = $col.JavaNative )
  +  #if ( $cjtype == "byte[]" )
  +           .append("<binary>")
  +  #else
              .append(get${col.JavaName}())
  +  #end
              .append("\n");
   #end
           return(str.toString());
  
  
  
  No                   revision
  No                   revision
  1.140.2.10 +3 -0      db-torque/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
  retrieving revision 1.140.2.9
  retrieving revision 1.140.2.10
  diff -u -r1.140.2.9 -r1.140.2.10
  --- changes.xml	20 Oct 2004 21:13:43 -0000	1.140.2.9
  +++ changes.xml	20 Oct 2004 21:43:18 -0000	1.140.2.10
  @@ -39,6 +39,9 @@
       <action type="update" dev="henning" issue="TRQS237">
         Remove a few unused variables from the generated Object templates.
       </action>
  +    <action type="update" dev="henning" issue="TRQS231">
  +      Do not output binary column when invoking toString() from the generated objects.
  +    </action>
     </release>
     <release version="3.1.1-RC3" date="2004-10-16">
       <action type="update" dev="henning">
  
  
  

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