tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Corrects MySQL 'ALTER TABLE' check

Browse Source
This commit is contained in:
Simon Welsh 2013-03-25 07:53:42 +13:00
parent a6e8169d00
commit a2c64c68e2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/install/MySQLDatabaseConfigurationHelper.php
View File

@ -149,7 +149,7 @@ class MySQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper {
// Annoyingly, MySQL 'escapes' the database, so we need to do it too. // Annoyingly, MySQL 'escapes' the database, so we need to do it too.
$db = str_replace(array('%', '_', '`'), array('\%', '\_', '``'), $databaseConfig['database']); $db = str_replace(array('%', '_', '`'), array('\%', '\_', '``'), $databaseConfig['database']);
while ($row = $res->fetch_array()) { while ($row = $res->fetch_array()) {
if (preg_match('/^GRANT (.+) ON (.+) TO/', $row[0], $matches) && (count($matches) == 2)) { if (preg_match('/^GRANT (.+) ON (.+) TO/', $row[0], $matches)) {
// Need to change to an array of permissions, because ALTER is contained in ALTER ROUTINES. // Need to change to an array of permissions, because ALTER is contained in ALTER ROUTINES.
$permission = array_map('trim', explode(',', $matches[1])); $permission = array_map('trim', explode(',', $matches[1]));
$on_database = $matches[2]; $on_database = $matches[2];