This commit is contained in:
Laurent Destailleur
2008-03-31 21:33:07 +00:00
parent 469fb590a7
commit bd577cc353

View File

@@ -229,7 +229,7 @@ class DoliDb
*/ */
function connect($host, $login, $passwd, $name, $port=0) function connect($host, $login, $passwd, $name, $port=0)
{ {
dolibarr_syslog("DoliDB::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name"); dolibarr_syslog("DoliDB::connect host=$host, port=$port, login=$login, passwd=--hidden--, name=$name",LOG_DEBUG);
// With mysql, port must be in hostname // With mysql, port must be in hostname
$newhost=$host; $newhost=$host;
@@ -789,7 +789,7 @@ class DoliDb
$sql .= ",".implode(',',$sqlk); $sql .= ",".implode(',',$sqlk);
$sql .=") type=".$type; $sql .=") type=".$type;
dolibarr_syslog($sql); dolibarr_syslog($sql,LOG_DEBUG);
if(! $this -> query($sql)) if(! $this -> query($sql))
return -1; return -1;
else else
@@ -806,7 +806,7 @@ class DoliDb
{ {
$sql="DESC ".$table." ".$field; $sql="DESC ".$table." ".$field;
dolibarr_syslog($sql); dolibarr_syslog($sql,LOG_DEBUG);
$this->results = $this->query($sql); $this->results = $this->query($sql);
return $this->results; return $this->results;
} }
@@ -840,6 +840,7 @@ class DoliDb
$sql .= " ".$field_desc['extra']; $sql .= " ".$field_desc['extra'];
$sql .= " ".$field_position; $sql .= " ".$field_position;
dolibarr_syslog($sql,LOG_DEBUG);
if(! $this -> query($sql)) if(! $this -> query($sql))
return -1; return -1;
else else
@@ -872,7 +873,7 @@ class DoliDb
$sql.= " VALUES ('$dolibarr_main_db_host','$dolibarr_main_db_name','$dolibarr_main_db_user'"; $sql.= " VALUES ('$dolibarr_main_db_host','$dolibarr_main_db_name','$dolibarr_main_db_user'";
$sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y');"; $sql.= ",'Y','Y','Y','Y','Y','Y','Y','Y');";
dolibarr_syslog("mysql.lib::DDLCreateUser sql=".$sql); dolibarr_syslog("mysql.lib::DDLCreateUser sql=".$sql,LOG_DEBUG);
$resql=$this->query($sql); $resql=$this->query($sql);
if (! $resql) if (! $resql)
{ {
@@ -881,7 +882,7 @@ class DoliDb
$sql="FLUSH Privileges"; $sql="FLUSH Privileges";
dolibarr_syslog("mysql.lib::DDLCreateUser sql=".$sql); dolibarr_syslog("mysql.lib::DDLCreateUser sql=".$sql,LOG_DEBUG);
$resql=$this->query($sql); $resql=$this->query($sql);
return 1; return 1;
@@ -891,7 +892,8 @@ class DoliDb
* \brief Return charset used to store data in database * \brief Return charset used to store data in database
* \return string Charset * \return string Charset
*/ */
function getDefaultCharacterSetDatabase(){ function getDefaultCharacterSetDatabase()
{
$resql=$this->query('SHOW VARIABLES LIKE \'character_set_database\''); $resql=$this->query('SHOW VARIABLES LIKE \'character_set_database\'');
if (!$resql) if (!$resql)
{ {
@@ -902,7 +904,8 @@ class DoliDb
return $liste['Value']; return $liste['Value'];
} }
function getListOfCharacterSet(){ function getListOfCharacterSet()
{
$resql=$this->query('SHOW CHARSET'); $resql=$this->query('SHOW CHARSET');
$liste = array(); $liste = array();
if ($resql) if ($resql)
@@ -926,7 +929,8 @@ class DoliDb
* \brief Return collation used in database * \brief Return collation used in database
* \return string Collation value * \return string Collation value
*/ */
function getDefaultCollationDatabase(){ function getDefaultCollationDatabase()
{
$resql=$this->query('SHOW VARIABLES LIKE \'collation_database\''); $resql=$this->query('SHOW VARIABLES LIKE \'collation_database\'');
if (!$resql) if (!$resql)
{ {