AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Escape table name 'groups' because groups is a reserved word as of MySql 8.0.2

Browse Source
This commit is contained in:
Thomas
2018-10-05 19:44:02 -04:00
committed by fguillot
parent c06a110830
commit e650ed5814
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Schema/Mysql.php
View File

@@ -507,7 +507,7 @@ function version_96(PDO $pdo)
`group_id` INT NOT NULL, `group_id` INT NOT NULL,
`project_id` INT NOT NULL, `project_id` INT NOT NULL,
`role` VARCHAR(25) NOT NULL, `role` VARCHAR(25) NOT NULL,
FOREIGN KEY(group_id) REFERENCES groups(id) ON DELETE CASCADE, FOREIGN KEY(group_id) REFERENCES `groups`(id) ON DELETE CASCADE,
FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE, FOREIGN KEY(project_id) REFERENCES projects(id) ON DELETE CASCADE,
UNIQUE(group_id, project_id) UNIQUE(group_id, project_id)
) ENGINE=InnoDB CHARSET=utf8 ) ENGINE=InnoDB CHARSET=utf8
@@ -535,7 +535,7 @@ function version_96(PDO $pdo)
function version_95(PDO $pdo) function version_95(PDO $pdo)
{ {
$pdo->exec(" $pdo->exec("
CREATE TABLE groups ( CREATE TABLE `groups` (
id INT NOT NULL AUTO_INCREMENT, id INT NOT NULL AUTO_INCREMENT,
external_id VARCHAR(255) DEFAULT '', external_id VARCHAR(255) DEFAULT '',
name VARCHAR(100) NOT NULL UNIQUE, name VARCHAR(100) NOT NULL UNIQUE,
@@ -547,7 +547,7 @@ function version_95(PDO $pdo)
CREATE TABLE group_has_users ( CREATE TABLE group_has_users (
group_id INT NOT NULL, group_id INT NOT NULL,
user_id INT NOT NULL, user_id INT NOT NULL,
FOREIGN KEY(group_id) REFERENCES groups(id) ON DELETE CASCADE, FOREIGN KEY(group_id) REFERENCES `groups`(id) ON DELETE CASCADE,
FOREIGN KEY(user_id) REFERENCES users(id) ON DELETE CASCADE, FOREIGN KEY(user_id) REFERENCES users(id) ON DELETE CASCADE,
UNIQUE(group_id, user_id) UNIQUE(group_id, user_id)
) ENGINE=InnoDB CHARSET=utf8 ) ENGINE=InnoDB CHARSET=utf8

2
app/Validator/GroupValidator.php
View File

@@ -63,7 +63,7 @@ class GroupValidator extends BaseValidator
return array( return array(
new Validators\Required('name', t('The name is required')), new Validators\Required('name', t('The name is required')),
new Validators\MaxLength('name', t('The maximum length is %d characters', 191), 191), new Validators\MaxLength('name', t('The maximum length is %d characters', 191), 191),
new Validators\Unique('name', t('The name must be unique'), $this->db->getConnection(), GroupModel::TABLE, 'id'), new Validators\Unique('name', t('The name must be unique'), $this->db->getConnection(), $this->db->escapeIdentifier(GroupModel::TABLE), $this->db->escapeIdentifier('id')),
new Validators\MaxLength('external_id', t('The maximum length is %d characters', 255), 255), new Validators\MaxLength('external_id', t('The maximum length is %d characters', 255), 255),
new Validators\Integer('id', t('This value must be an integer')), new Validators\Integer('id', t('This value must be an integer')),
); );