You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2025/04/13 12:54:17 UTC
(shardingsphere) branch master updated: Move method position of DialectDatabaseMetaData.getDefaultNullsOrderType() (#35184)
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 701d05e843b Move method position of DialectDatabaseMetaData.getDefaultNullsOrderType() (#35184)
701d05e843b is described below
commit 701d05e843b3f767e00d6e54be2d0e1de6096312
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sun Apr 13 20:54:12 2025 +0800
Move method position of DialectDatabaseMetaData.getDefaultNullsOrderType() (#35184)
---
.../database/metadata/DialectDatabaseMetaData.java | 16 ++++++++--------
.../mysql/metadata/database/MySQLDatabaseMetaData.java | 8 ++++----
.../metadata/database/OpenGaussDatabaseMetaData.java | 8 ++++----
.../oracle/metadata/database/OracleDatabaseMetaData.java | 8 ++++----
.../metadata/database/PostgreSQLDatabaseMetaData.java | 8 ++++----
5 files changed, 24 insertions(+), 24 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 bcfbed8940d..100571dcc29 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
@@ -43,6 +43,14 @@ public interface DialectDatabaseMetaData extends DatabaseTypedSPI {
*/
QuoteCharacter getQuoteCharacter();
+ /**
+ * Get default nulls order type.
+ *
+ * @return default nulls order type
+ */
+ // TODO Reuse java.sql.DatabaseMetaData.nullsAreSortedHigh and java.sql.DatabaseMetaData.nullsAreSortedLow
+ NullsOrderType getDefaultNullsOrderType();
+
/**
* Get data type option.
*
@@ -52,14 +60,6 @@ public interface DialectDatabaseMetaData extends DatabaseTypedSPI {
return new DefaultDataTypeOption();
}
- /**
- * Get default nulls order type.
- *
- * @return default nulls order type
- */
- // TODO Reuse java.sql.DatabaseMetaData.nullsAreSortedHigh and java.sql.DatabaseMetaData.nullsAreSortedLow
- NullsOrderType getDefaultNullsOrderType();
-
/**
* Is schema feature available.
*
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 f8fd7fa696b..e1a3d3026ce 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
@@ -36,13 +36,13 @@ public final class MySQLDatabaseMetaData implements DialectDatabaseMetaData {
}
@Override
- public DialectDataTypeOption getDataTypeOption() {
- return new MySQLDataTypeOption();
+ public NullsOrderType getDefaultNullsOrderType() {
+ return NullsOrderType.LOW;
}
@Override
- public NullsOrderType getDefaultNullsOrderType() {
- return NullsOrderType.LOW;
+ public DialectDataTypeOption getDataTypeOption() {
+ return new MySQLDataTypeOption();
}
@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 3be6c70ac08..c065f3203b0 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
@@ -37,13 +37,13 @@ public final class OpenGaussDatabaseMetaData implements DialectDatabaseMetaData
}
@Override
- public DialectDataTypeOption getDataTypeOption() {
- return new OpenGaussDataTypeOption();
+ public NullsOrderType getDefaultNullsOrderType() {
+ return NullsOrderType.HIGH;
}
@Override
- public NullsOrderType getDefaultNullsOrderType() {
- return NullsOrderType.HIGH;
+ public DialectDataTypeOption getDataTypeOption() {
+ return new OpenGaussDataTypeOption();
}
@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 4cd7f85e948..74778e0e0ba 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
@@ -38,13 +38,13 @@ public final class OracleDatabaseMetaData implements DialectDatabaseMetaData {
}
@Override
- public DialectDataTypeOption getDataTypeOption() {
- return new OracleDataTypeOption();
+ public NullsOrderType getDefaultNullsOrderType() {
+ return NullsOrderType.HIGH;
}
@Override
- public NullsOrderType getDefaultNullsOrderType() {
- return NullsOrderType.HIGH;
+ public DialectDataTypeOption getDataTypeOption() {
+ return new OracleDataTypeOption();
}
@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 8c7702779ba..ab3676104bf 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
@@ -37,13 +37,13 @@ public final class PostgreSQLDatabaseMetaData implements DialectDatabaseMetaData
}
@Override
- public DialectDataTypeOption getDataTypeOption() {
- return new PostgreSQLDataTypeOption();
+ public NullsOrderType getDefaultNullsOrderType() {
+ return NullsOrderType.HIGH;
}
@Override
- public NullsOrderType getDefaultNullsOrderType() {
- return NullsOrderType.HIGH;
+ public DialectDataTypeOption getDataTypeOption() {
+ return new PostgreSQLDataTypeOption();
}
@Override