From fa5a7e862a0c020b1ccdc815753f51db7fb32a78 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Sat, 21 Jan 2006 15:04:17 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20Les=20ordres=20SQL=20ne=20n=E9cessitant?=
 =?UTF-8?q?=20pas=20de=20connexion=20base=20ne=20passait=20plus=20(exemple?=
 =?UTF-8?q?:=20create=20database)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 htdocs/lib/mysql.lib.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/htdocs/lib/mysql.lib.php b/htdocs/lib/mysql.lib.php
index 5c45a5697fc..ae421f5fabc 100644
--- a/htdocs/lib/mysql.lib.php
+++ b/htdocs/lib/mysql.lib.php
@@ -223,6 +223,7 @@ class DoliDb
     function create_db($database)
     {
         $ret=$this->query('CREATE DATABASE '.$database);
+        //print "database=".$this->database_name." ret=".$ret." mysqlerror=".mysql_error($this->db);
         return $ret;
     }
         
@@ -334,9 +335,16 @@ class DoliDb
     {
         $query = trim($query);
 
-//        $ret = mysql_query($query, $this->db);
-        $ret = mysql_db_query($this->database_name, $query, $this->db);
-
+        if (! $this->database_name)
+        {
+            // Ordre SQL ne nécessitant pas de connexion ŕ une base (exemple: CREATE DATABASE)
+            $ret = mysql_query($query, $this->db);
+        }
+        else
+        {
+            $ret = mysql_db_query($this->database_name, $query, $this->db);
+        }
+        
         if (! eregi("^COMMIT",$query) && ! eregi("^ROLLBACK",$query)) {
             // Si requete utilisateur, on la sauvegarde ainsi que son resultset
             $this->lastquery=$query;