re-enable test

julianhyde · Mar 20, 2023 · 7d39e15 · 7d39e15
1 parent 60c6269
commit 7d39e15
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/testkit/src/main/java/org/apache/calcite/sql/test/AbstractSqlTester.java b/testkit/src/main/java/org/apache/calcite/sql/test/AbstractSqlTester.java
@@ -325,9 +325,10 @@ public static String buildQueryAgg(String expression) {
    * @return Query that evaluates a scalar expression
    */
   protected String buildQuery2(SqlTestFactory factory, String expression) {
-    if (expression.matches("(?i).*percentile_(cont|disc).*")) {
+    if (expression.matches("(?i).*(percentile_(cont|disc)|convert)\\(.*")) {
       // PERCENTILE_CONT requires its argument to be a literal,
       // so converting its argument to a column will cause false errors.
+      // Similarly, MSSQL-style CONVERT.
       return buildQuery(expression);
     }
     // "values (1 < 5)"

diff --git a/testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java b/testkit/src/main/java/org/apache/calcite/test/SqlOperatorTest.java
@@ -1208,7 +1208,6 @@ protected SqlOperatorFixture fixture() {
     f.checkNull("convert(DATE, NULL)");
   }
 
-  @Disabled("Need to add exception for MSSQL CONVERT 'style' argument being a literal.")
   @Test void testMssqlConvertWithStyle() {
     final SqlOperatorFixture f = fixture();
     f.setFor(SqlLibraryOperators.MSSQL_CONVERT, VmName.EXPAND);