cvs commit: jakarta-turbine-torque/src/templates/sql/base/hypersonic db.props

[taylor]

taylor      2002/10/24 10:12:45

  Modified:    src/java/org/apache/torque/adapter DBHypersonicSQL.java
               src/templates/om MapBuilder.vm
               src/templates/sql/base/hypersonic db.props
  Log:
  Updated Hypersonic SQL Adaptor to correctly generate in native mode using identity.
  
  Revision  Changes    Path
  1.8       +6 -3      
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBHypersonicSQL.java
  
  Index: DBHypersonicSQL.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBHypersonicSQL.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DBHypersonicSQL.java      24 Jun 2002 18:12:19 -0000      1.7
  +++ DBHypersonicSQL.java      24 Oct 2002 17:12:45 -0000      1.8
  @@ -102,7 +102,7 @@
        */
       public String getIDMethodType()
       {
  -        return NO_ID_METHOD;
  +        return AUTO_INCREMENT;
       }
   
       /**
  @@ -110,7 +110,10 @@
        */
       public String getIDMethodSQL(Object obj)
       {
  -        return null;
  +        StringBuffer command = new StringBuffer("select IDENTITY() from ");
  +        String qualifiedIdentifier = (String) obj;
  +        command.append(qualifiedIdentifier);
  +        return command.toString();
       }
   
       /**
  
  
  
  1.15      +2 -0      jakarta-turbine-torque/src/templates/om/MapBuilder.vm
  
  Index: MapBuilder.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/templates/om/MapBuilder.vm,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- MapBuilder.vm     10 Sep 2002 19:01:46 -0000      1.14
  +++ MapBuilder.vm     24 Oct 2002 17:12:45 -0000      1.15
  @@ -115,6 +115,8 @@
           tMap.setPrimaryKeyMethodInfo(tMap.getName());
           #elseif ($table.IdMethod == "sequence" ||  ($table.IdMethod == "native" && 
$dbprops.get("idMethod") == "sequence"))
           tMap.setPrimaryKeyMethodInfo("$table.SequenceName");
  +        #elseif ($table.IdMethod == "native" && $dbprops.get("idMethod") == 
"identity")
  +        tMap.setPrimaryKeyMethodInfo("$table.Name");
           #end
   
           #foreach ($col in $table.Columns)
  
  
  
  1.4       +2 -0      
jakarta-turbine-torque/src/templates/sql/base/hypersonic/db.props
  
  Index: db.props
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-torque/src/templates/sql/base/hypersonic/db.props,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- db.props  9 May 2002 16:56:06 -0000       1.3
  +++ db.props  24 Oct 2002 17:12:45 -0000      1.4
  @@ -33,6 +33,8 @@
   AUTOINCREMENT = IDENTITY
   NOTNULL = NOT NULL
   
  +idMethod=identity
  +
   primaryKeyInsideTableDirective = true
   indexInsideTableDirective = false
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:turbine-torque-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:turbine-torque-dev-help@;jakarta.apache.org>