You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2026/03/16 07:02:22 UTC

(shardingsphere) branch master updated: update OracleDataTypeOption (#38454)

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

duanzhengqiang 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 cc6d8e49734 update OracleDataTypeOption (#38454)
cc6d8e49734 is described below

commit cc6d8e49734fe69f3552a6494e461a228b324d62
Author: Cong Hu <ia...@gmail.com>
AuthorDate: Mon Mar 16 15:02:16 2026 +0800

    update OracleDataTypeOption (#38454)
---
 .../metadata/database/option/OracleDataTypeOption.java   | 16 +++++++++++-----
 .../metadata/data/loader/OracleMetaDataLoaderTest.java   |  2 +-
 .../database/option/OracleDataTypeOptionTest.java        |  8 +++++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/metadata/database/option/OracleDataTypeOption.java b/database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/metadata/database/option/OracleDataTypeOption.java
index 1f28dc9a0a4..61b1a73b519 100644
--- a/database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/metadata/database/option/OracleDataTypeOption.java
+++ b/database/connector/dialect/oracle/src/main/java/org/apache/shardingsphere/database/connector/oracle/metadata/database/option/OracleDataTypeOption.java
@@ -32,6 +32,10 @@ public final class OracleDataTypeOption implements DialectDataTypeOption {
     
     private static final Map<String, Integer> EXTRA_DATA_TYPES;
     
+    private static final int BINARY_FLOAT = 100;
+    
+    private static final int BINARY_DOUBLE = 101;
+    
     private final DialectDataTypeOption delegate = new DefaultDataTypeOption();
     
     static {
@@ -40,17 +44,19 @@ public final class OracleDataTypeOption implements DialectDataTypeOption {
     
     private static Map<String, Integer> setUpExtraDataTypes() {
         Map<String, Integer> result = new CaseInsensitiveMap<>();
-        result.put("SMALLINT", Types.SMALLINT);
-        result.put("TINYINT", Types.TINYINT);
-        result.put("INT", Types.INTEGER);
+        result.put("SMALLINT", Types.NUMERIC);
+        result.put("TINYINT", Types.NUMERIC);
+        result.put("INT", Types.NUMERIC);
         result.put("TEXT", Types.LONGVARCHAR);
         result.put("CHARACTER", Types.CHAR);
         result.put("VARCHAR2", Types.VARCHAR);
         result.put("DATETIME", Types.TIMESTAMP);
         result.put("ROWID", Types.ROWID);
-        result.put("BINARY_DOUBLE", Types.DOUBLE);
-        result.put("BINARY_FLOAT", Types.FLOAT);
+        result.put("BINARY_DOUBLE", BINARY_DOUBLE);
+        result.put("BINARY_FLOAT", BINARY_FLOAT);
         result.put("NUMBER", Types.NUMERIC);
+        result.put("UROWID", Types.ROWID);
+        result.put("OTHER", Types.OTHER);
         return result;
     }
     
diff --git a/database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/metadata/data/loader/OracleMetaDataLoaderTest.java b/database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/metadata/data/loader/OracleMetaDataLoaderTest.java
index b2b1a34398b..3685a15b845 100644
--- a/database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/metadata/data/loader/OracleMetaDataLoaderTest.java
+++ b/database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/metadata/data/loader/OracleMetaDataLoaderTest.java
@@ -233,7 +233,7 @@ class OracleMetaDataLoaderTest {
     private ColumnMetaData getExpectedFirstColumnMetaData(final int majorVersion, final int minorVersion, final boolean withPrimaryKey) {
         boolean generated = majorVersion >= 12 && minorVersion >= 1;
         boolean caseSensitive = majorVersion >= 12 && minorVersion >= 2;
-        return new ColumnMetaData("id", Types.INTEGER, withPrimaryKey, generated, caseSensitive, true, false, false);
+        return new ColumnMetaData("id", Types.NUMERIC, withPrimaryKey, generated, caseSensitive, true, false, false);
     }
     
     private Collection<SchemaMetaData> loadMetaData(final DataSource dataSource) throws SQLException {
diff --git a/database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/metadata/database/option/OracleDataTypeOptionTest.java b/database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/metadata/database/option/OracleDataTypeOptionTest.java
index 58b7626b0b6..365df9e65ed 100644
--- a/database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/metadata/database/option/OracleDataTypeOptionTest.java
+++ b/database/connector/dialect/oracle/src/test/java/org/apache/shardingsphere/database/connector/oracle/metadata/database/option/OracleDataTypeOptionTest.java
@@ -30,15 +30,17 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class OracleDataTypeOptionTest {
     
+    private static final int BINARY_DOUBLE = 101;
+    
     private final DialectDataTypeOption dataTypeOption = new OracleDataTypeOption();
     
     @Test
     void assertGetExtraDataTypes() {
         Map<String, Integer> extraDataTypes = dataTypeOption.getExtraDataTypes();
-        assertThat(extraDataTypes.size(), is(11));
-        assertThat(extraDataTypes.get("SMALLINT"), is(Types.SMALLINT));
+        assertThat(extraDataTypes.size(), is(13));
+        assertThat(extraDataTypes.get("SMALLINT"), is(Types.NUMERIC));
         assertThat(extraDataTypes.get("TEXT"), is(Types.LONGVARCHAR));
-        assertThat(extraDataTypes.get("BINARY_DOUBLE"), is(Types.DOUBLE));
+        assertThat(extraDataTypes.get("BINARY_DOUBLE"), is(BINARY_DOUBLE));
     }
     
     @Test