Changeset d7cb774 in github for program/include/rcube_db.inc

Timestamp:

Oct 25, 2005 11:04:17 AM (8 years ago)

Author:

svncommit <devs@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

d13c369

Parents:

e0ed972

Message:

more pear/mdb2 integration

File:

• program/include/rcube_db.inc (modified) (4 diffs)

program/include/rcube_db.inc

@@ -102 +102 @@
     }
 
-    // Query database (read operations)
-    
-    function query($query, $offset=0, $numrows=0)
+    // Query database
+    
+    function query()
+    {
+                $params = func_get_args();
+                $query = array_shift($params);
+                
+                return $this->_query($query, 0, 0, $params);
+    }
+   
+        function limitquery()
+    {
+                $params = func_get_args();
+                $query = array_shift($params);
+                $offset = array_shift($params);
+                $numrows = array_shift($params);
+                
+                return $this->_query($query, $offset, $numrows, $params);
+    }
+    
+    function _query($query, $offset, $numrows, $params)
     {
         // Read or write ?
@@ -119 +137 @@
         if ($numrows || $offset)
                         {
-                        $result = $this->db_handle->limitQuery($query,$offset,$numrows);
+                        $result = $this->db_handle->limitQuery($query,$offset,$numrows,$params);
                         }
         else    
-                        $result = $this->db_handle->query($query);
-        
+                        $result = $this->db_handle->query($query,$params);
+
         if (DB::isError($result))
+                        {
             raise_error(array('code' => 500,
                               'type' => 'db',
@@ -130 +149 @@
                               'file' => __FILE__, 
                               'message' => $result->getMessage()), TRUE, FALSE);
-        
+             return false;
+            }
+
         return $this->_add_result($result, $query);
     }
@@ -197 +218 @@
     }
 
+        function quoteIdentifier ( $str )
+        {
+                if (!$this->db_handle)
+                        $this->db_connect('r');
+                        
+                return $this->db_handle->quoteIdentifier($str);
+        }
+        
+        function unixtimestamp($field)
+        {
+                switch($this->db_provider)
+                        {
+                        case 'pgsql':
+                                return "EXTRACT (EPOCH FROM $field)";
+                                break;
+                        default:
+                                return "UNIX_TIMESTAMP($field)";
+                        }
+        }
+        
     function _add_result($res, $query)
     {