Fix julianhyde/optiq#227, "Extend extract function to support DateTim…

…e data types".
ldming · Apr 3, 2014 · ad3fd47 · ad3fd47
1 parent 76eed6b
commit ad3fd47
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/org/eigenbase/sql/fun/SqlExtractFunction.java b/src/main/java/org/eigenbase/sql/fun/SqlExtractFunction.java
@@ -38,7 +38,7 @@ public SqlExtractFunction() {
         SqlKind.OTHER_FUNCTION,
         ReturnTypes.BIGINT_NULLABLE,
         null,
-        OperandTypes.INTERVAL_SAME_SAME,
+        OperandTypes.INTERVALINTERVAL_INTERVALDATETIME,
         SqlFunctionCategory.SYSTEM);
   }
 

diff --git a/src/main/java/org/eigenbase/sql/type/OperandTypes.java b/src/main/java/org/eigenbase/sql/type/OperandTypes.java
@@ -310,6 +310,10 @@ public boolean checkSingleOperandType(
   public static final SqlSingleOperandTypeChecker INTERVAL_DATETIME =
       family(SqlTypeFamily.DATETIME_INTERVAL, SqlTypeFamily.DATETIME);
 
+  public static final SqlSingleOperandTypeChecker
+  INTERVALINTERVAL_INTERVALDATETIME =
+      OperandTypes.or(INTERVAL_SAME_SAME, INTERVAL_DATETIME);
+
   // TODO: datetime+interval checking missing
   // TODO: interval+datetime checking missing
   public static final SqlSingleOperandTypeChecker PLUS_OPERATOR =

diff --git a/src/test/java/org/eigenbase/test/SqlValidatorTest.java b/src/test/java/org/eigenbase/test/SqlValidatorTest.java
@@ -5800,6 +5800,7 @@ public void _testGroupExpressionEquivalenceParams() {
         "extract(year from interval '1-2' year to month)",
         "BIGINT NOT NULL");
     checkExp("extract(minute from interval '1.1' second)");
+    checkExp("extract(year from DATE '2008-2-2')");
 
     checkWholeExpFails(
         "extract(minute from interval '11' month)",