You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2001/08/14 00:26:18 UTC
cvs commit: jakarta-turbine-torque/src/java/org/apache/torque/oid SequenceIdGenerator.java AutoIncrementIdGenerator.java
dlr 01/08/13 15:26:18
Modified: src/java/org/apache/torque/oid SequenceIdGenerator.java
AutoIncrementIdGenerator.java
Log:
Updated for DB adapter API change, and did minor cleanup.
Revision Changes Path
1.3 +2 -2 jakarta-turbine-torque/src/java/org/apache/torque/oid/SequenceIdGenerator.java
Index: SequenceIdGenerator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/oid/SequenceIdGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- SequenceIdGenerator.java 2001/08/10 12:23:02 1.2
+++ SequenceIdGenerator.java 2001/08/13 22:26:18 1.3
@@ -67,7 +67,7 @@
* getting an id prior to inserting a row into the database.
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: SequenceIdGenerator.java,v 1.2 2001/08/10 12:23:02 knielsen Exp $
+ * @version $Id: SequenceIdGenerator.java,v 1.3 2001/08/13 22:26:18 dlr Exp $
*/
public class SequenceIdGenerator
implements IdGenerator
@@ -183,7 +183,7 @@
Object keyInfo)
throws Exception
{
- String idSql = dbAdapter.getSequenceSql(keyInfo);
+ String idSql = dbAdapter.getIDMethodSQL(keyInfo);
// Execute the query.
QueryDataSet qds = new QueryDataSet( connection, idSql );
1.3 +8 -5 jakarta-turbine-torque/src/java/org/apache/torque/oid/AutoIncrementIdGenerator.java
Index: AutoIncrementIdGenerator.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/oid/AutoIncrementIdGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- AutoIncrementIdGenerator.java 2001/08/10 12:23:02 1.2
+++ AutoIncrementIdGenerator.java 2001/08/13 22:26:18 1.3
@@ -68,7 +68,7 @@
* Connection.
*
* @author <a href="mailto:jmcnally@collab.net">John D. McNally</a>
- * @version $Id: AutoIncrementIdGenerator.java,v 1.2 2001/08/10 12:23:02 knielsen Exp $
+ * @version $Id: AutoIncrementIdGenerator.java,v 1.3 2001/08/13 22:26:18 dlr Exp $
*/
public class AutoIncrementIdGenerator
implements IdGenerator
@@ -170,7 +170,7 @@
*
* @return a <code>boolean</code> value
*/
- public boolean isConnectionRequired()
+ public final boolean isConnectionRequired()
{
return true;
}
@@ -188,19 +188,22 @@
Object keyInfo)
throws Exception
{
- String IDSql = dbAdapter.getIdSqlForAutoIncrement(keyInfo);
+ String idSQL = dbAdapter.getIDMethodSQL(keyInfo);
Value id = null;
QueryDataSet qds = null;
try
{
- qds = new QueryDataSet(connection, IDSql);
+ qds = new QueryDataSet(connection, idSQL);
qds.fetchRecords(1);
Record rec = qds.getRecord(0);
id = rec.getValue(1);
}
finally
{
- if (qds != null) qds.close();
+ if (qds != null)
+ {
+ qds.close();
+ }
}
return id;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org