From fcdc4051cc962df470c6e2afcfec11ffc1e89b69 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sun, 23 Jan 2005 18:04:28 +0000
Subject: [PATCH] =?UTF-8?q?Am=E9lioration=20des=20gestionnaires=20de=20bas?=
 =?UTF-8?q?es:=20On=20ne=20stock=20dans=20la=20propri=E9t=E9=20lastquery?=
 =?UTF-8?q?=20que=20les=20derni=E8res=20requ=EAtes=20utilisateurs=20(les?=
 =?UTF-8?q?=20commit=20et=20rollbackn'ont=20pas=20=E0=20y=20etre=20sinon?=
 =?UTF-8?q?=20on=20perd=20l'info=20de=20la=20derni=E8re=20requete=20dans?=
 =?UTF-8?q?=20les=20gestions=20d'erreurs)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/lib/mysql.lib.php | 12 ++++++++----
 htdocs/lib/pgsql.lib.php | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/htdocs/lib/mysql.lib.php b/htdocs/lib/mysql.lib.php
index 12fd4be307e..edcbd21333c 100644
--- a/htdocs/lib/mysql.lib.php
+++ b/htdocs/lib/mysql.lib.php
@@ -260,11 +260,15 @@ class DoliDb
     function query($query)
     {
         $query = trim($query);
-        $this->lastquery=$query;
+        $ret = mysql_query($query, $this->db);
+
+        if (! eregi("^COMMIT",$query) && ! eregi("^ROLLBACK",$query)) {
+            // Si requete utilisateur, on la sauvegarde ainsi que son resultset
+            $this->lastquery=$query;
+            $this->results = $ret;
+        }
     
-        $this->results = mysql_query($query, $this->db);
-    
-        return $this->results;
+        return $ret;
     }
     
     /**
diff --git a/htdocs/lib/pgsql.lib.php b/htdocs/lib/pgsql.lib.php
index 19bc38e356c..32bae468229 100644
--- a/htdocs/lib/pgsql.lib.php
+++ b/htdocs/lib/pgsql.lib.php
@@ -271,11 +271,15 @@ class DoliDb
     function query($query)
     {
         $query = trim($query);
-        $this->lastquery=$query;
+        $ret = pg_query($this->db, $query);
+
+        if (! eregi("^COMMIT",$query) && ! eregi("^ROLLBACK",$query)) {
+            // Si requete utilisateur, on la sauvegarde ainsi que son resultset
+            $this->lastquery=$query;
+            $this->results = $ret;
+        }
     
-        $this->results = pg_query($this->db, $query);
-    
-        return $this->results;
+        return $ret;
     }
     
     /**