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

		@@ -17,28 +17,28 @@
17	17	{
18	18	$dbAccessGroupToObject = $this->database->getUserGroupToObjectTable();
19	19
20	20	$dbGroupTypeColumn = $this->database->getVariable(
21		- "SHOW COLUMNS FROM {$dbAccessGroupToObject}
	21	+ "SHOW COLUMNS FROM `{$dbAccessGroupToObject}`
22	22	LIKE 'group_type'"
23	23	);
24	24
25	25	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,
	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,
33	33	DROP PRIMARY KEY,
34		- ADD PRIMARY KEY (object_id, object_type, group_id, group_type)";
	34	+ ADD PRIMARY KEY (`object_id`, `object_type`, `group_id`, `group_type`)";
35	35	} 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";
	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";
41	41	}
42	42
43	43	$success = $this->database->query($alterQuery) !== false;
44	44