Changeset 1596 for trunk/gregarius/cls/db/db.mysql.php

Timestamp:

10/04/06 12:18:19 (2 years ago)

Author:

cfriesen

Message:

Fix for #446

Files:

• trunk/gregarius/cls/db/db.mysql.php (modified) (6 diffs)

trunk/gregarius/cls/db/db.mysql.php

@@ -31 +31 @@
 class MysqlDB extends DB {
 
+    var $resource;
+
     function  MysqlDB() {
         parent::DB();
@@ -41 +43 @@
     
     function DBConnect($dbserver, $dbuname, $dbpass) {
-         if (!mysql_connect($dbserver, $dbuname, $dbpass)) {
+    $this -> resource = mysql_connect($dbserver, $dbuname, $dbpass);
+
+        if(!$this -> resource) {
               die( "<h1>Error connecting to the database!</h1>\n"
                      ."<p>Have you edited dbinit.php and correctly defined "
@@ -49 +53 @@
     
     function DBSelectDB($dbname) {
-        if (!mysql_select_db($dbname)) {
+        if (!mysql_select_db($dbname, $this -> resource)) {
               die( "<h1>Error selecting the database!</h1>\n"
                      ."<p>Does your database exist?"
@@ -60 +64 @@
     
     function rss_query ($query, $dieOnError=true, $preventRecursion=false) {
-         $ret =  mysql_query($query);
+         $ret =  mysql_query($query, $this -> resource);
     
          if ($error = $this -> rss_sql_error()) {
@@ -101 +105 @@
     
     function rss_sql_error() {
-         return mysql_errno();
+         return mysql_errno($this -> resource);
     }
     
     function rss_sql_error_message () {
-         return mysql_error();
+         return mysql_error($this -> resource);
     }
     
     function rss_insert_id() {
-        return mysql_insert_id();
+        return mysql_insert_id($this -> resource);
     }
     
@@ -125 +129 @@
         switch ($kind) {
             case RSS_SQL_ERROR_NO_ERROR:
-                return (mysql_errno() == 0);
+                return (mysql_errno($this -> resource) == 0);
                 break;
             case RSS_SQL_ERROR_DUPLICATE_ROW:
-                return (mysql_errno() == 1062);
+                return (mysql_errno($this -> resource) == 1062);
                 break;
             default: