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 mp...@apache.org on 2003/10/23 13:24:46 UTC

cvs commit: db-torque/src/generator/src/templates/om Control.vm MapBuilder.vm

mpoeschl    2003/10/23 04:24:46

  Modified:    src/generator/src/templates/om Control.vm MapBuilder.vm
  Log:
  replace $dbprops (use platform package)
  
  Revision  Changes    Path
  1.6       +0 -3      db-torque/src/generator/src/templates/om/Control.vm
  
  Index: Control.vm
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/src/templates/om/Control.vm,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Control.vm	5 Oct 2003 14:14:03 -0000	1.5
  +++ Control.vm	23 Oct 2003 11:24:46 -0000	1.6
  @@ -1,9 +1,6 @@
   #set ($basePath = $generator.OutputPath)
   
   targetdatabase = $targetDatabase
  -#set ( $dbprops = $properties.load("sql/base/$targetDatabase/db.props") )
  -dbprops.idMethod = $dbprops.get("idMethod")
  -#include ( "sql/base/$targetDatabase/db.props" )
   
   #foreach ($database in $dataModels)
   
  
  
  
  1.5       +2 -2      db-torque/src/generator/src/templates/om/MapBuilder.vm
  
  Index: MapBuilder.vm
  ===================================================================
  RCS file: /home/cvs/db-torque/src/generator/src/templates/om/MapBuilder.vm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MapBuilder.vm	3 Sep 2003 23:24:05 -0000	1.4
  +++ MapBuilder.vm	23 Oct 2003 11:24:46 -0000	1.5
  @@ -109,9 +109,9 @@
           tMap.setPrimaryKeyMethodInfo("$imp.Value");
   #elseif ($table.IdMethod == "idbroker")
           tMap.setPrimaryKeyMethodInfo(tMap.getName());
  -#elseif ($table.IdMethod == "sequence" ||  ($table.IdMethod == "native" && $dbprops.get("idMethod") == "sequence"))
  +#elseif ($table.IdMethod == "sequence" || ($table.IdMethod == "native" && $table.Database.Platform.NativeIdMethod == "sequence"))
           tMap.setPrimaryKeyMethodInfo("$table.SequenceName");
  -#elseif ($table.IdMethod == "native" && $dbprops.get("idMethod") == "identity")
  +#elseif ($table.IdMethod == "native" && $table.Database.Platform.NativeIdMethod == "identity")
           tMap.setPrimaryKeyMethodInfo("$table.Name");
   #end
   
  
  
  

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