reslove conflict

reslove conflict

Author: chakkk309

parser/sql/dialect/mysql/src/main/antlr4/imports/mysql/DDLStatement.g4

@@ -682,7 +682,7 @@ validStatement
     | insert | replace | update | delete | select | call
     | createView | prepare | executeStmt | commit | deallocate
     | setVariable | beginStatement | declareStatement | flowControlStatement | cursorStatement | conditionHandlingStatement
-    | setStatement | showStatement | startTransaction | rollback | commit) SEMI_?
+    | setStatement | showStatement | startTransaction | rollback | commit | show) SEMI_?
     ;
 
 showStatement

test/it/parser/src/main/resources/case/ddl/create-procedure.xml

@@ -126,5 +126,4 @@
             <sql-statement start-index="22" stop-index="54" statement-class-simple-name="MySQLSetStatement" />
         </sql-statements>
     </create-procedure>
-    <create-procedure sql-case-id="create_procedure_if_not_exists" />
 </sql-parser-test-cases>

test/it/parser/src/main/resources/sql/supported/ddl/create-procedure.xml

@@ -49,7 +49,6 @@
     <sql-case id="create_plsql_block" value="DECLARE warehouse NUMBER := 1;   ground    NUMBER := 1;   insured   NUMBER := 1;   result    NUMBER; BEGIN   SELECT BIN_TO_NUM(warehouse, ground, insured) INTO result FROM DUAL;   UPDATE orders SET order_status = result WHERE order_id = 2441; END;" db-types="Oracle" />
     <sql-case id="create_procedure_with_insert_into_values" value="create procedure T522_PROC (i int =10) as begin insert into T522 (ROW_INT) values (:i); end" db-types="Firebird"/>
     <sql-case id="create_procedure_with_declare_and_cursor_for_in_select_and_open" value="CREATE PROCEDURE F865_PROC (offset_value INT, page_size INT) as DECLARE catalog_page CURSOR FOR (SELECT * FROM company ORDER BY namecompany OFFSET :offset_value ROWS FETCH NEXT :page_size ROWS ONLY); BEGIN OPEN catalog_page; END" db-types="Firebird"/>
-    <sql-case id="create_procedure_if_not_exists" value="CREATE PROCEDURE IF NOT EXISTS sp1() BEGIN END;" db-types="MySQL" />
     <sql-case id="create_procedure_with_transaction" value="CREATE PROCEDURE proc1() BEGIN START TRANSACTION; CREATE TABLE t1 (f1 INT); ROLLBACK; START TRANSACTION; CREATE TABLE t1 (f1 INT); COMMIT; END;" db-types="MySQL" />
     <sql-case id="create_procedure_with_charset_parameters_and_insert" value="CREATE PROCEDURE bug18293 (IN ins1 CHAR(50), IN ins2 CHAR(50) CHARACTER SET cp932, IN ind DECIMAL(10,2)) BEGIN INSERT INTO t4 VALUES (ins1, ins2, ind); END;" db-types="MySQL" />
     <sql-case id="create_procedure_with_create_table_and_show_create_table_schema" value="CREATE PROCEDURE mysqltest2.p2() BEGIN CREATE TABLE t2(col1 VARCHAR(10)); SHOW CREATE TABLE t2; END;" db-types="MySQL" />