refactor: 优化

zhou-hao · zhou-hao · commit 50cf4eb860f2 · 2025-11-10T09:40:29.000+08:00
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/ClobValueCodec.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/codec/ClobValueCodec.java
@@ -8,6 +8,7 @@
 import org.hswebframework.ezorm.rdb.executor.NullValue;
 import org.hswebframework.ezorm.rdb.metadata.DataType;
 import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
+import org.hswebframework.ezorm.rdb.supports.oracle.OracleDialect;
 import org.hswebframework.ezorm.rdb.utils.FeatureUtils;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -23,7 +24,7 @@ public class ClobValueCodec implements ValueCodec {
 
     public static final ClobValueCodec INSTANCE = new ClobValueCodec();
 
-    static boolean isClobType(DataType type) {
+    public static boolean isClobType(DataType type) {
         return type.getSqlType() == JDBCType.LONGVARCHAR ||
             type.getSqlType() == JDBCType.LONGNVARCHAR ||
             type.getSqlType() == JDBCType.CLOB;
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/jdbc/JdbcSqlExecutorHelper.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/jdbc/JdbcSqlExecutorHelper.java
@@ -38,12 +38,7 @@ protected static void preparedStatementParameter(PreparedStatement statement, Ob
             if (object == null) {
                 statement.setNull(index++, Types.NULL);
             } else if (object instanceof NullValue nullValue) {
-                Class<?> javaType = nullValue.getType();
-                if (LongCharSequence.class == javaType) {
-                    statement.setCharacterStream(index++, new StringReader(""));
-                } else {
-                    statement.setNull(index++, nullValue.getDataType().getSqlType().getVendorTypeNumber());
-                }
+                statement.setNull(index++, nullValue.getDataType().getSqlType().getVendorTypeNumber());
             } else if (object instanceof Date) {
                 statement.setTimestamp(index++, new java.sql.Timestamp(((Date) object).getTime()));
             } else if (object instanceof byte[] b) {
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/reactive/r2dbc/R2dbcReactiveSqlExecutor.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/executor/reactive/r2dbc/R2dbcReactiveSqlExecutor.java
@@ -252,11 +252,7 @@ protected Statement prepareStatement(Statement statement, SqlRequest request) {
             if (parameter == null) {
                 bindNull(statement, index, String.class);
             } else if (parameter instanceof NullValue nullValue) {
-                Class<?> javaType = nullValue.getType();
-                if (javaType == LongCharSequence.class) {
-                    javaType = Clob.class;
-                }
-                bindNull(statement, index, javaType);
+                bindNull(statement, index, nullValue.getType());
             } else {
                 // convert clob
                 if (parameter instanceof LongCharSequence cb) {
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/supports/oracle/OracleBatchUpsertOperator.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/supports/oracle/OracleBatchUpsertOperator.java
@@ -1,8 +1,11 @@
 package org.hswebframework.ezorm.rdb.supports.oracle;
 
+import io.r2dbc.mssql.codec.ClobCodec;
 import lombok.AllArgsConstructor;
 import org.hswebframework.ezorm.core.RuntimeDefaultValue;
 import org.hswebframework.ezorm.core.param.Term;
+import org.hswebframework.ezorm.rdb.codec.ClobValueCodec;
+import org.hswebframework.ezorm.rdb.codec.LongCharSequence;
 import org.hswebframework.ezorm.rdb.executor.NullValue;
 import org.hswebframework.ezorm.rdb.executor.SqlRequest;
 import org.hswebframework.ezorm.rdb.executor.SyncSqlExecutor;
@@ -188,9 +191,15 @@ public SqlRequest build(InsertOperatorParameter parameter) {
                             value = NullValue.of(column.getType());
                         }
                     }
-
+                    value = column.encode(value);
+                    // 适配 clob字段 不支持设置null
+                    if (valueSize > 1 && (value == null || value instanceof NullValue)) {
+                        if (ClobValueCodec.isClobType(column.getType())) {
+                            value = new LongCharSequence("");
+                        }
+                    }
                     fragments.addSql("? as ", column.getQuoteName())
-                             .addParameter(column.encode(value));
+                             .addParameter(value);
                     valueIndex++;
                 }
 
diff --git a/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/supports/oracle/OracleInsertSqlBuilder.java b/hsweb-easy-orm-rdb/src/main/java/org/hswebframework/ezorm/rdb/supports/oracle/OracleInsertSqlBuilder.java
@@ -3,6 +3,8 @@
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.core.RuntimeDefaultValue;
+import org.hswebframework.ezorm.rdb.codec.ClobValueCodec;
+import org.hswebframework.ezorm.rdb.codec.LongCharSequence;
 import org.hswebframework.ezorm.rdb.executor.NullValue;
 import org.hswebframework.ezorm.rdb.executor.SqlRequest;
 import org.hswebframework.ezorm.rdb.metadata.RDBColumnMetadata;
@@ -126,7 +128,14 @@ public SqlRequest build(InsertOperatorParameter parameter) {
                 if (value == null) {
                     value = NullValue.of(column.getType());
                 }
-                valuesSql.add(SqlFragments.QUESTION_MARK).addParameter(column.encode(value));
+                value = column.encode(value);
+                // 适配 clob字段 不支持设置null
+                if (valueSize > 1 && (value == null || value instanceof NullValue)) {
+                    if (ClobValueCodec.isClobType(column.getType())) {
+                        value = new LongCharSequence("");
+                    }
+                }
+                valuesSql.add(SqlFragments.QUESTION_MARK).addParameter(value);
             }
             intoSql.add(SqlFragments.RIGHT_BRACKET);
             valuesSql.add(SqlFragments.RIGHT_BRACKET);
diff --git a/hsweb-easy-orm-rdb/src/test/java/org/hswebframework/ezorm/rdb/supports/oracle/OracleConnectionProvider.java b/hsweb-easy-orm-rdb/src/test/java/org/hswebframework/ezorm/rdb/supports/oracle/OracleConnectionProvider.java
@@ -23,25 +23,23 @@ public class OracleConnectionProvider implements ConnectionProvider {
     static {
         try {
             Class.forName("oracle.jdbc.driver.OracleDriver");
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-        GenericContainer<?> container = Containers.newOracle();
-
-        container.start();
-        port = container.getMappedPort(1521);
-
-        String username = System.getProperty("oracle.username", "system");
-        String password = System.getProperty("oracle.password", "oracle");
-        String url = System.getProperty("oracle.url", "127.0.0.1:" + port);
-        String db = System.getProperty("oracle.db", "orcl");
-        connectionSupplier = () -> DriverManager.getConnection("jdbc:oracle:thin:@" + url + ":" + db, username, password);
-        for (int i = 0; i < 10; i++) {
-            try {
+
+            GenericContainer<?> container = Containers.newOracle();
+
+            container.start();
+            port = container.getMappedPort(1521);
+
+            String username = System.getProperty("oracle.username", "system");
+            String password = System.getProperty("oracle.password", "oracle");
+            String url = System.getProperty("oracle.url", "127.0.0.1:" + port);
+            String db = System.getProperty("oracle.db", "orcl");
+            connectionSupplier = () -> DriverManager.getConnection("jdbc:oracle:thin:@" + url + ":" + db, username, password);
+            for (int i = 0; i < 10; i++) {
                 connectionQueue.add(connectionSupplier.call());
-            } catch (Exception e) {
-                throw new RuntimeException(e);
+
             }
+        } catch (Throwable e) {
+            e.printStackTrace();
         }
     }
 
diff --git a/hsweb-easy-orm-rdb/src/test/java/org/hswebframework/ezorm/rdb/supports/oracle/OracleReactiveTests.java b/hsweb-easy-orm-rdb/src/test/java/org/hswebframework/ezorm/rdb/supports/oracle/OracleReactiveTests.java
@@ -36,7 +36,7 @@ protected Dialect getDialect() {
     protected ReactiveSqlExecutor getSqlExecutor() {
 
         return new TestJdbcReactiveSqlExecutor(new OracleConnectionProvider());
-
+//
 //        return new TestReactiveSqlExecutor(":",new OracleR2dbcConnectionProvider()){
 //            @Override
 //            protected void bindNull(Statement statement, int index, Class type) {
