dlr 01/09/01 09:19:04
Modified: src/java/org/apache/torque/util SqlExpression.java
Log:
Forward-ported Fedor's change to date handling:
"Implemented Gonzalo's suggestion to use JDBC escapes for dates. Seems to
work well and solves all the inherent problems with dates."
Revision Changes Path
1.6 +7 -5
jakarta-turbine-torque/src/java/org/apache/torque/util/SqlExpression.java
Index: SqlExpression.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/util/SqlExpression.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- SqlExpression.java 2001/08/21 19:28:40 1.5
+++ SqlExpression.java 2001/09/01 16:19:04 1.6
@@ -76,7 +76,8 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: SqlExpression.java,v 1.5 2001/08/21 19:28:40 jmcnally Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Fedor Karpelevitch</a>
+ * @version $Id: SqlExpression.java,v 1.6 2001/09/01 16:19:04 dlr Exp $
*/
public class SqlExpression
{
@@ -284,14 +285,15 @@
{
criteria = quoteAndEscapeText(criteria.toString(), db);
}
- else if( criteria instanceof java.util.Date )
+ else if( criteria instanceof Date )
{
- criteria = db.getDateString((Date)criteria);
+ Date dt = (Date) criteria;
+ criteria = db.getDateString(dt);
}
else if ( criteria instanceof DateKey )
{
- criteria = db
- .getDateString((Date)((DateKey)criteria).getValue());
+ Date dt = (Date) ((DateKey) criteria).getValue();
+ criteria = db.getDateString(dt);
}
else if( criteria instanceof Boolean )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
