You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2025/11/08 12:41:00 UTC
(doris) branch branch-4.0 updated: branch-4.0: [fix](jdbc catalog) Compatible with different versions of `zeroDateTimeBehavior=convertToNull` writing method #57682 (#57732)
This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.0 by this push:
new 219b8f84bc8 branch-4.0: [fix](jdbc catalog) Compatible with different versions of `zeroDateTimeBehavior=convertToNull` writing method #57682 (#57732)
219b8f84bc8 is described below
commit 219b8f84bc89c70f270c9f767c834b0cb68b452f
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Sat Nov 8 20:40:51 2025 +0800
branch-4.0: [fix](jdbc catalog) Compatible with different versions of `zeroDateTimeBehavior=convertToNull` writing method #57682 (#57732)
Cherry-picked from #57682
Co-authored-by: zy-kkk <zh...@gmail.com>
---
.../org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java
index 195b71a4515..0c18ebaf7b7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/jdbc/client/JdbcMySQLClient.java
@@ -312,8 +312,10 @@ public class JdbcMySQLClient extends JdbcClient {
}
private boolean isConvertDatetimeToNull(JdbcClientConfig jdbcClientConfig) {
- // Check if the JDBC URL contains "zeroDateTimeBehavior=convertToNull".
- return jdbcClientConfig.getJdbcUrl().contains("zeroDateTimeBehavior=convertToNull");
+ // Check if the JDBC URL contains "zeroDateTimeBehavior=convertToNull" or "zeroDateTimeBehavior=convert_to_null"
+ String jdbcUrl = jdbcClientConfig.getJdbcUrl().toLowerCase();
+ return jdbcUrl.contains("zerodatetimebehavior=converttonull")
+ || jdbcUrl.contains("zerodatetimebehavior=convert_to_null");
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org