You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jm...@apache.org on 2001/05/09 02:09:00 UTC

cvs commit: jakarta-turbine/conf/torque/templates/om Object.vm Peer.vm

jmcnally    01/05/08 17:09:00

  Modified:    conf/torque/templates/om Object.vm Peer.vm
  Log:
  Added a save(String dbName) method to Object.vm to allow an object to persist in a
  database only known at runtime.
  
  wrapped criteria.setDbName in an #if clause, in the event the dbName is only
  known at runtime
  
  Revision  Changes    Path
  1.54      +41 -8     jakarta-turbine/conf/torque/templates/om/Object.vm
  
  Index: Object.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/conf/torque/templates/om/Object.vm,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- Object.vm	2001/04/24 21:06:12	1.53
  +++ Object.vm	2001/05/09 00:08:59	1.54
  @@ -783,12 +783,35 @@
       public void save() throws Exception
       {
    #if ($complexObjectModel)
  +            save(${table.JavaName}Peer.getMapBuilder()
  +                .getDatabaseMap().getName());
  + #else
  +        if (isModified())
  +        {
  +            if (isNew())
  +            {
  +                ${table.JavaName}Peer.doInsert(($table.JavaName)this);
  +                setNew(false);
  +            }
  +            else
  +            {
  +                ${table.JavaName}Peer.doUpdate(($table.JavaName)this);
  +            }
  +        }
  + #end
  +    }
  +
  +    /**
  +     * Stores the object in the database.  If the object is new,
  +     * it inserts it; otherwise an update is performed.
  +     */
  +    public void save(String dbName) throws Exception
  +    {
           DBConnection dbCon = null;
  + #if ($complexObjectModel)
           try
           {
  -            dbCon = BasePeer.beginTransaction(
  -                ${table.JavaName}Peer.getMapBuilder()
  -                .getDatabaseMap().getName());
  +            dbCon = BasePeer.beginTransaction(dbName);
               save(dbCon);
           }
           catch(Exception e)
  @@ -802,14 +825,24 @@
   
           if (isModified())
           {
  -            if (isNew())
  +            try
               {
  -                ${table.JavaName}Peer.doInsert(($table.JavaName)this);
  -                setNew(false);
  +                dbCon = TurbineDB.getConnection( dbName );
  +                if (isNew())
  +                {
  +                    ${table.JavaName}Peer
  +                        .doInsert(($table.JavaName)this, dbCon);
  +                    setNew(false);
  +                }
  +                else
  +                {
  +                    ${table.JavaName}Peer
  +                        .doUpdate(($table.JavaName)this, dbCon);
  +                }
               }
  -            else
  +            finally
               {
  -                ${table.JavaName}Peer.doUpdate(($table.JavaName)this);
  +                TurbineDB.releaseConnection(dbCon);
               }
           }
         
  
  
  
  1.54      +20 -3     jakarta-turbine/conf/torque/templates/om/Peer.vm
  
  Index: Peer.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/conf/torque/templates/om/Peer.vm,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- Peer.vm	2001/05/04 01:50:48	1.53
  +++ Peer.vm	2001/05/09 00:08:59	1.54
  @@ -169,7 +169,9 @@
       /** Method to do inserts */
       public static ObjectKey doInsert( Criteria criteria ) throws Exception
       {
  +    #if ($table.Database.Name != "default")
           criteria.setDbName(mapBuilder.getDatabaseMap().getName());
  +    #end
        #foreach ($col in $table.Columns)
            #set ( $cup=$col.Name.toUpperCase() )
            #if($col.isBooleanInt())
  @@ -219,7 +221,9 @@
       public static ObjectKey doInsert( Criteria criteria, DBConnection dbCon ) 
           throws Exception
       {
  +    #if ($table.Database.Name != "default")
           criteria.setDbName(mapBuilder.getDatabaseMap().getName());
  +    #end
        #foreach ($col in $table.Columns)
            #set ( $cup=$col.Name.toUpperCase() )
            #if($col.isBooleanInt())
  @@ -348,7 +352,9 @@
       public static Vector doSelectVillageRecords( Criteria criteria ) 
           throws Exception
       {
  +    #if ($table.Database.Name != "default")
           criteria.setDbName(mapBuilder.getDatabaseMap().getName());
  +    #end
           if (criteria.getSelectColumns().size() == 0)
           {
               addSelectColumns ( criteria );
  @@ -407,7 +413,10 @@
                                                    DBConnection dbCon ) 
           throws Exception
       {
  -        addSelectColumns ( criteria );
  +        if (criteria.getSelectColumns().size() == 0)
  +        {
  +            addSelectColumns ( criteria );
  +        }
   
        #foreach ($col in $table.Columns)
            #set ( $cup=$col.Name.toUpperCase() )
  @@ -524,7 +533,9 @@
        */
       public static void doUpdate(Criteria criteria) throws Exception
       {
  +    #if ($table.Database.Name != "default")
           criteria.setDbName(mapBuilder.getDatabaseMap().getName());
  +    #end
           Criteria selectCriteria = new
               Criteria(mapBuilder.getDatabaseMap().getName(), 2);
        #foreach ($col in $table.Columns)
  @@ -580,7 +591,9 @@
        */
       public static void doUpdate(Criteria criteria, DBConnection dbCon) throws Exception
       {
  +    #if ($table.Database.Name != "default")
           criteria.setDbName(mapBuilder.getDatabaseMap().getName());
  +    #end
           Criteria selectCriteria = new
               Criteria(mapBuilder.getDatabaseMap().getName(), 2);
        #foreach ($col in $table.Columns)
  @@ -634,7 +647,9 @@
        */
        public static void doDelete(Criteria criteria) throws Exception
        {
  -         criteria.setDbName(mapBuilder.getDatabaseMap().getName());
  +    #if ($table.Database.Name != "default")
  +        criteria.setDbName(mapBuilder.getDatabaseMap().getName());
  +    #end
        #foreach ($col in $table.Columns)
            #set ( $cup=$col.Name.toUpperCase() )
            #if($col.isBooleanInt())
  @@ -685,7 +700,9 @@
        */
        public static void doDelete(Criteria criteria, DBConnection dbCon) throws Exception
        {
  -         criteria.setDbName(mapBuilder.getDatabaseMap().getName());
  +    #if ($table.Database.Name != "default")
  +        criteria.setDbName(mapBuilder.getDatabaseMap().getName());
  +    #end
        #foreach ($col in $table.Columns)
            #set ( $cup=$col.Name.toUpperCase() )
            #if($col.isBooleanInt())
  
  
  

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