Skip to content

Commit

Permalink
Merge branch '0906' of github.com:a364176773/seata into 0906
Browse files Browse the repository at this point in the history
  • Loading branch information
funky-eyes committed Sep 6, 2022
2 parents 4101bc8 + f9f9550 commit 6de7b0f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
3 changes: 3 additions & 0 deletions changes/en-us/develop.md
Expand Up @@ -14,6 +14,8 @@ Add changes here for all PR submitted to the develop branch.
- [[#4838](https://github.com/seata/seata/pull/4838)] fix when use Statement.executeBatch() can not generate undo log
- [[#4779](https://github.com/seata/seata/pull/4779)] fix and support Apache Dubbo 3
- [[#4912](https://github.com/seata/seata/pull/4912)] fix mysql InsertOnDuplicateUpdate column case is different and cannot be matched
- [[#4543](https://github.com/seata/seata/pull/4543)] fix support Oracle nclob types


### optimize:
- [[#4774](https://github.com/seata/seata/pull/4774)] optimize mysql8 dependencies for seataio/seata-server image
Expand Down Expand Up @@ -47,5 +49,6 @@ Thanks to these contributors for their code commits. Please report an unintended
- [yujianfei1986](https://github.com/yujianfei1986)
- [Bughue](https://github.com/Bughue)
- [AlbumenJ](https://github.com/AlbumenJ)
- [doubleDimple](https://github.com/doubleDimple)

Also, we receive many valuable issues, questions and advices from our community. Thanks for you all.
2 changes: 2 additions & 0 deletions changes/zh-cn/develop.md
Expand Up @@ -14,6 +14,7 @@
- [[#4838](https://github.com/seata/seata/pull/4838)] 修复使用 Statement.executeBatch() 时无法生成undo log 的问题
- [[#4779](https://github.com/seata/seata/pull/4779)] 修复支持 Apache Dubbo 3 版本
- [[#4912](https://github.com/seata/seata/pull/4912)] 修复mysql InsertOnDuplicateUpdate 列名大小写不一致无法正确匹配
- [[#4543](https://github.com/seata/seata/pull/4543)] 修复对 Oracle 数据类型nclob的支持

### optimize:
- [[#4774](https://github.com/seata/seata/pull/4774)] 优化 seataio/seata-server 镜像中的 mysql8 依赖
Expand Down Expand Up @@ -47,5 +48,6 @@
- [yujianfei1986](https://github.com/yujianfei1986)
- [Bughue](https://github.com/Bughue)
- [AlbumenJ](https://github.com/AlbumenJ)
- [doubleDimple](https://github.com/doubleDimple)

同时,我们收到了社区反馈的很多有价值的issue和建议,非常感谢大家。
Expand Up @@ -172,7 +172,7 @@ protected void undoPrepare(PreparedStatement undoPST, ArrayList<Field> undoValue
} else {
undoPST.setObject(undoIndex, null);
}
} else if (type == JDBCType.CLOB.getVendorTypeNumber()) {
} else if (type == JDBCType.CLOB.getVendorTypeNumber() || type == JDBCType.NCLOB.getVendorTypeNumber()) {
SerialClob serialClob = (SerialClob) value;
if (serialClob != null) {
undoPST.setClob(undoIndex, serialClob.getCharacterStream());
Expand Down

0 comments on commit 6de7b0f

Please sign in to comment.