Index: src/java/org/apache/torque/util/SqlEnum.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-torque/src/java/org/apache/torque/util/SqlEnum.java,v
retrieving revision 1.4
diff -u -r1.4 SqlEnum.java
--- src/java/org/apache/torque/util/SqlEnum.java	20 Jan 2002 21:37:56 -0000	1.4
+++ src/java/org/apache/torque/util/SqlEnum.java	13 Sep 2002 01:37:37 -0000
@@ -116,4 +116,8 @@
         new SqlEnum(" IS NULL ");
     public static final SqlEnum ISNOTNULL =
         new SqlEnum(" IS NOT NULL ");
+    public static final SqlEnum CURRENT_DATE =
+        new SqlEnum("CURRENT_DATE");
+    public static final SqlEnum CURRENT_TIME =
+        new SqlEnum("CURRENT_TIME");
 }
Index: src/java/org/apache/torque/util/Criteria.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-torque/src/java/org/apache/torque/util/Criteria.java,v
retrieving revision 1.31
diff -u -r1.31 Criteria.java
--- src/java/org/apache/torque/util/Criteria.java	12 Jul 2002 21:40:12 -0000	1.31
+++ src/java/org/apache/torque/util/Criteria.java	13 Sep 2002 01:38:03 -0000
@@ -150,6 +150,12 @@
     /** "IS NOT NULL" null comparison */
     public static final SqlEnum ISNOTNULL = SqlEnum.ISNOTNULL;
 
+    /** "CURRENT_DATE" ANSI SQL function */
+    public static final SqlEnum CURRENT_DATE = SqlEnum.CURRENT_DATE;
+
+    /** "CURRENT_TIME" ANSI SQL function */
+    public static final SqlEnum CURRENT_TIME = SqlEnum.CURRENT_TIME;
+
     private static final int DEFAULT_CAPACITY = 10;
 
     private boolean ignoreCase = false;
Index: src/test/org/apache/torque/util/CriteriaTest.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-torque/src/test/org/apache/torque/util/CriteriaTest.java,v
retrieving revision 1.9
diff -u -r1.9 CriteriaTest.java
--- src/test/org/apache/torque/util/CriteriaTest.java	4 Sep 2002 23:40:26 -0000	1.9
+++ src/test/org/apache/torque/util/CriteriaTest.java	13 Sep 2002 01:38:53 -0000
@@ -284,5 +284,29 @@
 
         assertEquals("TABLE.COLUMN=1", cc.toString());
     }
+
+    public void testCurrentDate()
+    {
+        Criteria c = new Criteria()
+                .add("TABLE.DATE_COLUMN", Criteria.CURRENT_DATE)
+                .add("TABLE.TIME_COLUMN", Criteria.CURRENT_TIME);
+
+        String expect = "SELECT  FROM TABLE WHERE TABLE.TIME_COLUMN=CURRENT_TIME AND TABLE.DATE_COLUMN=CURRENT_DATE";
+
+        String result = null;
+        try
+        {
+            result = BasePeer.createQueryString(c);
+        }
+        catch (TorqueException e)
+        {
+            e.printStackTrace();
+            fail("TorqueException thrown in BasePeer.createQueryString()");
+        }
+
+        assertEquals(expect,result);
+
+    }
+
 }