dlr 02/02/21 09:03:49
Modified: src/java/org/apache/torque/util BasePeer.java
Log:
Removed use of objectDataNeedsTrans() (previously used only for
Postgres). Rhys Dixon <[EMAIL PROTECTED]> tells me that handling of
object data no longer needs to be wrapped in a transaction when the
Postgres bytea type is used instead of the oid hack for the JDBC type
VARBINARY.
Revision Changes Path
1.24 +9 -19
jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java
Index: BasePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -u -r1.23 -r1.24
--- BasePeer.java 20 Feb 2002 23:57:55 -0000 1.23
+++ BasePeer.java 21 Feb 2002 17:03:48 -0000 1.24
@@ -110,7 +110,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: BasePeer.java,v 1.23 2002/02/20 23:57:55 dobbs Exp $
+ * @version $Id: BasePeer.java,v 1.24 2002/02/21 17:03:48 dlr Exp $
*/
public abstract class BasePeer implements java.io.Serializable
{
@@ -475,8 +475,7 @@
String dbName = criteria.getDbName();
// Do the work, assuring the database connection is released.
- if (Torque.getDB(dbName).objectDataNeedsTrans() &&
- criteria.containsObjectColumn(dbName))
+ if (criteria.containsObjectColumn(dbName))
{
// For PostgreSQL and LOBs.
try
@@ -672,10 +671,8 @@
DBConnection dbCon = null;
ObjectKey id = null;
- // Transaction stuff added for postgres.
- boolean doTransaction = (Torque.getDB(criteria.getDbName()).
- objectDataNeedsTrans() &&
- criteria.containsObjectColumn(criteria.getDbName()));
+ boolean doTransaction =
+ criteria.containsObjectColumn(criteria.getDbName());
try
{
@@ -1206,11 +1203,8 @@
public static Vector doSelect(Criteria criteria)
throws Exception
{
- // Transaction stuff added for postgres.
Vector results = null;
- if (Torque.getDB(criteria.getDbName())
- .objectDataNeedsTrans() &&
- criteria.containsObjectColumn(criteria.getDbName()))
+ if (criteria.containsObjectColumn(criteria.getDbName()))
{
DBConnection dbCon = beginTransaction(criteria.getDbName());
try
@@ -1562,10 +1556,8 @@
public static void doUpdate(Criteria updateValues)
throws Exception
{
- // Transaction stuff added for postgres.
- boolean doTransaction = (Torque.getDB(updateValues.getDbName())
- .objectDataNeedsTrans() &&
- updateValues.containsObjectColumn(updateValues.getDbName()));
+ boolean doTransaction =
+ updateValues.containsObjectColumn(updateValues.getDbName());
DBConnection db = null;
try
{
@@ -1664,10 +1656,8 @@
Criteria updateValues)
throws Exception
{
- // Transaction stuff added for postgres.
- boolean doTransaction = (Torque.getDB(updateValues.getDbName())
- .objectDataNeedsTrans() &&
- updateValues.containsObjectColumn(selectCriteria.getDbName()));
+ boolean doTransaction =
+ updateValues.containsObjectColumn(selectCriteria.getDbName());
DBConnection db = null;
try
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
