From d953644a3a4fa1a3689c43bd40c20b92ff5a23c1 Mon Sep 17 00:00:00 2001 From: James Britton Date: Mon, 1 Jun 2026 15:00:39 +0100 Subject: [PATCH] refactor: removed unnecessary procedure in mysql migration script --- .../PersistedGrantDb_IdS4_to_OpenIdS.sql | 90 +------------------ 1 file changed, 1 insertion(+), 89 deletions(-) diff --git a/src/EntityFramework.Storage/migrations/Migrator/scripts/MySql/PersistedGrantDb_IdS4_to_OpenIdS.sql b/src/EntityFramework.Storage/migrations/Migrator/scripts/MySql/PersistedGrantDb_IdS4_to_OpenIdS.sql index fc6d670e..894cfd6f 100644 --- a/src/EntityFramework.Storage/migrations/Migrator/scripts/MySql/PersistedGrantDb_IdS4_to_OpenIdS.sql +++ b/src/EntityFramework.Storage/migrations/Migrator/scripts/MySql/PersistedGrantDb_IdS4_to_OpenIdS.sql @@ -1,91 +1,7 @@ START TRANSACTION; -DROP PROCEDURE IF EXISTS `POMELO_BEFORE_DROP_PRIMARY_KEY`; -DELIMITER // -CREATE PROCEDURE `POMELO_BEFORE_DROP_PRIMARY_KEY`(IN `SCHEMA_NAME_ARGUMENT` VARCHAR(255), IN `TABLE_NAME_ARGUMENT` VARCHAR(255)) -BEGIN - DECLARE HAS_AUTO_INCREMENT_ID TINYINT(1); - DECLARE PRIMARY_KEY_COLUMN_NAME VARCHAR(255); - DECLARE PRIMARY_KEY_TYPE VARCHAR(255); - DECLARE SQL_EXP VARCHAR(1000); - SELECT COUNT(*) - INTO HAS_AUTO_INCREMENT_ID - FROM `information_schema`.`COLUMNS` - WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) - AND `TABLE_NAME` = TABLE_NAME_ARGUMENT - AND `Extra` = 'auto_increment' - AND `COLUMN_KEY` = 'PRI' - LIMIT 1; - IF HAS_AUTO_INCREMENT_ID THEN - SELECT `COLUMN_TYPE` - INTO PRIMARY_KEY_TYPE - FROM `information_schema`.`COLUMNS` - WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) - AND `TABLE_NAME` = TABLE_NAME_ARGUMENT - AND `COLUMN_KEY` = 'PRI' - LIMIT 1; - SELECT `COLUMN_NAME` - INTO PRIMARY_KEY_COLUMN_NAME - FROM `information_schema`.`COLUMNS` - WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) - AND `TABLE_NAME` = TABLE_NAME_ARGUMENT - AND `COLUMN_KEY` = 'PRI' - LIMIT 1; - SET SQL_EXP = CONCAT('ALTER TABLE `', (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())), '`.`', TABLE_NAME_ARGUMENT, '` MODIFY COLUMN `', PRIMARY_KEY_COLUMN_NAME, '` ', PRIMARY_KEY_TYPE, ' NOT NULL;'); - SET @SQL_EXP = SQL_EXP; - PREPARE SQL_EXP_EXECUTE FROM @SQL_EXP; - EXECUTE SQL_EXP_EXECUTE; - DEALLOCATE PREPARE SQL_EXP_EXECUTE; - END IF; -END // -DELIMITER ; - -DROP PROCEDURE IF EXISTS `POMELO_AFTER_ADD_PRIMARY_KEY`; -DELIMITER // -CREATE PROCEDURE `POMELO_AFTER_ADD_PRIMARY_KEY`(IN `SCHEMA_NAME_ARGUMENT` VARCHAR(255), IN `TABLE_NAME_ARGUMENT` VARCHAR(255), IN `COLUMN_NAME_ARGUMENT` VARCHAR(255)) -BEGIN - DECLARE HAS_AUTO_INCREMENT_ID INT(11); - DECLARE PRIMARY_KEY_COLUMN_NAME VARCHAR(255); - DECLARE PRIMARY_KEY_TYPE VARCHAR(255); - DECLARE SQL_EXP VARCHAR(1000); - SELECT COUNT(*) - INTO HAS_AUTO_INCREMENT_ID - FROM `information_schema`.`COLUMNS` - WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) - AND `TABLE_NAME` = TABLE_NAME_ARGUMENT - AND `COLUMN_NAME` = COLUMN_NAME_ARGUMENT - AND `COLUMN_TYPE` LIKE '%int%' - AND `COLUMN_KEY` = 'PRI'; - IF HAS_AUTO_INCREMENT_ID THEN - SELECT `COLUMN_TYPE` - INTO PRIMARY_KEY_TYPE - FROM `information_schema`.`COLUMNS` - WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) - AND `TABLE_NAME` = TABLE_NAME_ARGUMENT - AND `COLUMN_NAME` = COLUMN_NAME_ARGUMENT - AND `COLUMN_TYPE` LIKE '%int%' - AND `COLUMN_KEY` = 'PRI'; - SELECT `COLUMN_NAME` - INTO PRIMARY_KEY_COLUMN_NAME - FROM `information_schema`.`COLUMNS` - WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) - AND `TABLE_NAME` = TABLE_NAME_ARGUMENT - AND `COLUMN_NAME` = COLUMN_NAME_ARGUMENT - AND `COLUMN_TYPE` LIKE '%int%' - AND `COLUMN_KEY` = 'PRI'; - SET SQL_EXP = CONCAT('ALTER TABLE `', (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())), '`.`', TABLE_NAME_ARGUMENT, '` MODIFY COLUMN `', PRIMARY_KEY_COLUMN_NAME, '` ', PRIMARY_KEY_TYPE, ' NOT NULL AUTO_INCREMENT;'); - SET @SQL_EXP = SQL_EXP; - PREPARE SQL_EXP_EXECUTE FROM @SQL_EXP; - EXECUTE SQL_EXP_EXECUTE; - DEALLOCATE PREPARE SQL_EXP_EXECUTE; - END IF; -END // -DELIMITER ; - -CALL POMELO_BEFORE_DROP_PRIMARY_KEY(NULL, 'PersistedGrants'); -ALTER TABLE `PersistedGrants` DROP PRIMARY KEY; +ALTER TABLE `PersistedGrants` DROP PRIMARY KEY; ALTER TABLE `PersistedGrants` MODIFY COLUMN `Key` varchar(200) CHARACTER SET utf8mb4 NULL; - ALTER TABLE `PersistedGrants` ADD `Id` bigint NOT NULL AUTO_INCREMENT, ADD CONSTRAINT `PK_PersistedGrants` PRIMARY KEY (`Id`); @@ -146,9 +62,5 @@ CREATE INDEX `IX_ServerSideSessions_SubjectId` ON `ServerSideSessions` (`Subject INSERT INTO `__EFMigrationsHistory` (`MigrationId`, `ProductVersion`) VALUES ('20260601115707_Grants_to_OpenIdS', '9.0.16'); -DROP PROCEDURE `POMELO_BEFORE_DROP_PRIMARY_KEY`; - -DROP PROCEDURE `POMELO_AFTER_ADD_PRIMARY_KEY`; - COMMIT;