Author: tv
Date: Fri Aug 5 10:26:15 2016
New Revision: 1755277
URL: http://svn.apache.org/viewvc?rev=1755277&view=rev
Log:
TORQUE-346: Avoid duplicate code
Modified:
db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/templates/peer/impl/base/retrieveByPK.vm
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=1755277&r1=1755276&r2=1755277&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 10:26:15 2016
@@ -134,19 +134,13 @@
#set ( $peerColumnName = $columnElement.getAttribute("peerColumnName") )
criteria.and(${peerClassName}.${peerColumnName}, $columnField);
#end
- List<${dbObjectClassName}> v = doSelect(criteria, con);
- if (v.size() == 0)
+ ${dbObjectClassName} v = doSelectSingleRecord(criteria, con);
+ if (v == null)
{
throw new NoRowsException("Failed to select a row.");
}
- else if (v.size() > 1)
- {
- throw new TooManyRowsException("Failed to select only one row.");
- }
- else
- {
- return ($dbObjectClassName)v.get(0);
- }
+
+ return v;
}
#end
@@ -194,19 +188,13 @@
throws TorqueException, NoRowsException, TooManyRowsException
{
Criteria criteria = buildCriteria(pk);
- List<${dbObjectClassName}> v = doSelect(criteria, con);
- if (v.size() == 0)
+ ${dbObjectClassName} v = doSelectSingleRecord(criteria, con);
+ if (v == null)
{
throw new NoRowsException("Failed to select a row.");
}
- else if (v.size() > 1)
- {
- throw new TooManyRowsException("Failed to select only one row.");
- }
- else
- {
- return ($dbObjectClassName)v.get(0);
- }
+
+ return v;
}
#end
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org
For additional commands, e-mail: torque-dev-h...@db.apache.org
