From bdb551ffbc1b47b938ad6784b88d613130165430 Mon Sep 17 00:00:00 2001
From: Kanthi Subramanian <subkanthi@gmail.com>
Date: Fri, 10 May 2024 15:58:03 -0400
Subject: [PATCH] Upgraded to debezium 2.7.0 and update new function definition
 for MySQLValueConverter and updated interface for MySQLDDLBaseListener

---
 sink-connector-lightweight/pom.xml            |  2 +-
 .../parser/MySQLDDLParserBaseListener.java    | 30 +++++++++++++++++++
 .../embedded/parser/DataTypeConverter.java    |  9 +++---
 sink-connector/pom.xml                        |  2 +-
 4 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/sink-connector-lightweight/pom.xml b/sink-connector-lightweight/pom.xml
index 136498017..48ccc9a2a 100644
--- a/sink-connector-lightweight/pom.xml
+++ b/sink-connector-lightweight/pom.xml
@@ -13,7 +13,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.debezium>2.5.0.Beta1</version.debezium>
+        <version.debezium>2.7.0.Alpha1</version.debezium>
         <version.junit>5.9.1</version.junit>
         <version.testcontainers>1.19.1</version.testcontainers>
         <version.checkstyle.plugin>3.1.1</version.checkstyle.plugin>
diff --git a/sink-connector-lightweight/src/main/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/MySQLDDLParserBaseListener.java b/sink-connector-lightweight/src/main/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/MySQLDDLParserBaseListener.java
index bbc266578..1fe8dfaf9 100644
--- a/sink-connector-lightweight/src/main/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/MySQLDDLParserBaseListener.java
+++ b/sink-connector-lightweight/src/main/java/com/altinity/clickhouse/debezium/embedded/ddl/parser/MySQLDDLParserBaseListener.java
@@ -1288,6 +1288,36 @@ public void exitPartitionFunctionList(MySqlParser.PartitionFunctionListContext p
 
     }
 
+    @Override
+    public void enterPartitionSystemVersion(MySqlParser.PartitionSystemVersionContext partitionSystemVersionContext) {
+
+    }
+
+    @Override
+    public void exitPartitionSystemVersion(MySqlParser.PartitionSystemVersionContext partitionSystemVersionContext) {
+
+    }
+
+    @Override
+    public void enterPartitionSystemVersionDefinitions(MySqlParser.PartitionSystemVersionDefinitionsContext partitionSystemVersionDefinitionsContext) {
+
+    }
+
+    @Override
+    public void exitPartitionSystemVersionDefinitions(MySqlParser.PartitionSystemVersionDefinitionsContext partitionSystemVersionDefinitionsContext) {
+
+    }
+
+    @Override
+    public void enterPartitionSystemVersionDefinition(MySqlParser.PartitionSystemVersionDefinitionContext partitionSystemVersionDefinitionContext) {
+
+    }
+
+    @Override
+    public void exitPartitionSystemVersionDefinition(MySqlParser.PartitionSystemVersionDefinitionContext partitionSystemVersionDefinitionContext) {
+
+    }
+
     @Override
     public void enterSubPartitionFunctionHash(MySqlParser.SubPartitionFunctionHashContext subPartitionFunctionHashContext) {
 
diff --git a/sink-connector-lightweight/src/main/java/com/altinity/clickhouse/debezium/embedded/parser/DataTypeConverter.java b/sink-connector-lightweight/src/main/java/com/altinity/clickhouse/debezium/embedded/parser/DataTypeConverter.java
index 69b6558c1..d6e5f39af 100644
--- a/sink-connector-lightweight/src/main/java/com/altinity/clickhouse/debezium/embedded/parser/DataTypeConverter.java
+++ b/sink-connector-lightweight/src/main/java/com/altinity/clickhouse/debezium/embedded/parser/DataTypeConverter.java
@@ -4,7 +4,7 @@
 import com.clickhouse.data.ClickHouseDataType;
 import io.debezium.antlr.DataTypeResolver;
 import io.debezium.config.CommonConnectorConfig;
-import io.debezium.connector.mysql.MySqlValueConverters;
+import io.debezium.connector.mysql.jdbc.MySqlValueConverters;
 import io.debezium.ddl.parser.mysql.generated.MySqlParser;
 import io.debezium.jdbc.JdbcValueConverters;
 import io.debezium.jdbc.TemporalPrecisionMode;
@@ -34,8 +34,8 @@ public static ClickHouseDataType convert(String columnName, MySqlParser.DataType
                 JdbcValueConverters.DecimalMode.PRECISE,
                 TemporalPrecisionMode.ADAPTIVE,
                 JdbcValueConverters.BigIntUnsignedMode.LONG,
-                CommonConnectorConfig.BinaryHandlingMode.BYTES
-        );
+                CommonConnectorConfig.BinaryHandlingMode.BYTES,
+                x ->x, CommonConnectorConfig.EventConvertingFailureHandlingMode.WARN);
 
 
         DataType dataType = initializeDataTypeResolver().resolveDataType(columnDefChild);
@@ -51,7 +51,8 @@ public static String convertToString(String columnName, int scale, int precision
                 JdbcValueConverters.DecimalMode.PRECISE,
                 TemporalPrecisionMode.ADAPTIVE,
                 JdbcValueConverters.BigIntUnsignedMode.LONG,
-                CommonConnectorConfig.BinaryHandlingMode.BYTES
+                CommonConnectorConfig.BinaryHandlingMode.BYTES,
+                x ->x, CommonConnectorConfig.EventConvertingFailureHandlingMode.WARN
         );
 
 
diff --git a/sink-connector/pom.xml b/sink-connector/pom.xml
index c4ab7edfa..fbaf25d8e 100644
--- a/sink-connector/pom.xml
+++ b/sink-connector/pom.xml
@@ -308,7 +308,7 @@
         <dependency>
             <groupId>io.debezium</groupId>
             <artifactId>debezium-core</artifactId>
-            <version>2.5.0.Beta1</version>
+            <version>2.7.0.Alpha1</version>
         </dependency>
 
         <dependency>