From 808ba719f4feccbb32c124f0f994ca02c2ddd515 Mon Sep 17 00:00:00 2001 From: Noemi Praml Date: Fri, 2 Sep 2022 11:44:41 +0200 Subject: [PATCH] Fix mariadb, mysql stored procedure usp_ebean_drop_column - reserved keywords (cherry picked from commit b0df1775092149b60e2ce9839be74a05f84cc2e3) --- .../io/ebeaninternal/dbmigration/builtin-extra-ddl.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml b/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml index 1212f1f4c..34d3f0177 100644 --- a/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml +++ b/ebean-ddl-generator/src/main/resources/io/ebeaninternal/dbmigration/builtin-extra-ddl.xml @@ -136,7 +136,7 @@ FETCH curs INTO c_fk_name; IF done THEN LEAVE read_loop; END IF; -SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP FOREIGN KEY ', c_fk_name); +SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP FOREIGN KEY ', c_fk_name); PREPARE stmt FROM @sql; EXECUTE stmt; END LOOP; @@ -155,7 +155,7 @@ delimiter $$ CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255)) BEGIN CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name); -SET @sql = CONCAT('ALTER TABLE ', p_table_name, ' DROP COLUMN ', p_column_name); +SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP COLUMN `', p_column_name, '`'); PREPARE stmt FROM @sql; EXECUTE stmt; END