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

Fix: Log must be done before query.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-07-27 23:23:29 +02:00
parent bf9313dd87
commit 9e91baca36
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/db/mssql.class.php
View File

@ -349,6 +349,8 @@ class DoliDBMssql extends DoliDB
//print "<!--".$query."-->";
dol_syslog('sql='.$query, LOG_DEBUG);
if (! $this->database_name)
{
// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
@ -359,8 +361,6 @@ class DoliDBMssql extends DoliDB
$ret = mssql_query($query, $this->db);
}
dol_syslog('sql='.$query, LOG_DEBUG);
if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
{
// Si requete utilisateur, on la sauvegarde ainsi que son resultset

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

@ -252,6 +252,8 @@ class DoliDBMysql extends DoliDB
{
$query = trim($query);
dol_syslog('sql='.$query, LOG_DEBUG);
if (! $this->database_name)
{
// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
@ -263,8 +265,6 @@ class DoliDBMysql extends DoliDB
$ret = mysql_query($query, $this->db);
}
dol_syslog('sql='.$query, LOG_DEBUG);
if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
{
// Si requete utilisateur, on la sauvegarde ainsi que son resultset
@ -829,7 +829,7 @@ class DoliDBMysql extends DoliDB
$resql=$this->query($sql);
if (! $resql)
{
if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
{
return -1;
}

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

@ -255,6 +255,9 @@ class DoliDBMysqli extends DoliDB
function query($query,$usesavepoint=0,$type='auto')
{
$query = trim($query);
dol_syslog('sql='.$query, LOG_DEBUG);
if (! $this->database_name)
{
// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
@ -265,8 +268,6 @@ class DoliDBMysqli extends DoliDB
$ret = mysqli_query($this->db,$query);
}
dol_syslog('sql='.$query, LOG_DEBUG);
if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
{
// Si requete utilisateur, on la sauvegarde ainsi que son resultset
@ -833,7 +834,7 @@ class DoliDBMysqli extends DoliDB
$resql=$this->query($sql);
if (! $resql)
{
if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
if ($this->lasterrno != 'DB_ERROR_USER_ALREADY_EXISTS')
{
return -1;
}

4
htdocs/core/db/pgsql.class.php
View File

@ -491,10 +491,10 @@ class DoliDBPgsql extends DoliDB
@pg_query($this->db, 'SAVEPOINT mysavepoint');
}
$ret = @pg_query($this->db, $query);
dol_syslog('sql='.$query, LOG_DEBUG);
$ret = @pg_query($this->db, $query);
//print $query;
if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query)) // Si requete utilisateur, on la sauvegarde ainsi que son resultset
{

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

@ -389,7 +389,9 @@ class DoliDBSqlite extends DoliDB
$query=$this->convertSQLFromMysql($query,$type);
//print "After convertSQLFromMysql:\n".$query."<br>\n";
// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
dol_syslog('sql='.$query, LOG_DEBUG);
// Ordre SQL ne necessitant pas de connexion a une base (exemple: CREATE DATABASE)
try {
//$ret = $this->db->exec($query);
$ret = $this->db->query($query); // $ret is a PDO object
@ -399,8 +401,6 @@ class DoliDBSqlite extends DoliDB
$this->error=$e->getMessage();
}
dol_syslog('sql='.$query, LOG_DEBUG);
if (! preg_match("/^COMMIT/i",$query) && ! preg_match("/^ROLLBACK/i",$query))
{
// Si requete utilisateur, on la sauvegarde ainsi que son resultset