Changeset 1066

Timestamp:

08/26/08 22:40:52 (3 months ago)

Author:

laurentj

Message:

ticket #672: jdb:getConnection: two connections were created in some case. p=analogue
ticket #671: added the support of a timeout option for the postgresql driver. p=analogue

Files:

• branches/1.0.x/lib/jelix/CREDITS (modified) (1 diff)
• branches/1.0.x/lib/jelix/db/jDb.class.php (modified) (1 diff)
• branches/1.0.x/lib/jelix/plugins/db/pgsql/pgsql.dbconnection.php (modified) (2 diffs)
• trunk/lib/jelix/CREDITS (modified) (1 diff)
• trunk/lib/jelix/db/jDb.class.php (modified) (1 diff)
• trunk/lib/jelix/plugins/db/pgsql/pgsql.dbconnection.php (modified) (2 diffs)

branches/1.0.x/lib/jelix/CREDITS

@@ -130 +130 @@
-
-Laurent Raufaste (aka analogue)
- on postgresql driver (#123
+es on postgresql driver (#123, #671, #672
-
-Rahal

branches/1.0.x/lib/jelix/db/jDb.class.php

@@ -56 +56 @@
-
-        $profil = self::getProfil ($name);
+
+        // we set the name to avoid two connection for a same profil, when it is the default profil
+        // and when we call getConnection two times, one with no name and on with the name
+        if (!$name) {
+            $name = $profil['name'];
+        }
-
-        if (!isset ($cnxPool[$name])){

branches/1.0.x/lib/jelix/plugins/db/pgsql/pgsql.dbconnection.php

@@ -7 +7 @@
-* @contributor Yannick Le Guédart
-* @contributor Laurent Raufaste
-
+-2008
-* This class was get originally from the Copix project (CopixDBConnectionPostgreSQL, Copix 2.3dev20050901, http://www.copix.org)
-* Few lines of code are still copyrighted 2001-2005 CopixTeam (LGPL licence).
@@ -68 +68 @@
-        $str = '';
-
-on fait une distinction car si host indiqué -> connection TCP/IP, sinon socket unix
+we do a distinction because if the host is given == TCP/IP connection else unix socket
-        if($this->profil['host'] != '')
-            $str = 'host=\''.$this->profil['host'].'\''.$str;
-
-        // Si le port est défini on le rajoute à la chaine de connexion
-        if (isset($this->profil['port'])) {
-            $str .= ' port=\''.$this->profil['port'].'\'';
-        }
-
-        // Si le nom de la base de données est spécifié, on le rajoute à la chaine de connexion
-        if ($this->profil['database'] != '') {
-            $str .= ' dbname=\''.$this->profil['database'].'\'';
-        }
-
-
-
-
+
+
-        if (isset($this->profil['user'])) {
-            $str .= ' user=\''.$this->profil['user'].'\'';
-        }
-
-        // Si le mot de passe est spécifié, on le rajoute à la chaine de connexion
-        // même remarque que pour login.
-        if (isset($this->profil['password'])) {
-            $str .= ' password=\''.$this->profil['password'].'\'';
+        }
+
+        if (isset($this->profil['timeout']) && $this->profil['timeout'] != '') {
+            $str .= ' connect_timeout=\''.$this->profil['timeout'].'\'';
-        }
-

trunk/lib/jelix/CREDITS

@@ -164 +164 @@
-
-Laurent Raufaste (aka analogue)
- on postgresql driver (#123
+es on postgresql driver (#123, #671, #672
-
-Rahal

trunk/lib/jelix/db/jDb.class.php

@@ -59 +59 @@
-
-        $profil = self::getProfil ($name);
+
+        if (!$name) {
+            // we set the name to avoid two connection for a same profil, when it is the default profil
+            // and when we call getConnection two times, one with no name and on with the name
+            $name = $profil['name'];
+        }
-
-        if (!isset ($cnxPool[$name])){

trunk/lib/jelix/plugins/db/pgsql/pgsql.dbconnection.php

@@ -7 +7 @@
-* @contributor Yannick Le Guédart
-* @contributor Laurent Raufaste
-
+-2008
-* This class was get originally from the Copix project (CopixDBConnectionPostgreSQL, Copix 2.3dev20050901, http://www.copix.org)
-* Few lines of code are still copyrighted 2001-2005 CopixTeam (LGPL licence).
@@ -68 +68 @@
-        $str = '';
-
-on fait une distinction car si host indiqué -> connection TCP/IP, sinon socket unix
+we do a distinction because if the host is given == TCP/IP connection else unix socket
-        if($this->profil['host'] != '')
-            $str = 'host=\''.$this->profil['host'].'\''.$str;
-
-        // Si le port est défini on le rajoute à la chaine de connexion
-        if (isset($this->profil['port'])) {
-            $str .= ' port=\''.$this->profil['port'].'\'';
-        }
-
-        // Si le nom de la base de données est spécifié, on le rajoute à la chaine de connexion
-        if ($this->profil['database'] != '') {
-            $str .= ' dbname=\''.$this->profil['database'].'\'';
-        }
-
-
-
-
+
+
-        if (isset($this->profil['user'])) {
-            $str .= ' user=\''.$this->profil['user'].'\'';
-        }
-
-        // Si le mot de passe est spécifié, on le rajoute à la chaine de connexion
-        // même remarque que pour login.
-        if (isset($this->profil['password'])) {
-            $str .= ' password=\''.$this->profil['password'].'\'';
+        }
+
+        if (isset($this->profil['timeout']) && $this->profil['timeout'] != '') {
+            $str .= ' connect_timeout=\''.$this->profil['timeout'].'\'';
-        }
-