← All changes | src/Setup/Update/DatabaseUpdate6.php +14 -15 2.3.15 → trunk View file →

		@@ -3,9 +3,8 @@
3	3	declare(strict_types=1);
4	4
5	5	namespace UserAccessManager\Setup\Update;
6	6
7		-use UserAccessManager\Setup\Database\DatabaseUpdate;
8	7	use UserAccessManager\UserGroup\UserGroup;
9	8
10	9	class DatabaseUpdate6 extends DatabaseUpdate
11	10	{
		@@ -18,28 +17,28 @@
18	17	{
19	18	$dbAccessGroupToObject = $this->database->getUserGroupToObjectTable();
20	19
21	20	$dbGroupTypeColumn = $this->database->getVariable(
22		- "SHOW COLUMNS FROM {$dbAccessGroupToObject}
	21	+ "SHOW COLUMNS FROM `{$dbAccessGroupToObject}`
23	22	LIKE 'group_type'"
24	23	);
25	24
26	25	if ($dbGroupTypeColumn !== 'group_type') {
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,
	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,
34	33	DROP PRIMARY KEY,
35		- ADD PRIMARY KEY (object_id, object_type, group_id, group_type)";
	34	+ ADD PRIMARY KEY (`object_id`, `object_type`, `group_id`, `group_type`)";
36	35	} else {
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";
	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";
42	41	}
43	42
44	43	$success = $this->database->query($alterQuery) !== false;
45	44