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;
@ -319,54 +319,54 @@ class DoliDb
} }
} }
/** /**
\brief Validation d'une transaction \brief Validation d'une transaction
\return int 1 si validation ok ou niveau de transaction non ouverte, 0 en cas d'erreur \return int 1 si validation ok ou niveau de transaction non ouverte, 0 en cas d'erreur
*/ */
function commit() function commit()
{ {
if ($this->transaction_opened<=1) if ($this->transaction_opened<=1)
{ {
$ret=$this->query("COMMIT"); $ret=$this->query("COMMIT");
if ($ret) if ($ret)
{ {
$this->transaction_opened=0; $this->transaction_opened=0;
dolibarr_syslog("COMMIT Transaction",LOG_DEBUG); dolibarr_syslog("COMMIT Transaction",LOG_DEBUG);
} }
return $ret; return $ret;
} }
else else
{ {
$this->transaction_opened--; $this->transaction_opened--;
return 1; return 1;
} }
} }
/** /**
\brief Annulation d'une transaction et retour aux anciennes valeurs \brief Annulation d'une transaction et retour aux anciennes valeurs
\return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur \return int 1 si annulation ok ou transaction non ouverte, 0 en cas d'erreur
*/ */
function rollback() function rollback()
{ {
if ($this->transaction_opened<=1) if ($this->transaction_opened<=1)
{ {
$ret=$this->query("ROLLBACK"); $ret=$this->query("ROLLBACK");
$this->transaction_opened=0; $this->transaction_opened=0;
dolibarr_syslog("ROLLBACK Transaction",LOG_DEBUG); dolibarr_syslog("ROLLBACK Transaction",LOG_DEBUG);
return $ret; return $ret;
} }
else else
{ {
$this->transaction_opened--; $this->transaction_opened--;
return 1; return 1;
} }
} }
/** /**
\brief Effectue une requete et renvoi le resultset de réponse de la base \brief Effectue une requete et renvoi le resultset de réponse de la base
\param query Contenu de la query \param query Contenu de la query
\return resource Resultset de la reponse \return resource Resultset de la reponse
*/ */
function query($query) function query($query)
{ {
$query = trim($query); $query = trim($query);
@ -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,8 +904,9 @@ 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)
{ {