Skip to content

Commit 140f71f

Browse files
author
Cari Spruiell
committed
MAGETWO-31979: [Remove TODOs] Authorization
- removed TODOs from install script
1 parent 6058488 commit 140f71f

File tree

1 file changed

+2
-20
lines changed

1 file changed

+2
-20
lines changed

app/code/Magento/Authorization/sql/authorization_setup/install-2.0.0.php

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,7 @@
88

99
$installer->startSetup();
1010

11-
if ($installer->getConnection()->isTableExists($installer->getTable('admin_role'))) {
12-
/**
13-
* Rename existing 'admin_role' table into 'authorization_role' (to avoid forcing Magento re-installation)
14-
* TODO: This conditional logic can be removed some time after pull request is delivered to the mainline
15-
*/
16-
$installer->getConnection()->renameTable(
17-
$installer->getTable('admin_role'),
18-
$installer->getTable('authorization_role')
19-
);
20-
} elseif (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) {
11+
if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) {
2112
/**
2213
* Create table 'authorization_role'
2314
*/
@@ -83,16 +74,7 @@
8374
$installer->getConnection()->createTable($table);
8475
}
8576

86-
if ($installer->getConnection()->isTableExists($installer->getTable('admin_rule'))) {
87-
/**
88-
* Rename existing 'admin_rule' table into 'authorization_rule' (to avoid forcing Magento re-installation)
89-
* TODO: This conditional logic can be removed some time after pull request is delivered to the mainline
90-
*/
91-
$installer->getConnection()->renameTable(
92-
$installer->getTable('admin_rule'),
93-
$installer->getTable('authorization_rule')
94-
);
95-
} elseif (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) {
77+
if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) {
9678
/**
9779
* Create table 'authorization_rule'
9880
*/

0 commit comments

Comments
 (0)