Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm?rev=1056910&r1=1056909&r2=1056910&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/base/retrieveByPK.vm Sun Jan 9 10:38:22 2011 @@ -31,7 +31,7 @@ #if (!$primaryKeyColumnElements.isEmpty()) #if ($primaryKeyColumnElements.size() == 1) #set ( $columnElement = $primaryKeyColumnElements.get(0) ) - #set ( $fieldType = $columnElement.getAttribute("fieldType")) + #set ( $columnFieldType = $columnElement.getAttribute("fieldType")) /** * Retrieve a single object by pk * @@ -41,7 +41,7 @@ * @throws NoRowsException Primary key was not found in database. * @throws TooManyRowsException Primary key was not found in database. */ - public static $dbObjectClassName retrieveByPK($fieldType pk) + public static $dbObjectClassName retrieveByPK($columnFieldType pk) throws TorqueException, NoRowsException, TooManyRowsException { return ${peerClassName}.retrieveByPK(SimpleKey.keyFor(pk)); @@ -57,7 +57,7 @@ * @throws NoRowsException Primary key was not found in database. * @throws TooManyRowsException Primary key was not found in database. */ - public static $dbObjectClassName retrieveByPK($fieldType pk, Connection con) + public static $dbObjectClassName retrieveByPK($columnFieldType pk, Connection con) throws TorqueException, NoRowsException, TooManyRowsException { return ${peerClassName}.retrieveByPK(SimpleKey.keyFor(pk), con); @@ -70,17 +70,17 @@ * retrieve object using using pk values. * #foreach ($columnElement in $primaryKeyColumnElements) - #set ( $field = $columnElement.getAttribute("field") ) - #set ( $fieldType = $columnElement.getAttribute("fieldType") ) - * @param $field $fieldType + #set ( $columnField = $columnElement.getAttribute("field") ) + #set ( $columnFieldType = $columnElement.getAttribute("fieldType") ) + * @param $columnField $columnFieldType #end */ public static $dbObjectClassName retrieveByPK( #set ( $elementCount = 1 ) #foreach ($columnElement in $primaryKeyColumnElements) - #set ( $field = $columnElement.getAttribute("field") ) - #set ( $fieldType = $columnElement.getAttribute("fieldType") ) - $fieldType $field#if($elementCount != $primaryKeyColumnElements.size()),#else)#end + #set ( $columnField = $columnElement.getAttribute("field") ) + #set ( $columnFieldType = $columnElement.getAttribute("fieldType") ) + $columnFieldType $columnField#if($elementCount != $primaryKeyColumnElements.size()),#else)#end #set ( $elementCount = $elementCount + 1 ) #end @@ -93,8 +93,8 @@ db = Torque.getConnection(DATABASE_NAME); retVal = retrieveByPK( #foreach ($columnElement in $primaryKeyColumnElements) - #set ( $field = $columnElement.getAttribute("field") ) - ${field}, + #set ( $columnField = $columnElement.getAttribute("field") ) + ${columnField}, #end db); } @@ -109,26 +109,26 @@ * retrieve object using using pk values. * #foreach ($columnElement in $primaryKeyColumnElements) - #set ( $field = $columnElement.getAttribute("field") ) - #set ( $fieldType = $columnElement.getAttribute("fieldType") ) - * @param $field $fieldType + #set ( $columnField = $columnElement.getAttribute("field") ) + #set ( $columnFieldType = $columnElement.getAttribute("fieldType") ) + * @param $columnField $columnFieldType #end * @param con Connection */ public static $dbObjectClassName retrieveByPK( #foreach ($columnElement in $primaryKeyColumnElements) - #set ( $field = $columnElement.getAttribute("field") ) - #set ( $fieldType = $columnElement.getAttribute("fieldType") ) - $fieldType ${field}, + #set ( $columnField = $columnElement.getAttribute("field") ) + #set ( $columnFieldType = $columnElement.getAttribute("fieldType") ) + $columnFieldType ${columnField}, #end Connection con) throws TorqueException { Criteria criteria = new Criteria(5); #foreach ($columnElement in $primaryKeyColumnElements) - #set ( $field = $columnElement.getAttribute("field") ) + #set ( $columnField = $columnElement.getAttribute("field") ) #set ( $peerColumnName = $columnElement.getAttribute("peerColumnName") ) - criteria.add($peerColumnName, $field); + criteria.add($peerColumnName, $columnField); #end List<${dbObjectClassName}> v = doSelect(criteria, con); if (v.size() == 1)
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/table.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/table.vm?rev=1056910&r1=1056909&r2=1056910&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/table.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/derby/table.vm Sun Jan 9 10:38:22 2011 @@ -18,7 +18,6 @@ -- ----------------------------------------------------------------------- -- $name -- ----------------------------------------------------------------------- -$torqueGen.mergepoint("drop") CREATE TABLE $name ( #set ( $cols = $torqueGen.mergepoint("columns") ) Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/table.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/table.vm?rev=1056910&r1=1056909&r2=1056910&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/table.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mssql/table.vm Sun Jan 9 10:38:22 2011 @@ -18,7 +18,6 @@ /* ---------------------------------------------------------------------- */ /* $name */ /* ---------------------------------------------------------------------- */ -$torqueGen.mergepoint("drop") CREATE TABLE $name ( #set ( $cols = $torqueGen.mergepoint("columns") ) Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/table.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/table.vm?rev=1056910&r1=1056909&r2=1056910&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/table.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/mysql/table.vm Sun Jan 9 10:38:22 2011 @@ -18,7 +18,6 @@ # ----------------------------------------------------------------------- # $name # ----------------------------------------------------------------------- -$torqueGen.mergepoint("drop") CREATE TABLE $name ( #set ( $cols = $torqueGen.mergepoint("columns") ) Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/table.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/table.vm?rev=1056910&r1=1056909&r2=1056910&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/table.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/oracle/table.vm Sun Jan 9 10:38:22 2011 @@ -18,7 +18,6 @@ ----------------------------------------------------------------------------- -- $name ----------------------------------------------------------------------------- -$torqueGen.mergepoint("drop") CREATE TABLE $name ( #set ( $cols = $torqueGen.mergepoint("columns") ) Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/table.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/table.vm?rev=1056910&r1=1056909&r2=1056910&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/table.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/templates/ddl/postgresql/table.vm Sun Jan 9 10:38:22 2011 @@ -18,8 +18,6 @@ ----------------------------------------------------------------------------- -- $name ----------------------------------------------------------------------------- -$torqueGen.mergepoint("drop") - CREATE TABLE $name ( #set ( $cols = $torqueGen.mergepoint("columns") ) Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/transformer/om/OMTableTransformer.properties URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/transformer/om/OMTableTransformer.properties?rev=1056910&r1=1056909&r2=1056910&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/transformer/om/OMTableTransformer.properties (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/transformer/om/OMTableTransformer.properties Sun Jan 9 10:38:22 2011 @@ -22,6 +22,7 @@ ${attribute(noOverride):basePeerClassNam ${attribute(noOverride):beanClassName}=${option:torque.om.className.beanClassNamePrefix}${attribute:javaName}${option:torque.om.className.beanClassNameSuffix} ${attribute(noOverride):baseBeanClassName}=${option:torque.om.className.baseBeanClassNamePrefix}${attribute:javaName}${option:torque.om.className.baseBeanClassNameSuffix} ${attribute(noOverride):mapBuilderClassName}=${option:torque.om.className.mapBuilderClassNamePrefix}${attribute:javaName}${option:torque.om.className.mapBuilderClassNameSuffix} +${attribute(noOverride):recordMapperClass}=${option:torque.om.className.recordMapperClassNamePrefix}${attribute:javaName}${option:torque.om.className.recordMapperClassNameSuffix} ${attribute(noOverride):dbObjectPackage}=${option:torque.om.package.package}${option:torque.om.package.dbObjectPackageSuffix} ${attribute(noOverride):baseDbObjectPackage}=${option:torque.om.package.package}${option:torque.om.package.baseDbObjectPackageSuffix} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
