lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: escape for create command

Browse Source
This commit is contained in:
Laurent Destailleur 2012-07-22 21:50:08 +02:00
parent 8080ee4565
commit 68e619fb00
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/db/mysql.class.php
View File

@ -800,15 +800,15 @@ class DoliDBMysql
if (empty($collation)) $collation=$this->forcecollate; if (empty($collation)) $collation=$this->forcecollate;
// ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
$sql = "CREATE DATABASE '".$this->escape($database)."'"; $sql = "CREATE DATABASE `".$this->escape($database)."`";
$sql.= " DEFAULT CHARACTER SET '".$this->escape($charset)."' DEFAULT COLLATE '".$this->escape($collation)."'"; $sql.= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`";
dol_syslog($sql,LOG_DEBUG); dol_syslog($sql,LOG_DEBUG);
$ret=$this->query($sql); $ret=$this->query($sql);
if (! $ret) if (! $ret)
{ {
// We try again for compatibility with Mysql < 4.1.1 // We try again for compatibility with Mysql < 4.1.1
$sql = 'CREATE DATABASE '.$database; $sql = "CREATE DATABASE `".$this->escape($database)."`";
dol_syslog($sql,LOG_DEBUG); dol_syslog($sql,LOG_DEBUG);
$ret=$this->query($sql); $ret=$this->query($sql);
} }

6
htdocs/core/db/mysqli.class.php
View File

@ -794,15 +794,15 @@ class DoliDBMysqli
if (empty($collation)) $collation=$this->forcecollate; if (empty($collation)) $collation=$this->forcecollate;
// ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci // ALTER DATABASE dolibarr_db DEFAULT CHARACTER SET latin DEFAULT COLLATE latin1_swedish_ci
$sql = "CREATE DATABASE '".$this->escape($database)."'"; $sql = "CREATE DATABASE `".$this->escape($database)."`";
$sql.= " DEFAULT CHARACTER SET '".$this->escape($charset)."' DEFAULT COLLATE '".$this->escape($collation)."'"; $sql.= " DEFAULT CHARACTER SET `".$this->escape($charset)."` DEFAULT COLLATE `".$this->escape($collation)."`";
dol_syslog($sql,LOG_DEBUG); dol_syslog($sql,LOG_DEBUG);
$ret=$this->query($sql); $ret=$this->query($sql);
if (! $ret) if (! $ret)
{ {
// We try again for compatibility with Mysql < 4.1.1 // We try again for compatibility with Mysql < 4.1.1
$sql = 'CREATE DATABASE '.$database; $sql = "CREATE DATABASE `".$this->escape($database)."`";
dol_syslog($sql,LOG_DEBUG); dol_syslog($sql,LOG_DEBUG);
$ret=$this->query($sql); $ret=$this->query($sql);
} }