Author: tv Date: Fri Aug 5 09:41:02 2016 New Revision: 1755268 URL: http://svn.apache.org/viewvc?rev=1755268&view=rev Log: Replace hard-coded database handle with call to getter
Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildSelectCriteria.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doDelete.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doSelectJoin.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doSelectJoinAllExcept.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doUpdate.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPK.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPKs.vm db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm Modified: db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java?rev=1755268&r1=1755267&r2=1755268&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java (original) +++ db/torque/torque4/trunk/torque-runtime/src/main/java/org/apache/torque/util/BasePeerImpl.java Fri Aug 5 09:41:02 2016 @@ -42,6 +42,7 @@ import org.apache.torque.Database; import org.apache.torque.TooManyRowsException; import org.apache.torque.Torque; import org.apache.torque.TorqueException; +import org.apache.torque.TorqueRuntimeException; import org.apache.torque.adapter.Adapter; import org.apache.torque.adapter.IDMethod; import org.apache.torque.criteria.Criteria; @@ -136,11 +137,11 @@ public class BasePeerImpl<T> implements * * @return the recordMapper */ - public RecordMapper<T> getRecordMapper() throws TorqueException + public RecordMapper<T> getRecordMapper() { if (recordMapper == null) { - throw new TorqueException("No record mapper injected"); + throw new TorqueRuntimeException("No record mapper injected"); } return recordMapper; @@ -161,11 +162,11 @@ public class BasePeerImpl<T> implements * * @return the tableMap */ - public TableMap getTableMap() throws TorqueException + public TableMap getTableMap() { if (tableMap == null) { - throw new TorqueException("No table map injected"); + throw new TorqueRuntimeException("No table map injected"); } return tableMap; @@ -186,11 +187,11 @@ public class BasePeerImpl<T> implements * * @return the databaseName */ - public String getDatabaseName() throws TorqueException + public String getDatabaseName() { if (databaseName == null) { - throw new TorqueException("No database name injected"); + throw new TorqueRuntimeException("No database name injected"); } return databaseName; Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.vm?rev=1755268&r1=1755267&r2=1755268&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildCriteria.vm Fri Aug 5 09:41:02 2016 @@ -124,7 +124,7 @@ */ public Criteria buildCriteria($dbObjectClassName obj) { - Criteria criteria = new Criteria(${peerClassName}.DATABASE_NAME); + Criteria criteria = new Criteria(getDatabaseName()); #foreach ($columnElement in $torqueGen.getChildren("column")) #set ( $peerColumnName = $columnElement.getAttribute("peerColumnName") ) #set ( $getter = $columnElement.getAttribute("getter") ) Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildSelectCriteria.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildSelectCriteria.vm?rev=1755268&r1=1755267&r2=1755268&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildSelectCriteria.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/buildSelectCriteria.vm Fri Aug 5 09:41:02 2016 @@ -39,7 +39,7 @@ */ public Criteria buildSelectCriteria($dbObjectClassName obj) { - Criteria criteria = new Criteria(${peerClassName}.DATABASE_NAME); + Criteria criteria = new Criteria(getDatabaseName()); #foreach ($columnElement in $torqueGen.getChildren("column")) #set ( $peerColumnName = $columnElement.getAttribute("peerColumnName") ) #set ( $columnFieldType = $columnElement.getAttribute("fieldType") ) Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doDelete.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doDelete.vm?rev=1755268&r1=1755267&r2=1755268&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doDelete.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doDelete.vm Fri Aug 5 09:41:02 2016 @@ -148,8 +148,7 @@ Connection connection = null; try { - connection = Transaction.begin( - ${peerClassName}.DATABASE_NAME); + connection = Transaction.begin(getDatabaseName()); int deletedRows = doDelete(pk, connection); Transaction.commit(connection); connection = null; Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doSelectJoin.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doSelectJoin.vm?rev=1755268&r1=1755267&r2=1755268&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doSelectJoin.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doSelectJoin.vm Fri Aug 5 09:41:02 2016 @@ -58,8 +58,7 @@ Connection connection = null; try { - connection = Transaction.begin( - ${peerClassName}.DATABASE_NAME); + connection = Transaction.begin(getDatabaseName()); List<${dbObjectClassName}> result = $peerClassName.${peerJoinSelectMethod}(criteria, connection); Transaction.commit(connection); Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doSelectJoinAllExcept.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doSelectJoinAllExcept.vm?rev=1755268&r1=1755267&r2=1755268&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doSelectJoinAllExcept.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doSelectJoinAllExcept.vm Fri Aug 5 09:41:02 2016 @@ -57,8 +57,7 @@ Connection connection = null; try { - connection = Transaction.begin( - ${peerClassName}.DATABASE_NAME); + connection = Transaction.begin(getDatabaseName()); List<${dbObjectClassName}> result = $peerClassName.${peerJoinAllExceptSelectMethod}(criteria, connection); Transaction.commit(connection); Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doUpdate.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doUpdate.vm?rev=1755268&r1=1755267&r2=1755268&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doUpdate.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/doUpdate.vm Fri Aug 5 09:41:02 2016 @@ -43,8 +43,7 @@ public int doUpdate(ColumnValues columnValues, Connection con) throws TorqueException { - Criteria selectCriteria - = new Criteria(${peerClassName}.DATABASE_NAME); + Criteria selectCriteria = new Criteria(getDatabaseName()); correctBooleans(columnValues); #foreach ($columnElement in $torqueGen.getChildren("column")) Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.vm?rev=1755268&r1=1755267&r2=1755268&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencedObject.vm Fri Aug 5 09:41:02 2016 @@ -88,8 +88,7 @@ Connection connection = null; try { - connection = Transaction.begin( - ${localPeerClassName}.DATABASE_NAME); + connection = Transaction.begin(getDatabaseName()); List<${fieldType}> result = ${filler}(toFill, chunkSize, connection); Transaction.commit(connection); Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.vm?rev=1755268&r1=1755267&r2=1755268&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/fillReferencingObjects.vm Fri Aug 5 09:41:02 2016 @@ -88,8 +88,7 @@ Connection connection = null; try { - connection = Transaction.begin( - ${localPeerClassName}.DATABASE_NAME); + connection = Transaction.begin(getDatabaseName()); List<${fieldContainedType}> result = ${filler}( toFill, chunkSize, Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/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/impl/base/retrieveByPK.vm?rev=1755268&r1=1755267&r2=1755268&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPK.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPK.vm Fri Aug 5 09:41:02 2016 @@ -89,7 +89,7 @@ Connection connection = null; try { - connection = Transaction.begin(${peerClassName}.DATABASE_NAME); + connection = Transaction.begin(getDatabaseName()); $dbObjectClassName result = retrieveByPK( #foreach ($columnElement in $primaryKeyColumnElements) #set ( $columnField = $columnElement.getAttribute("field") ) @@ -165,7 +165,7 @@ Connection connection = null; try { - connection = Transaction.begin(${peerClassName}.DATABASE_NAME); + connection = Transaction.begin(getDatabaseName()); $dbObjectClassName result = retrieveByPK(pk, connection); Transaction.commit(connection); connection = null; Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPKs.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPKs.vm?rev=1755268&r1=1755267&r2=1755268&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPKs.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPKs.vm Fri Aug 5 09:41:02 2016 @@ -49,7 +49,7 @@ Connection connection = null; try { - connection = Transaction.begin(${peerClassName}.DATABASE_NAME); + connection = Transaction.begin(getDatabaseName()); List<${dbObjectClassName}> result = retrieveByTypedPKs(pks, connection); Transaction.commit(connection); connection = null; @@ -113,7 +113,7 @@ Connection connection = null; try { - connection = Transaction.begin(${peerClassName}.DATABASE_NAME); + connection = Transaction.begin(getDatabaseName()); List<${dbObjectClassName}> result = retrieveByObjectKeys(pks, connection); Transaction.commit(connection); connection = null; Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm?rev=1755268&r1=1755267&r2=1755268&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/setAndSaveReferencing.vm Fri Aug 5 09:41:02 2016 @@ -76,8 +76,7 @@ Connection connection = null; try { - connection = Transaction.begin( - ${localPeerClassName}.DATABASE_NAME); + connection = Transaction.begin(getDatabaseName()); ${setAndSaveMethodName}(toLinkTo, toSave, connection); Transaction.commit(connection); connection = null; --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org