[CALCITE-6693] Add Source SQL Dialect to RelToSqlConverterTest

apache · Nov 16, 2024 · db271e5 · db271e5
1 parent f347fba
commit db271e5
Show file tree

Hide file tree

Showing 3 changed files with 158 additions and 125 deletions.
diff --git a/core/src/main/java/org/apache/calcite/prepare/PlannerImpl.java b/core/src/main/java/org/apache/calcite/prepare/PlannerImpl.java
@@ -46,6 +46,7 @@
 import org.apache.calcite.sql.SqlOperatorTable;
 import org.apache.calcite.sql.parser.SqlParseException;
 import org.apache.calcite.sql.parser.SqlParser;
+import org.apache.calcite.sql.parser.SqlParser.Config;
 import org.apache.calcite.sql.util.SqlOperatorTables;
 import org.apache.calcite.sql.validate.SqlValidator;
 import org.apache.calcite.sql2rel.RelDecorrelator;
@@ -117,14 +118,14 @@ public PlannerImpl(FrameworkConfig config) {
     this.convertletTable = config.getConvertletTable();
     this.executor = config.getExecutor();
     this.context = config.getContext();
-    this.connectionConfig = connConfig(context, parserConfig);
+    this.connectionConfig = connConfig(context, parserConfig, sqlValidatorConfig);
     this.typeSystem = config.getTypeSystem();
     reset();
   }
 
   /** Gets a user-defined config and appends default connection values. */
   private static CalciteConnectionConfig connConfig(Context context,
-      SqlParser.Config parserConfig) {
+      Config parserConfig, SqlValidator.Config sqlValidatorConfig) {
     CalciteConnectionConfigImpl config =
         context.maybeUnwrap(CalciteConnectionConfigImpl.class)
             .orElse(CalciteConnectionConfig.DEFAULT);
@@ -138,6 +139,11 @@ private static CalciteConnectionConfig connConfig(Context context,
           config.set(CalciteConnectionProperty.CONFORMANCE,
               String.valueOf(parserConfig.conformance()));
     }
+    if (!config.isSet(CalciteConnectionProperty.DEFAULT_NULL_COLLATION)) {
+      config =
+          config.set(CalciteConnectionProperty.DEFAULT_NULL_COLLATION,
+              String.valueOf(sqlValidatorConfig.defaultNullCollation()));
+    }
     return config;
   }
 

diff --git a/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterStructsTest.java b/core/src/test/java/org/apache/calcite/rel/rel2sql/RelToSqlConverterStructsTest.java
@@ -35,7 +35,8 @@ class RelToSqlConverterStructsTest {
 
   private RelToSqlConverterTest.Sql sql(String sql) {
     return new RelToSqlConverterTest.Sql(CalciteAssert.SchemaSpec.MY_DB, sql,
-        CalciteSqlDialect.DEFAULT, SqlParser.Config.DEFAULT, ImmutableSet.of(),
+        CalciteSqlDialect.DEFAULT, CalciteSqlDialect.DEFAULT,
+        SqlParser.Config.DEFAULT, ImmutableSet.of(),
         UnaryOperator.identity(), null, ImmutableList.of());
   }