This is an automated email from the ASF dual-hosted git repository.
chengzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 2407cd8dad0 Refactor ColumnProjection to remove instance of
MySQLDatabaseType (#35193)
2407cd8dad0 is described below
commit 2407cd8dad03d05e9813bd083b1616e960f7b18d
Author: Zhengqiang Duan <duanzhengqi...@apache.org>
AuthorDate: Mon Apr 14 09:50:13 2025 +0800
Refactor ColumnProjection to remove instance of MySQLDatabaseType (#35193)
---
.../select/projection/impl/ColumnProjection.java | 6 +++--
.../projection/impl/ColumnProjectionTest.java | 6 +++++
.../database/metadata/DialectDatabaseMetaData.java | 10 +++++++
.../option/column/DialectColumnOption.java | 31 ++++++++++++++++++++++
.../metadata/database/MySQLDatabaseMetaData.java | 6 +++++
5 files changed, 57 insertions(+), 2 deletions(-)
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/select/projection/impl/ColumnProjection.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/select/projection/impl/ColumnProjection.java
index 1100bce1984..206724f291c 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/select/projection/impl/ColumnProjection.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/select/projection/impl/ColumnProjection.java
@@ -25,8 +25,9 @@ import lombok.ToString;
import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.Projection;
import
org.apache.shardingsphere.infra.binder.context.segment.select.projection.extractor.ProjectionIdentifierExtractEngine;
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.column.DialectColumnOption;
import org.apache.shardingsphere.infra.database.core.type.DatabaseType;
-import org.apache.shardingsphere.infra.database.mysql.type.MySQLDatabaseType;
+import org.apache.shardingsphere.infra.database.core.type.DatabaseTypeRegistry;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.ParenthesesSegment;
import
org.apache.shardingsphere.sql.parser.statement.core.segment.generic.bound.ColumnSegmentBoundInfo;
import
org.apache.shardingsphere.sql.parser.statement.core.value.identifier.IdentifierValue;
@@ -122,7 +123,8 @@ public final class ColumnProjection implements Projection {
@Override
public String getColumnName() {
ProjectionIdentifierExtractEngine extractEngine = new
ProjectionIdentifierExtractEngine(databaseType);
- return databaseType instanceof MySQLDatabaseType ?
extractEngine.getIdentifierValue(name) : getColumnLabel();
+ DialectColumnOption columnOption = new
DatabaseTypeRegistry(databaseType).getDialectDatabaseMetaData().getColumnOption();
+ return columnOption.isColumnNameEqualsLabelInColumnProjection() ?
getColumnLabel() : extractEngine.getIdentifierValue(name);
}
@Override
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/projection/impl/ColumnProjectionTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/projection/impl/ColumnProjectionTest.java
index 4312e963854..3453f7c02d1 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/projection/impl/ColumnProjectionTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/context/segment/select/projection/impl/ColumnProjectionTest.java
@@ -94,6 +94,12 @@ class ColumnProjectionTest {
assertThat(new ColumnProjection(null, "name", "alias",
databaseType).getColumnName(), is("name"));
}
+ @Test
+ void assertGetColumnNameWithPostgreSQL() {
+ DatabaseType databaseType =
TypedSPILoader.getService(DatabaseType.class, "PostgreSQL");
+ assertThat(new ColumnProjection(null, "name", "alias",
databaseType).getColumnName(), is("alias"));
+ }
+
@Test
void assertGetColumnNameWithAlias() {
assertThat(new ColumnProjection(null, "name", "alias",
databaseType).getColumnName(), is("alias"));
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
index 98eb490f358..3956b1350d9 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/DialectDatabaseMetaData.java
@@ -19,6 +19,7 @@ package
org.apache.shardingsphere.infra.database.core.metadata.database.metadata
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.NullsOrderType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.column.DialectColumnOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.connection.DialectConnectionOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.datatype.DefaultDataTypeOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.datatype.DialectDataTypeOption;
@@ -69,6 +70,15 @@ public interface DialectDatabaseMetaData extends
DatabaseTypedSPI {
return new DefaultSchemaOption(false, null);
}
+ /**
+ * Get column option.
+ *
+ * @return column option
+ */
+ default DialectColumnOption getColumnOption() {
+ return new DialectColumnOption(true);
+ }
+
/**
* Get table name pattern type.
*
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/column/DialectColumnOption.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/column/DialectColumnOption.java
new file mode 100644
index 00000000000..78296dfd69d
--- /dev/null
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/column/DialectColumnOption.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.column;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * Dialect column option.
+ */
+@RequiredArgsConstructor
+@Getter
+public final class DialectColumnOption {
+
+ private final boolean isColumnNameEqualsLabelInColumnProjection;
+}
diff --git
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/metadata/database/MySQLDatabaseMetaData.java
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/metadata/database/MySQLDatabaseMetaData.java
index 8246e53a90d..a831f25575d 100644
---
a/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/metadata/database/MySQLDatabaseMetaData.java
+++
b/infra/database/type/mysql/src/main/java/org/apache/shardingsphere/infra/database/mysql/metadata/database/MySQLDatabaseMetaData.java
@@ -20,6 +20,7 @@ package
org.apache.shardingsphere.infra.database.mysql.metadata.database;
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.NullsOrderType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.enums.QuoteCharacter;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.DialectDatabaseMetaData;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.column.DialectColumnOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.connection.DialectConnectionOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.datatype.DialectDataTypeOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.join.DialectJoinOrderOption;
@@ -46,6 +47,11 @@ public final class MySQLDatabaseMetaData implements
DialectDatabaseMetaData {
return new MySQLDataTypeOption();
}
+ @Override
+ public DialectColumnOption getColumnOption() {
+ return new DialectColumnOption(false);
+ }
+
@Override
public DialectConnectionOption getConnectionOption() {
return new DialectConnectionOption(true, true);
