Skip to content

Commit 7cbdef2

Browse files
committed
reslove conflict
1 parent fb7afd6 commit 7cbdef2

File tree

2 files changed

+0
-2
lines changed

2 files changed

+0
-2
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,5 +126,4 @@
126126
<sql-statement start-index="22" stop-index="54" statement-class-simple-name="MySQLSetStatement" />
127127
</sql-statements>
128128
</create-procedure>
129-
<create-procedure sql-case-id="create_procedure_if_not_exists" />
130129
</sql-parser-test-cases>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
<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" />
5050
<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"/>
5151
<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"/>
52-
<sql-case id="create_procedure_if_not_exists" value="CREATE PROCEDURE IF NOT EXISTS sp1() BEGIN END;" db-types="MySQL" />
5352
<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" />
5453
<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" />
5554
<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" />

0 commit comments

Comments
 (0)