| @@ -3,8 +3,9 @@ | ||
| 3 | 3 | declare(strict_types=1); |
| 4 | 4 | |
| 5 | 5 | namespace UserAccessManager\Setup\Update; |
| 6 | 6 | |
| 7 | +use UserAccessManager\Setup\Database\DatabaseUpdate; | |
| 7 | 8 | use UserAccessManager\UserGroup\UserGroup; |
| 8 | 9 | |
| 9 | 10 | class DatabaseUpdate6 extends DatabaseUpdate |
| 10 | 11 | { |
| @@ -17,28 +18,28 @@ | ||
| 17 | 18 | { |
| 18 | 19 | $dbAccessGroupToObject = $this->database->getUserGroupToObjectTable(); |
| 19 | 20 | |
| 20 | 21 | $dbGroupTypeColumn = $this->database->getVariable( |
| 21 | - "SHOW COLUMNS FROM `{$dbAccessGroupToObject}` | |
| 22 | + "SHOW COLUMNS FROM {$dbAccessGroupToObject} | |
| 22 | 23 | LIKE 'group_type'" |
| 23 | 24 | ); |
| 24 | 25 | |
| 25 | 26 | if ($dbGroupTypeColumn !== 'group_type') { |
| 26 | - $alterQuery = "ALTER TABLE `{$dbAccessGroupToObject}` | |
| 27 | - ADD `group_type` VARCHAR(32) NOT NULL AFTER `group_id`, | |
| 28 | - ADD `from_date` DATETIME NULL DEFAULT NULL, | |
| 29 | - ADD `to_date` DATETIME NULL DEFAULT NULL, | |
| 30 | - MODIFY `group_id` VARCHAR(32) NOT NULL, | |
| 31 | - MODIFY `object_id` VARCHAR(32) NOT NULL, | |
| 32 | - MODIFY `object_type` VARCHAR(32) NOT NULL, | |
| 27 | + $alterQuery = "ALTER TABLE {$dbAccessGroupToObject} | |
| 28 | + ADD group_type VARCHAR(32) NOT NULL AFTER group_id, | |
| 29 | + ADD from_date DATETIME NULL DEFAULT NULL, | |
| 30 | + ADD to_date DATETIME NULL DEFAULT NULL, | |
| 31 | + MODIFY group_id VARCHAR(32) NOT NULL, | |
| 32 | + MODIFY object_id VARCHAR(32) NOT NULL, | |
| 33 | + MODIFY object_type VARCHAR(32) NOT NULL, | |
| 33 | 34 | DROP PRIMARY KEY, |
| 34 | - ADD PRIMARY KEY (`object_id`, `object_type`, `group_id`, `group_type`)"; | |
| 35 | + ADD PRIMARY KEY (object_id, object_type, group_id, group_type)"; | |
| 35 | 36 | } else { |
| 36 | - $alterQuery = "ALTER TABLE `{$dbAccessGroupToObject}` | |
| 37 | - MODIFY `group_type` VARCHAR(32) NOT NULL, | |
| 38 | - MODIFY `group_id` VARCHAR(32) NOT NULL, | |
| 39 | - MODIFY `object_id` VARCHAR(32) NOT NULL, | |
| 40 | - MODIFY `object_type` VARCHAR(32) NOT NULL"; | |
| 37 | + $alterQuery = "ALTER TABLE {$dbAccessGroupToObject} | |
| 38 | + MODIFY group_type VARCHAR(32) NOT NULL, | |
| 39 | + MODIFY group_id VARCHAR(32) NOT NULL, | |
| 40 | + MODIFY object_id VARCHAR(32) NOT NULL, | |
| 41 | + MODIFY object_type VARCHAR(32) NOT NULL"; | |
| 41 | 42 | } |
| 42 | 43 | |
| 43 | 44 | $success = $this->database->query($alterQuery) !== false; |
| 44 | 45 | |