feat(isthmus): parse SQL using SqlConformanceEnum.LENIENT (#368)

BREAKING CHANGE: removed SqlConformance from FeatureBoard

Author: vbarua

isthmus-cli/README.md

@@ -27,31 +27,24 @@ isthmus 0.1
 ```
 $ ./isthmus-cli/build/graal/isthmus --help
 
-Usage: isthmus [-hmV] [--crossjoinpolicy=<crossJoinPolicy>]
-               [--outputformat=<outputFormat>]
-               [--sqlconformancemode=<sqlConformanceMode>]
-               [-c=<createStatements>]... [-e=<sqlExpressions>...]... [<sql>]
+Usage: isthmus [-hmV] [--outputformat=<outputFormat>]
+               [--unquotedcasing=<unquotedCasing>] [-c=<createStatements>]...
+               [-e=<sqlExpressions>...]... [<sql>]
 Convert SQL Queries and SQL Expressions to Substrait
       [<sql>]            A SQL query
   -c, --create=<createStatements>
                          One or multiple create table statements e.g. CREATE
                            TABLE T1(foo int, bar bigint)
-      --crossjoinpolicy=<crossJoinPolicy>
-                         One of built-in Calcite SQL compatibility modes:
-                           KEEP_AS_CROSS_JOIN, CONVERT_TO_INNER_JOIN
   -e, --expression=<sqlExpressions>...
                          One or more SQL expressions e.g. col + 1
   -h, --help             Show this help message and exit.
   -m, --multistatement   Allow multiple statements terminated with a semicolon
       --outputformat=<outputFormat>
                          Set the output format for the generated plan:
                            PROTOJSON, PROTOTEXT, BINARY
-      --sqlconformancemode=<sqlConformanceMode>
-                         One of built-in Calcite SQL compatibility modes:
-                           DEFAULT, LENIENT, BABEL, STRICT_92, STRICT_99,
-                           PRAGMATIC_99, BIG_QUERY, MYSQL_5, ORACLE_10,
-                           ORACLE_12, STRICT_2003, PRAGMATIC_2003, PRESTO,
-                           SQL_SERVER_2008
+      --unquotedcasing=<unquotedCasing>
+                         Calcite's casing policy for unquoted identifiers:
+                           UNCHANGED, TO_UPPER, TO_LOWER
   -V, --version          Print version information and exit.
 ```
 

isthmus-cli/src/main/java/io/substrait/isthmus/cli/IsthmusEntryPoint.java

@@ -19,7 +19,6 @@
 import java.util.List;
 import java.util.concurrent.Callable;
 import org.apache.calcite.avatica.util.Casing;
-import org.apache.calcite.sql.validate.SqlConformanceEnum;
 import picocli.CommandLine;
 
 @Command(
@@ -60,11 +59,6 @@ enum OutputFormat {
     BINARY, // protobuf BINARY format
   }
 
-  @Option(
-      names = {"--sqlconformancemode"},
-      description = "One of built-in Calcite SQL compatibility modes: ${COMPLETION-CANDIDATES}")
-  private SqlConformanceEnum sqlConformanceMode = SqlConformanceEnum.DEFAULT;
-
   @Option(
       names = {"--unquotedcasing"},
       description = "Calcite's casing policy for unquoted identifiers: ${COMPLETION-CANDIDATES}")
@@ -120,7 +114,6 @@ private void printMessage(Message message) throws IOException {
   FeatureBoard buildFeatureBoard() {
     return ImmutableFeatureBoard.builder()
         .allowsSqlBatch(allowMultiStatement)
-        .sqlConformanceMode(sqlConformanceMode)
         .unquotedCasing(unquotedCasing)
         .build();
   }

isthmus-cli/src/test/java/io/substrait/isthmus/cli/IsthmusEntryPointTest.java

@@ -1,16 +1,11 @@
 package io.substrait.isthmus.cli;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import io.substrait.isthmus.FeatureBoard;
-import org.apache.calcite.sql.validate.SqlConformance;
-import org.apache.calcite.sql.validate.SqlConformanceEnum;
 import org.junit.jupiter.api.Test;
 import picocli.CommandLine;
-import picocli.CommandLine.ParameterException;
 
 class IsthmusEntryPointTest {
 
@@ -21,33 +16,14 @@ void defaultFeatureBoard() {
     new CommandLine(isthmusEntryPoint);
     FeatureBoard features = isthmusEntryPoint.buildFeatureBoard();
     assertFalse(features.allowsSqlBatch());
-    assertEquals(SqlConformanceEnum.DEFAULT, features.sqlConformanceMode());
   }
 
   /** Test that the command line options are correctly parsed into the {@link FeatureBoard}. */
   @Test
   void customFeatureBoard() {
     IsthmusEntryPoint isthmusEntryPoint = new IsthmusEntryPoint();
-    new CommandLine(isthmusEntryPoint)
-        .parseArgs("--multistatement", "--sqlconformancemode=SQL_SERVER_2008", "SELECT * FROM foo");
+    new CommandLine(isthmusEntryPoint).parseArgs("--multistatement", "SELECT * FROM foo");
     FeatureBoard features = isthmusEntryPoint.buildFeatureBoard();
     assertTrue(features.allowsSqlBatch());
-    assertEquals(
-        (SqlConformance) SqlConformanceEnum.SQL_SERVER_2008, features.sqlConformanceMode());
-  }
-
-  /**
-   * Test that the command line parser throws an exception when an invalid join policy is specified.
-   */
-  @Test
-  void invalidCmdOptions() {
-    IsthmusEntryPoint isthmusEntryPoint = new IsthmusEntryPoint();
-    assertThrows(
-        ParameterException.class,
-        () ->
-            new CommandLine(isthmusEntryPoint)
-                .parseArgs(
-                    "--sqlconformancemode=SQL_SERVER_2008",
-                    "--crossjoinpolicy=REWRITE_TO_INNER_JOIN"));
   }
 }

isthmus/src/main/java/io/substrait/isthmus/FeatureBoard.java

@@ -1,8 +1,6 @@
 package io.substrait.isthmus;
 
 import org.apache.calcite.avatica.util.Casing;
-import org.apache.calcite.sql.validate.SqlConformance;
-import org.apache.calcite.sql.validate.SqlConformanceEnum;
 import org.immutables.value.Value;
 
 /**
@@ -20,18 +18,6 @@ public boolean allowsSqlBatch() {
     return false;
   }
 
-  /**
-   * Returns Calcite's SQL conformance mode used for the current request. For e.g. APPLY is only
-   * supported in SQL Server mode. Calcite's parser will throw an exception if the selected mode is
-   * not SQL Server and the SQL statement contains APPLY.
-   *
-   * @return the selected built-in Calcite SQL compatibility mode.
-   */
-  @Value.Default
-  public SqlConformance sqlConformanceMode() {
-    return SqlConformanceEnum.DEFAULT;
-  }
-
   /**
    * @return Calcite's identifier casing policy for unquoted identifiers.
    */

isthmus/src/main/java/io/substrait/isthmus/SqlConverterBase.java

@@ -31,6 +31,7 @@
 import org.apache.calcite.sql.parser.SqlParser;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.sql.parser.ddl.SqlDdlParserImpl;
+import org.apache.calcite.sql.validate.SqlConformanceEnum;
 import org.apache.calcite.sql.validate.SqlValidator;
 import org.apache.calcite.sql.validate.SqlValidatorCatalogReader;
 import org.apache.calcite.sql.validate.SqlValidatorImpl;
@@ -65,7 +66,7 @@ protected SqlConverterBase(FeatureBoard features) {
         SqlParser.Config.DEFAULT
             .withUnquotedCasing(featureBoard.unquotedCasing())
             .withParserFactory(SqlDdlParserImpl.FACTORY)
-            .withConformance(featureBoard.sqlConformanceMode());
+            .withConformance(SqlConformanceEnum.LENIENT);
   }
 
   protected static final SimpleExtension.ExtensionCollection EXTENSION_COLLECTION =

isthmus/src/test/java/io/substrait/isthmus/ApplyJoinPlanTest.java

@@ -7,7 +7,6 @@
 import org.apache.calcite.rex.RexFieldAccess;
 import org.apache.calcite.sql.parser.SqlParseException;
 import org.apache.calcite.sql.parser.SqlParser;
-import org.apache.calcite.sql.validate.SqlConformanceEnum;
 import org.apache.calcite.sql.validate.SqlValidator;
 import org.apache.calcite.sql2rel.SqlToRelConverter;
 import org.junit.jupiter.api.Assertions;
@@ -88,10 +87,7 @@ public void outerApplyQuery() throws SqlParseException {
             FROM store_sales OUTER APPLY
               (select i_item_sk from item where item.i_item_sk = store_sales.ss_item_sk)""";
 
-    FeatureBoard featureBoard =
-        ImmutableFeatureBoard.builder()
-            .sqlConformanceMode(SqlConformanceEnum.SQL_SERVER_2008)
-            .build();
+    FeatureBoard featureBoard = ImmutableFeatureBoard.builder().build();
     SqlToSubstrait s = new SqlToSubstrait(featureBoard);
     RelRoot root = getCalcitePlan(s, schema, sql);
 
@@ -133,10 +129,7 @@ public void nestedApplyJoinQuery() throws SqlParseException {
                 LogicalFilter(condition=[AND(=($4, $cor0.I_ITEM_SK), =($4, $cor2.SS_ITEM_SK))])
                   LogicalTableScan(table=[[tpcds, PROMOTION]])
      */
-    FeatureBoard featureBoard =
-        ImmutableFeatureBoard.builder()
-            .sqlConformanceMode(SqlConformanceEnum.SQL_SERVER_2008)
-            .build();
+    FeatureBoard featureBoard = ImmutableFeatureBoard.builder().build();
     SqlToSubstrait s = new SqlToSubstrait(featureBoard);
     RelRoot root = getCalcitePlan(s, schema, sql);
 
@@ -163,10 +156,7 @@ public void crossApplyQuery() throws SqlParseException {
             FROM store_sales CROSS APPLY
               (select i_item_sk from item where item.i_item_sk = store_sales.ss_item_sk)""";
 
-    FeatureBoard featureBoard =
-        ImmutableFeatureBoard.builder()
-            .sqlConformanceMode(SqlConformanceEnum.SQL_SERVER_2008)
-            .build();
+    FeatureBoard featureBoard = ImmutableFeatureBoard.builder().build();
     SqlToSubstrait s = new SqlToSubstrait(featureBoard);
 
     // TODO validate end to end conversion