php-blog-cvs

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25969/include/db

Modified Files:
	mysql.inc.php mysqli.inc.php postgres.inc.php sqlite.inc.php 
Log Message:
- Allow the usage of persistant database connections


Index: mysqli.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/db/mysqli.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mysqli.inc.php	26 Nov 2004 14:08:39 -0000	1.3
+++ mysqli.inc.php	29 Nov 2004 23:21:47 -0000	1.4
@@ -92,7 +92,13 @@
         return $serendipity['dbConn'];
     }
 
-    $serendipity['dbConn'] = mysqli_connect($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
+    if (isset($serendipity['dbPersistant']) && $serendipity['dbPersistant']) {
+        $function = 'mysqli_pconnect';
+    } else {
+        $function = 'mysqli_connect';
+    }
+
+    $serendipity['dbConn'] = $function($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
     mysqli_select_db($serendipity['dbConn'], $serendipity['dbName']);
 
     return $serendipity['dbConn'];

Index: mysql.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/db/mysql.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mysql.inc.php	26 Nov 2004 14:08:39 -0000	1.3
+++ mysql.inc.php	29 Nov 2004 23:21:46 -0000	1.4
@@ -97,7 +97,13 @@
         return $serendipity['dbConn'];
     }
 
-    $serendipity['dbConn'] = mysql_connect($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
+    if (isset($serendipity['dbPersistant']) && $serendipity['dbPersistant']) {
+        $function = 'mysql_pconnect';
+    } else {
+        $function = 'mysql_connect';
+    }
+
+    $serendipity['dbConn'] = $function($serendipity['dbHost'], $serendipity['dbUser'], $serendipity['dbPass']);
     mysql_select_db($serendipity['dbName']);
     return $serendipity['dbConn'];
 }

Index: postgres.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/db/postgres.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- postgres.inc.php	26 Nov 2004 14:08:39 -0000	1.3
+++ postgres.inc.php	29 Nov 2004 23:21:47 -0000	1.4
@@ -3,10 +3,15 @@
 function serendipity_db_connect() {
     global $serendipity;
 
-    $serendipity['dbConn'] = pg_connect(
+    if (isset($serendipity['dbPersistant']) && $serendipity['dbPersistant']) {
+        $function = 'pg_pconnect';
+    } else {
+        $function = 'pg_connect';
+    }
+
+    $serendipity['dbConn'] = $function(
                                sprintf(
                                  '%sdbname=%s user=%s password=%s',
-
                                  strlen($serendipity['dbHost']) ? ('host=' . $serendipity['dbHost'] . ' ') : '',
                                  $serendipity['dbName'],
                                  $serendipity['dbUser'],

Index: sqlite.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/db/sqlite.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sqlite.inc.php	26 Nov 2004 14:08:39 -0000	1.3
+++ sqlite.inc.php	29 Nov 2004 23:21:47 -0000	1.4
@@ -13,7 +13,14 @@
         return $serendipity['dbConn'];
     }
 
-    $serendipity['dbConn'] = sqlite_open($serendipity['serendipityPath'] . $serendipity['dbName'] . '.db');
+    if (isset($serendipity['dbPersistant']) && $serendipity['dbPersistant']) {
+        $function = 'sqlite_popen';
+    } else {
+        $function = 'sqlite_open';
+    }
+
+
+    $serendipity['dbConn'] = $function($serendipity['serendipityPath'] . $serendipity['dbName'] . '.db');
 
     return $serendipity['dbConn'];
 }