This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 d2394e769f5 Rename IdentifierPatternType (#35316)
d2394e769f5 is described below
commit d2394e769f548a55d4d12780a0bcfa29138f3da3
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sun May 4 15:50:09 2025 +0800
Rename IdentifierPatternType (#35316)
---
.../core/metadata/database/metadata/DialectDatabaseMetaData.java | 6 +++---
.../{IdentifierNamePatternType.java => IdentifierPatternType.java} | 4 ++--
.../infra/database/core/type/DatabaseTypeRegistry.java | 1 -
.../firebird/metadata/database/FirebirdDatabaseMetaData.java | 6 +++---
.../opengauss/metadata/database/OpenGaussDatabaseMetaData.java | 6 +++---
.../database/oracle/metadata/database/OracleDatabaseMetaData.java | 6 +++---
.../postgresql/metadata/database/PostgreSQLDatabaseMetaData.java | 6 +++---
7 files changed, 17 insertions(+), 18 deletions(-)
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 61a71c9c9b6..c7fe28c40eb 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
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DefaultSchemaOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DialectSchemaOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.table.DialectDriverQuerySystemCatalogOption;
-import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierNamePatternType;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierPatternType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.transaction.DialectTransactionOption;
import org.apache.shardingsphere.infra.database.core.spi.DatabaseTypedSPI;
import org.apache.shardingsphere.infra.spi.annotation.SingletonSPI;
@@ -107,8 +107,8 @@ public interface DialectDatabaseMetaData extends
DatabaseTypedSPI {
*
* @return identifier pattern type
*/
- default IdentifierNamePatternType getIdentifierPatternType() {
- return IdentifierNamePatternType.KEEP_ORIGIN;
+ default IdentifierPatternType getIdentifierPatternType() {
+ return IdentifierPatternType.KEEP_ORIGIN;
}
/**
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/IdentifierNamePatternType.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/IdentifierPatternType.java
similarity index 92%
rename from
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/IdentifierNamePatternType.java
rename to
infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/IdentifierPatternType.java
index b110c0b5ea0..3e24471be5c 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/IdentifierNamePatternType.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/metadata/database/metadata/option/IdentifierPatternType.java
@@ -18,9 +18,9 @@
package
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option;
/**
- * Identifier name pattern type.
+ * Identifier pattern type.
*/
-public enum IdentifierNamePatternType {
+public enum IdentifierPatternType {
UPPER_CASE, LOWER_CASE, KEEP_ORIGIN
}
diff --git
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeRegistry.java
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeRegistry.java
index 1537c35210f..296cd110fec 100644
---
a/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeRegistry.java
+++
b/infra/database/core/src/main/java/org/apache/shardingsphere/infra/database/core/type/DatabaseTypeRegistry.java
@@ -67,7 +67,6 @@ public final class DatabaseTypeRegistry {
* @return formatted identifier pattern
*/
public String formatIdentifierPattern(final String identifierPattern) {
- DatabaseType databaseType =
this.databaseType.getTrunkDatabaseType().orElse(this.databaseType);
switch
(DatabaseTypedSPILoader.getService(DialectDatabaseMetaData.class,
databaseType).getIdentifierPatternType()) {
case UPPER_CASE:
return identifierPattern.toUpperCase();
diff --git
a/infra/database/type/firebird/src/main/java/org/apache/shardingsphere/infra/database/firebird/metadata/database/FirebirdDatabaseMetaData.java
b/infra/database/type/firebird/src/main/java/org/apache/shardingsphere/infra/database/firebird/metadata/database/FirebirdDatabaseMetaData.java
index ed8113d7f1a..8bf9c685e58 100644
---
a/infra/database/type/firebird/src/main/java/org/apache/shardingsphere/infra/database/firebird/metadata/database/FirebirdDatabaseMetaData.java
+++
b/infra/database/type/firebird/src/main/java/org/apache/shardingsphere/infra/database/firebird/metadata/database/FirebirdDatabaseMetaData.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.infra.database.firebird.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.IdentifierNamePatternType;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierPatternType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.transaction.DialectTransactionOption;
/**
@@ -39,8 +39,8 @@ public final class FirebirdDatabaseMetaData implements
DialectDatabaseMetaData {
}
@Override
- public IdentifierNamePatternType getIdentifierPatternType() {
- return IdentifierNamePatternType.UPPER_CASE;
+ public IdentifierPatternType getIdentifierPatternType() {
+ return IdentifierPatternType.UPPER_CASE;
}
@Override
diff --git
a/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/metadata/database/OpenGaussDatabaseMetaData.java
b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/metadata/database/OpenGaussDatabaseMetaData.java
index 56fec461445..e35c7e73f09 100644
---
a/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/metadata/database/OpenGaussDatabaseMetaData.java
+++
b/infra/database/type/opengauss/src/main/java/org/apache/shardingsphere/infra/database/opengauss/metadata/database/OpenGaussDatabaseMetaData.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.index.DialectIndexOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DialectSchemaOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.table.DialectDriverQuerySystemCatalogOption;
-import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierNamePatternType;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierPatternType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.transaction.DialectTransactionOption;
import
org.apache.shardingsphere.infra.database.opengauss.metadata.database.option.OpenGaussDataTypeOption;
import
org.apache.shardingsphere.infra.database.opengauss.metadata.database.option.OpenGaussSchemaOption;
@@ -73,8 +73,8 @@ public final class OpenGaussDatabaseMetaData implements
DialectDatabaseMetaData
}
@Override
- public IdentifierNamePatternType getIdentifierPatternType() {
- return IdentifierNamePatternType.LOWER_CASE;
+ public IdentifierPatternType getIdentifierPatternType() {
+ return IdentifierPatternType.LOWER_CASE;
}
@Override
diff --git
a/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/metadata/database/OracleDatabaseMetaData.java
b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/metadata/database/OracleDatabaseMetaData.java
index e81e2fdc82c..07145fc6406 100644
---
a/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/metadata/database/OracleDatabaseMetaData.java
+++
b/infra/database/type/oracle/src/main/java/org/apache/shardingsphere/infra/database/oracle/metadata/database/OracleDatabaseMetaData.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.datatype.DialectDataTypeOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.index.DialectIndexOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DialectSchemaOption;
-import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierNamePatternType;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierPatternType;
import
org.apache.shardingsphere.infra.database.oracle.metadata.database.option.OracleDataTypeOption;
import
org.apache.shardingsphere.infra.database.oracle.metadata.database.option.OracleSchemaOption;
@@ -62,8 +62,8 @@ public final class OracleDatabaseMetaData implements
DialectDatabaseMetaData {
}
@Override
- public IdentifierNamePatternType getIdentifierPatternType() {
- return IdentifierNamePatternType.UPPER_CASE;
+ public IdentifierPatternType getIdentifierPatternType() {
+ return IdentifierPatternType.UPPER_CASE;
}
@Override
diff --git
a/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/metadata/database/PostgreSQLDatabaseMetaData.java
b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/metadata/database/PostgreSQLDatabaseMetaData.java
index 517b9c54eec..cabc1e80fd0 100644
---
a/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/metadata/database/PostgreSQLDatabaseMetaData.java
+++
b/infra/database/type/postgresql/src/main/java/org/apache/shardingsphere/infra/database/postgresql/metadata/database/PostgreSQLDatabaseMetaData.java
@@ -23,7 +23,7 @@ import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.datatype.DialectDataTypeOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.index.DialectIndexOption;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.schema.DialectSchemaOption;
-import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierNamePatternType;
+import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.IdentifierPatternType;
import
org.apache.shardingsphere.infra.database.core.metadata.database.metadata.option.transaction.DialectTransactionOption;
import
org.apache.shardingsphere.infra.database.postgresql.metadata.database.option.PostgreSQLDataTypeOption;
import
org.apache.shardingsphere.infra.database.postgresql.metadata.database.option.PostgreSQLSchemaOption;
@@ -59,8 +59,8 @@ public final class PostgreSQLDatabaseMetaData implements
DialectDatabaseMetaData
}
@Override
- public IdentifierNamePatternType getIdentifierPatternType() {
- return IdentifierNamePatternType.LOWER_CASE;
+ public IdentifierPatternType getIdentifierPatternType() {
+ return IdentifierPatternType.LOWER_CASE;
}
@Override
