bugfix: jdbc parameter set null (apache#1879)

wangliang181230 · Nov 8, 2019 · 6e7d88c · 6e7d88c
1 parent 4f28687
commit 6e7d88c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,8 @@ dependency-reduced-pom.xml
 /server/sessionStore/
 /server/db_store/
 /sessionStore/
+/test/sessionStore/
+/distribution/sessionStore/
 
 # system ignore
 .DS_Store

diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/BaseMySQLRecognizer.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/BaseMySQLRecognizer.java
@@ -26,6 +26,7 @@
 import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
 
 import io.seata.rm.datasource.ParametersHolder;
+import io.seata.rm.datasource.sql.struct.Null;
 
 /**
  * @author will
@@ -52,7 +53,8 @@ public boolean visit(SQLVariantRefExpr x) {
                         oneParamValues.stream().forEach(t -> paramAppenderList.add(new ArrayList<>()));
                     }
                     for (int i = 0; i < oneParamValues.size(); i++) {
-                        paramAppenderList.get(i).add(oneParamValues.get(i));
+                        Object o = oneParamValues.get(i);
+                        paramAppenderList.get(i).add(o instanceof Null ? null : o);
                     }
 
                 }

diff --git a/...atasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/BaseOracleRecognizer.java b/...atasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/BaseOracleRecognizer.java
@@ -27,6 +27,7 @@
 
 import io.seata.rm.datasource.ParametersHolder;
 import io.seata.rm.datasource.sql.druid.BaseRecognizer;
+import io.seata.rm.datasource.sql.struct.Null;
 
 /**
  * @author will
@@ -53,7 +54,8 @@ public boolean visit(SQLVariantRefExpr x) {
                         oneParamValues.stream().forEach(t -> paramAppenderList.add(new ArrayList<>()));
                     }
                     for (int i = 0; i < oneParamValues.size(); i++) {
-                        paramAppenderList.get(i).add(oneParamValues.get(i));
+                        Object o = oneParamValues.get(i);
+                        paramAppenderList.get(i).add(o instanceof Null ? null : o);
                     }
 
                 }