From fb8fd66a08294bdb2e5fc41159a938f701b25824 Mon Sep 17 00:00:00 2001 From: Alexey Rogachev Date: Tue, 8 Nov 2016 18:07:26 +0600 Subject: [PATCH] Fixes #12939: Hard coded table names for MSSQL in RBAC migration --- framework/CHANGELOG.md | 6 +----- framework/rbac/migrations/m140506_102106_rbac_init.php | 8 ++++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 25b5d75248..bda9583aa4 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -25,13 +25,9 @@ Yii Framework 2 Change Log - Enh #12816: Added `columnSchemaClass` option for `yii\db\Schema` which adds ability to specify custom `yii\db\ColumnSchema` class (nanodesu88) - Enh #12881: Added `removeValue` method to `yii\helpers\BaseArrayHelper` (nilsburg) - Enh: Added constants for specifying `yii\validators\CompareValidator::$type` (cebe) - --- Enh #12748: Added Migration tool automatic generation reference column for foreignKey (MKiselev) -- Enh #12790: Added `scrollToErrorOffset` option for `ActiveForm` which adds ability to specify offset in pixels when scrolling to error (mg-code) -- Enh #12748: Migration generator now tries to fetch reference column name for foreignKey from schema if it's not set explicitly (MKiselev) -- Bug #4113: Error page stacktrace was generating links to private methods which are not part of the API docs (samdark) - Enh #12901: Added `getDefaultHelpHeader` method to the `yii\console\controllers\HelpController` class to be able to override default help header in a class heir (diezztsk) - Bug #12904: Fixed lowercase table name in migrations (zlakomanoff) +- Bug #12939: Hard coded table names for MSSQL in RBAC migration (arogachev) 2.0.10 October 20, 2016 ----------------------- diff --git a/framework/rbac/migrations/m140506_102106_rbac_init.php b/framework/rbac/migrations/m140506_102106_rbac_init.php index fe44cc3c86..503abf8399 100644 --- a/framework/rbac/migrations/m140506_102106_rbac_init.php +++ b/framework/rbac/migrations/m140506_102106_rbac_init.php @@ -103,10 +103,10 @@ class m140506_102106_rbac_init extends \yii\db\Migration BEGIN IF @old_name <> @new_name BEGIN - ALTER TABLE auth_item_child NOCHECK CONSTRAINT FK__auth_item__child; - UPDATE auth_item_child SET child = @new_name WHERE child = @old_name; + ALTER TABLE {$authManager->itemChildTable} NOCHECK CONSTRAINT FK__auth_item__child; + UPDATE {$authManager->itemChildTable} SET child = @new_name WHERE child = @old_name; END - UPDATE auth_item + UPDATE {$authManager->itemTable} SET name = (SELECT name FROM inserted), type = (SELECT type FROM inserted), description = (SELECT description FROM inserted), @@ -117,7 +117,7 @@ class m140506_102106_rbac_init extends \yii\db\Migration WHERE name IN (SELECT name FROM deleted) IF @old_name <> @new_name BEGIN - ALTER TABLE auth_item_child CHECK CONSTRAINT FK__auth_item__child; + ALTER TABLE {$authManager->itemChildTable} CHECK CONSTRAINT FK__auth_item__child; END END ELSE