dlr 02/03/15 13:47:45
Modified: src/java/org/apache/torque/adapter DB.java DBCloudscape.java
DBDB2App.java DBDB2Net.java DBHypersonicSQL.java
DBInformix.java DBInstantDB.java DBMM.java
DBNone.java DBOdbc.java DBOracle.java
DBPostgres.java DBSapDB.java DBSybase.java
DBWeblogic.java
Log:
Pushed implementation of getStringDelimiter() up into base DB adapter class.
Revision Changes Path
1.19 +10 -5
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DB.java
Index: DB.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DB.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -u -r1.18 -r1.19
--- DB.java 21 Feb 2002 16:58:19 -0000 1.18
+++ DB.java 15 Mar 2002 21:47:45 -0000 1.19
@@ -90,7 +90,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: DB.java,v 1.18 2002/02/21 16:58:19 dlr Exp $
+ * @version $Id: DB.java,v 1.19 2002/03/15 21:47:45 dlr Exp $
*/
public abstract class DB implements Serializable, IDMethod
{
@@ -207,11 +207,16 @@
public abstract String toUpperCase(String in);
/**
- * Gets the string delimiter (usually '\'').
+ * Returns the character used to indicate the beginning and end of
+ * a piece of text used in a SQL statement (generally a single
+ * quote).
*
- * @return The delimeter.
+ * @return The text delimeter.
*/
- public abstract char getStringDelimiter();
+ public char getStringDelimiter()
+ {
+ return '\'';
+ }
/**
* Returns the constant from the {@link
@@ -387,7 +392,7 @@
*/
public String getDateString(String dateString)
{
- return '\'' + dateString + '\'';
+ return getStringDelimiter () + dateString + getStringDelimiter();
}
/**
1.2 +1 -11
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBCloudscape.java
Index: DBCloudscape.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBCloudscape.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- DBCloudscape.java 12 Nov 2001 05:26:02 -0000 1.1
+++ DBCloudscape.java 15 Mar 2002 21:47:45 -0000 1.2
@@ -63,7 +63,7 @@
* This is used to connect to Cloudscape SQL databases.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
- * @version $Id: DBCloudscape.java,v 1.1 2001/11/12 05:26:02 jvanzyl Exp $
+ * @version $Id: DBCloudscape.java,v 1.2 2002/03/15 21:47:45 dlr Exp $
*/
public class DBCloudscape
extends DB
@@ -136,16 +136,6 @@
public String ignoreCase(String in)
{
return in;
- }
-
- /**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\''; //
}
/**
1.4 +1 -11
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBDB2App.java
Index: DBDB2App.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBDB2App.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- DBDB2App.java 13 Aug 2001 22:24:10 -0000 1.3
+++ DBDB2App.java 15 Mar 2002 21:47:45 -0000 1.4
@@ -66,7 +66,7 @@
* </a>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Hakan Tandogan</a>
- * @version $Id: DBDB2App.java,v 1.3 2001/08/13 22:24:10 dlr Exp $
+ * @version $Id: DBDB2App.java,v 1.4 2002/03/15 21:47:45 dlr Exp $
*/
public class DBDB2App
extends DB
@@ -104,16 +104,6 @@
new StringBuffer("UPPER(").append(in).append(")").toString();
return s;
- }
-
- /**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\'';
}
/**
1.4 +1 -11
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBDB2Net.java
Index: DBDB2Net.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBDB2Net.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- DBDB2Net.java 13 Aug 2001 22:24:10 -0000 1.3
+++ DBDB2Net.java 15 Mar 2002 21:47:45 -0000 1.4
@@ -66,7 +66,7 @@
* </a>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Hakan Tandogan</a>
- * @version $Id: DBDB2Net.java,v 1.3 2001/08/13 22:24:10 dlr Exp $
+ * @version $Id: DBDB2Net.java,v 1.4 2002/03/15 21:47:45 dlr Exp $
*/
public class DBDB2Net
extends DB
@@ -104,16 +104,6 @@
new StringBuffer("UPPER(").append(in).append(")").toString();
return s;
- }
-
- /**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\'';
}
/**
1.4 +1 -11
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBHypersonicSQL.java
Index: DBHypersonicSQL.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBHypersonicSQL.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- DBHypersonicSQL.java 13 Aug 2001 22:24:10 -0000 1.3
+++ DBHypersonicSQL.java 15 Mar 2002 21:47:45 -0000 1.4
@@ -64,7 +64,7 @@
* <a href="http://hsql.oron.ch/";>http://hsql.oron.ch</a>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Elkins</a>
- * @version $Id: DBHypersonicSQL.java,v 1.3 2001/08/13 22:24:10 dlr Exp $
+ * @version $Id: DBHypersonicSQL.java,v 1.4 2002/03/15 21:47:45 dlr Exp $
*/
public class DBHypersonicSQL
extends DB
@@ -136,16 +136,6 @@
public String ignoreCase(String in)
{
return in;
- }
-
- /**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\''; // '
}
/**
1.4 +1 -11
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBInformix.java
Index: DBInformix.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBInformix.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- DBInformix.java 13 Aug 2001 22:24:10 -0000 1.3
+++ DBInformix.java 15 Mar 2002 21:47:45 -0000 1.4
@@ -64,7 +64,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brian P Millett</a>
- * @version $Id: DBInformix.java,v 1.3 2001/08/13 22:24:10 dlr Exp $
+ * @version $Id: DBInformix.java,v 1.4 2002/03/15 21:47:45 dlr Exp $
*/
public class DBInformix
extends DB
@@ -100,16 +100,6 @@
public String ignoreCase(String in)
{
return in;
- }
-
- /**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\'';
}
/**
1.4 +1 -11
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBInstantDB.java
Index: DBInstantDB.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBInstantDB.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- DBInstantDB.java 13 Aug 2001 22:24:10 -0000 1.3
+++ DBInstantDB.java 15 Mar 2002 21:47:45 -0000 1.4
@@ -67,7 +67,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: DBInstantDB.java,v 1.3 2001/08/13 22:24:10 dlr Exp $
+ * @version $Id: DBInstantDB.java,v 1.4 2002/03/15 21:47:45 dlr Exp $
*/
public class DBInstantDB
extends DB
@@ -133,16 +133,6 @@
public String ignoreCase(String in)
{
return in;
- }
-
- /**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\''; // '
}
/**
1.8 +7 -15
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBMM.java
Index: DBMM.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBMM.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- DBMM.java 15 Mar 2002 21:29:37 -0000 1.7
+++ DBMM.java 15 Mar 2002 21:47:45 -0000 1.8
@@ -73,7 +73,8 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: DBMM.java,v 1.7 2002/03/15 21:29:37 dlr Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
+ * @version $Id: DBMM.java,v 1.8 2002/03/15 21:47:45 dlr Exp $
*/
public class DBMM
extends DB
@@ -110,16 +111,6 @@
}
/**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\'';
- }
-
- /**
* @see org.apache.torque.adapter.DB#getIDMethodType()
*/
public String getIDMethodType()
@@ -208,13 +199,14 @@
}
/**
- * This method is used to format any date string.
- * Database can use different default date formats.
+ * This method overrides the JDBC escapes used to format dates
+ * using a <code>DateFormat</code>. As of version 2.0.11, the MM
+ * JDBC driver does not implement JDBC 3.0 escapes.
*
- * @return The proper date formatted String.
+ * @return The properly formatted date String.
*/
public String getDateString(Date date)
{
- return '\'' + new SimpleDateFormat(DATE_FORMAT).format(date) + '\'';
+ return getDateString(new SimpleDateFormat(DATE_FORMAT).format(date));
}
}
1.4 +1 -11
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBNone.java
Index: DBNone.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBNone.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- DBNone.java 13 Aug 2001 22:24:10 -0000 1.3
+++ DBNone.java 15 Mar 2002 21:47:45 -0000 1.4
@@ -63,7 +63,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: DBNone.java,v 1.3 2001/08/13 22:24:10 dlr Exp $
+ * @version $Id: DBNone.java,v 1.4 2002/03/15 21:47:45 dlr Exp $
*/
public class DBNone
extends DB
@@ -125,16 +125,6 @@
public String ignoreCase(String in)
{
return in;
- }
-
- /**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\'';
}
/**
1.4 +1 -11
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBOdbc.java
Index: DBOdbc.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBOdbc.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- DBOdbc.java 13 Aug 2001 22:24:10 -0000 1.3
+++ DBOdbc.java 15 Mar 2002 21:47:45 -0000 1.4
@@ -62,7 +62,7 @@
* Platforms.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Cameron Riley</a>
- * @version $Id: DBOdbc.java,v 1.3 2001/08/13 22:24:10 dlr Exp $
+ * @version $Id: DBOdbc.java,v 1.4 2002/03/15 21:47:45 dlr Exp $
*/
public class DBOdbc
extends DB
@@ -94,16 +94,6 @@
public String ignoreCase(String in)
{
return in;
- }
-
- /**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\'';
}
/**
1.9 +1 -11
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBOracle.java
Index: DBOracle.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBOracle.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- DBOracle.java 22 Aug 2001 20:12:08 -0000 1.8
+++ DBOracle.java 15 Mar 2002 21:47:45 -0000 1.9
@@ -69,7 +69,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: DBOracle.java,v 1.8 2001/08/22 20:12:08 dlr Exp $
+ * @version $Id: DBOracle.java,v 1.9 2002/03/15 21:47:45 dlr Exp $
*/
public class DBOracle
extends DB
@@ -101,16 +101,6 @@
public String ignoreCase(String in)
{
return new StringBuffer("UPPER(").append(in).append(")").toString();
- }
-
- /**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\'';
}
/**
1.6 +1 -11
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBPostgres.java
Index: DBPostgres.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBPostgres.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- DBPostgres.java 21 Feb 2002 16:55:19 -0000 1.5
+++ DBPostgres.java 15 Mar 2002 21:47:45 -0000 1.6
@@ -63,7 +63,7 @@
* <a href="http://www.pgsql.org";>http://www.pgsql.org</a>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Hakan Tandogan</a>
- * @version $Id: DBPostgres.java,v 1.5 2002/02/21 16:55:19 dlr Exp $
+ * @version $Id: DBPostgres.java,v 1.6 2002/03/15 21:47:45 dlr Exp $
*/
public class DBPostgres
extends DB
@@ -101,16 +101,6 @@
new StringBuffer("UPPER(").append(in).append(")").toString();
return s;
- }
-
- /**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\'';
}
/**
1.5 +1 -11
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBSapDB.java
Index: DBSapDB.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBSapDB.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- DBSapDB.java 20 Aug 2001 21:07:50 -0000 1.4
+++ DBSapDB.java 15 Mar 2002 21:47:45 -0000 1.5
@@ -67,7 +67,7 @@
* <a href="http://www.sapdb.org";>http://www.sapdb.org</a>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Polito</a>
- * @version $Id: DBSapDB.java,v 1.4 2001/08/20 21:07:50 jon Exp $
+ * @version $Id: DBSapDB.java,v 1.5 2002/03/15 21:47:45 dlr Exp $
*/
public class DBSapDB
extends DB
@@ -99,16 +99,6 @@
public String ignoreCase(String in)
{
return new StringBuffer("UPPER(").append(in).append(")").toString();
- }
-
- /**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\'';
}
/**
1.5 +1 -11
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBSybase.java
Index: DBSybase.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBSybase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- DBSybase.java 18 Aug 2001 15:54:54 -0000 1.4
+++ DBSybase.java 15 Mar 2002 21:47:45 -0000 1.5
@@ -68,7 +68,7 @@
* not function. For connection pooling, everything works.</I>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jeff Brekke</a>
- * @version $Id: DBSybase.java,v 1.4 2001/08/18 15:54:54 dlr Exp $
+ * @version $Id: DBSybase.java,v 1.5 2002/03/15 21:47:45 dlr Exp $
*/
public class DBSybase
extends DB
@@ -100,16 +100,6 @@
public String ignoreCase(String in)
{
return new StringBuffer("UPPER(").append(in).append(")").toString();
- }
-
- /**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\'';
}
/**
1.5 +1 -11
jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBWeblogic.java
Index: DBWeblogic.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/adapter/DBWeblogic.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- DBWeblogic.java 19 Aug 2001 02:56:35 -0000 1.4
+++ DBWeblogic.java 15 Mar 2002 21:47:45 -0000 1.5
@@ -65,7 +65,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: DBWeblogic.java,v 1.4 2001/08/19 02:56:35 brekke Exp $
+ * @version $Id: DBWeblogic.java,v 1.5 2002/03/15 21:47:45 dlr Exp $
*/
public class DBWeblogic
extends DB
@@ -132,16 +132,6 @@
public String ignoreCase(String in)
{
return in;
- }
-
- /**
- * Gets the string delimiter (usually '\'').
- *
- * @return The delimeter.
- */
- public char getStringDelimiter()
- {
- return '\'';
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
