[calcite] branch main updated: [CALCITE-5648] SqlDelegatingConformance incorrectly delegates to SqlConformanceEnum.DEFAULT

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

libenchao pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/calcite.git


The following commit(s) were added to refs/heads/main by this push:
     new 1abb7ad737 [CALCITE-5648] SqlDelegatingConformance incorrectly delegates to SqlConformanceEnum.DEFAULT
1abb7ad737 is described below

commit 1abb7ad737d691b0a1ef5e04c3deb7cb07ec44a8
Author: adamk <ad...@gmail.com>
AuthorDate: Fri Apr 14 16:35:48 2023 -0700

    [CALCITE-5648] SqlDelegatingConformance incorrectly delegates to SqlConformanceEnum.DEFAULT
    
    Close apache/calcite#3152
---
 .../sql/validate/SqlDelegatingConformance.java     | 72 ++++++++++++++++++++--
 .../org/apache/calcite/test/SqlValidatorTest.java  |  2 +-
 2 files changed, 69 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/org/apache/calcite/sql/validate/SqlDelegatingConformance.java b/core/src/main/java/org/apache/calcite/sql/validate/SqlDelegatingConformance.java
index 3b55d083ba..0dea730551 100644
--- a/core/src/main/java/org/apache/calcite/sql/validate/SqlDelegatingConformance.java
+++ b/core/src/main/java/org/apache/calcite/sql/validate/SqlDelegatingConformance.java
@@ -23,7 +23,7 @@ import org.apache.calcite.sql.fun.SqlLibrary;
  * another object. You can create a sub-class that overrides particular
  * methods.
  */
-public class SqlDelegatingConformance extends SqlAbstractConformance {
+public class SqlDelegatingConformance implements SqlConformance {
   private final SqlConformance delegate;
 
   /** Creates a SqlDelegatingConformance. */
@@ -31,6 +31,14 @@ public class SqlDelegatingConformance extends SqlAbstractConformance {
     this.delegate = delegate;
   }
 
+  @Override public boolean isLiberal() {
+    return delegate.isLiberal();
+  }
+
+  @Override public boolean allowCharLiteralAlias() {
+    return delegate.allowCharLiteralAlias();
+  }
+
   @Override public boolean isGroupByAlias() {
     return delegate.isGroupByAlias();
   }
@@ -40,7 +48,7 @@ public class SqlDelegatingConformance extends SqlAbstractConformance {
   }
 
   @Override public boolean isHavingAlias() {
-    return delegate.isGroupByAlias();
+    return delegate.isHavingAlias();
   }
 
   @Override public boolean isSortByOrdinal() {
@@ -59,24 +67,76 @@ public class SqlDelegatingConformance extends SqlAbstractConformance {
     return delegate.isFromRequired();
   }
 
+  @Override public boolean splitQuotedTableName() {
+    return delegate.splitQuotedTableName();
+  }
+
+  @Override public boolean allowHyphenInUnquotedTableName() {
+    return delegate.allowHyphenInUnquotedTableName();
+  }
+
   @Override public boolean isBangEqualAllowed() {
     return delegate.isBangEqualAllowed();
   }
 
+  @Override public boolean isPercentRemainderAllowed() {
+    return delegate.isPercentRemainderAllowed();
+  }
+
   @Override public boolean isMinusAllowed() {
     return delegate.isMinusAllowed();
   }
 
+  @Override public boolean isApplyAllowed() {
+    return delegate.isApplyAllowed();
+  }
+
   @Override public boolean isInsertSubsetColumnsAllowed() {
     return delegate.isInsertSubsetColumnsAllowed();
   }
 
+  @Override public boolean allowAliasUnnestItems() {
+    return delegate.allowAliasUnnestItems();
+  }
+
   @Override public boolean allowNiladicParentheses() {
     return delegate.allowNiladicParentheses();
   }
 
-  @Override public boolean allowAliasUnnestItems() {
-    return delegate.allowAliasUnnestItems();
+  @Override public boolean allowExplicitRowValueConstructor() {
+    return delegate.allowExplicitRowValueConstructor();
+  }
+
+  @Override public boolean allowExtend() {
+    return delegate.allowExtend();
+  }
+
+  @Override public boolean isLimitStartCountAllowed() {
+    return delegate.isLimitStartCountAllowed();
+  }
+
+  @Override public boolean isOffsetLimitAllowed() {
+    return delegate.isOffsetLimitAllowed();
+  }
+
+  @Override public boolean allowGeometry() {
+    return delegate.allowGeometry();
+  }
+
+  @Override public boolean shouldConvertRaggedUnionTypesToVarying() {
+    return delegate.shouldConvertRaggedUnionTypesToVarying();
+  }
+
+  @Override public boolean allowExtendedTrim() {
+    return delegate.allowExtendedTrim();
+  }
+
+  @Override public boolean allowPluralTimeUnits() {
+    return delegate.allowPluralTimeUnits();
+  }
+
+  @Override public boolean allowQualifyingCommonColumn() {
+    return delegate.allowQualifyingCommonColumn();
   }
 
   @Override public boolean isValueAllowed() {
@@ -87,4 +147,8 @@ public class SqlDelegatingConformance extends SqlAbstractConformance {
     return delegate.semantics();
   }
 
+  @Override public boolean allowCoercionStringToArray() {
+    return delegate.allowCoercionStringToArray();
+  }
+
 }
diff --git a/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java b/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java
index c5f5794e79..bc071f6827 100644
--- a/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java
+++ b/core/src/test/java/org/apache/calcite/test/SqlValidatorTest.java
@@ -5358,7 +5358,7 @@ public class SqlValidatorTest extends SqlValidatorTestCase {
   }
 
   @Test void testUserDefinedConformance() {
-    final SqlAbstractConformance custom =
+    final SqlConformance custom =
         new SqlDelegatingConformance(SqlConformanceEnum.DEFAULT) {
           public boolean isBangEqualAllowed() {
             return true;