From 44c5feaffed94cee90d0f278974c09c9174c4eb0 Mon Sep 17 00:00:00 2001 From: Ilyas Ahsan Date: Mon, 8 Jan 2024 10:16:30 +0700 Subject: [PATCH] DBZ-7259 Solve Parser Issue in MySQL Create Procedure add new line add new line DBZ-7259 Fix shouldParseDefiner unittest fix formatting fix formatting Revert "DBZ-7259 Fix shouldParseDefiner unittest" This reverts commit e7de21dfd1296467b48e9c140eea2f6c025877a6. Revert "DBZ-7259 Solve Parser Issue in MySQL Create Procedure" This reverts commit 91976c8714e2604e9412bf3f66e30023a9bcad08. DBZ-7259 Solve Parser Issue in MySQL Create Procedure add new line add new line DBZ-7259 Fix shouldParseDefiner unittest fix formatting fix formatting Revert "DBZ-7259 Fix shouldParseDefiner unittest" This reverts commit cfb2cd61bf40628754a56b4613954febd778b206. Revert "# This is a combination of 4 commits." This reverts commit 6d53494e53c91d774f0b2b76dba4dbfed590d64e. DBZ-7259 Solve Parser Issue in MySQL Create Procedure add new line add new line DBZ-7259 Fix shouldParseDefiner unittest fix formatting fix formatting Revert "DBZ-7259 Fix shouldParseDefiner unittest" This reverts commit e7de21dfd1296467b48e9c140eea2f6c025877a6. Revert "DBZ-7259 Solve Parser Issue in MySQL Create Procedure" This reverts commit 91976c8714e2604e9412bf3f66e30023a9bcad08. DBZ-7259 Solve Parser Issue in MySQL Create Procedure add new line add new line DBZ-7259 Fix shouldParseDefiner unittest fix formatting fix formatting Revert "DBZ-7259 Fix shouldParseDefiner unittest" This reverts commit cfb2cd61bf40628754a56b4613954febd778b206. Revert "# This is a combination of 4 commits." This reverts commit 6d53494e53c91d774f0b2b76dba4dbfed590d64e. resolve --- .../ddl/parser/mysql/generated/MySqlParser.g4 | 2 +- .../resources/mysql/examples/ddl_create.sql | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/debezium-ddl-parser/src/main/antlr4/io/debezium/ddl/parser/mysql/generated/MySqlParser.g4 b/debezium-ddl-parser/src/main/antlr4/io/debezium/ddl/parser/mysql/generated/MySqlParser.g4 index ff5fa1296..05651cc13 100644 --- a/debezium-ddl-parser/src/main/antlr4/io/debezium/ddl/parser/mysql/generated/MySqlParser.g4 +++ b/debezium-ddl-parser/src/main/antlr4/io/debezium/ddl/parser/mysql/generated/MySqlParser.g4 @@ -1132,7 +1132,7 @@ querySpecification querySpecificationNointo : SELECT selectSpec* selectElements - fromClause? groupByClause? havingClause? windowClause? orderByClause? limitClause? + fromClause? groupByClause? havingClause? windowClause? orderByClause? limitClause? unionStatement? ; unionParenthesis diff --git a/debezium-ddl-parser/src/test/resources/mysql/examples/ddl_create.sql b/debezium-ddl-parser/src/test/resources/mysql/examples/ddl_create.sql index bdb925a2a..b75bd1ebe 100644 --- a/debezium-ddl-parser/src/test/resources/mysql/examples/ddl_create.sql +++ b/debezium-ddl-parser/src/test/resources/mysql/examples/ddl_create.sql @@ -731,3 +731,20 @@ BEGIN LIMIT 500; END #end + +#begin +CREATE DEFINER=`PEUSER`@`%` PROCEDURE `SANDBOX`.`TEST_UNION`( ) +BEGIN +SELECT ID ,SUM(COL_1) AS SUM_COL_1 +FROM ( + (SELECT ID ,COL_1 FROM TEST_AUTO_INC + UNION ALL + SELECT ID ,COL_1 FROM TEST_AUTO_INC TAI) + UNION ALL + (SELECT ID ,COL_1 FROM TEST_AUTO_INC TAI) +)SS +GROUP BY 1 +ORDER BY 1 +; +END +#end