dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #454 from MorpheusXAUT/bug-452

Browse Source 
Properly quoted database name during USE queries to avoid MySQL parse errors
This commit is contained in:
Mark Friedrich
2017-03-11 13:35:50 +01:00
committed by GitHub
parent 0ad132dc5b a2da10f4e8
commit dcffa71893
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/controller/setup.php
View File

@@ -925,7 +925,7 @@ class Setup extends Controller {
$checkTables = [];
if($db){
// set/change default "character set" and "collation"
$db->exec('ALTER DATABASE ' . $db->name()
$db->exec('ALTER DATABASE ' . $db->quotekey($db->name())
. ' CHARACTER SET ' . self::getRequiredMySqlVariables('CHARACTER_SET_DATABASE')
. ' COLLATE ' . self::getRequiredMySqlVariables('COLLATION_DATABASE')
);

2
app/main/db/sql/mysql/tablemodifier.php
View File

@@ -52,7 +52,7 @@ class TableModifier extends SQL\TableModifier {
':constraint_name' => $constraintName
]);
// switch back to current DB
$this->db->exec("USE " . $this->db->name());
$this->db->exec("USE " . $this->db->quotekey($this->db->name()));
$constraints = [];
foreach($constraintsData as $data){