Skip to content
Snippets Groups Projects
Commit 68e619fb authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: escape for create command

parent 8080ee45
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/core/db/mysql.class.php
+ 3
− 3
View file @ 68e619fb
...@@ -800,15 +800,15 @@ class DoliDBMysql ...@@ -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);
} }
......
htdocs/core/db/mysqli.class.php
+ 3
− 3
View file @ 68e619fb
...@@ -794,15 +794,15 @@ class DoliDBMysqli ...@@ -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);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment