Changeset 848 for trunk/system/libraries/Database.php

Timestamp:

10/18/2007 10:36:47 PM (14 months ago)

Author:

Shadowhand

Message:

Small fixes:

• Added ORM example at /orm/
  
• Fixed the syntax of Kohana::debug_output()
  
• Moved Database benchmarks to Database::query()
  
• Fixed profiler to handle new Database benchmark (static) location
  
• Database drivers now return the database connection resource instead of TRUE when calling connect()
  

Files:

• trunk/system/libraries/Database.php (modified) (8 diffs)

trunk/system/libraries/Database.php

@@ -41 +41 @@
         // Database driver object
         protected $driver;
+        protected $link;
 
         // Un-compiled parts of the SQL query
@@ -56 +57 @@
         protected $limit      = FALSE;
         protected $offset     = FALSE;
-        protected $connected  = FALSE;
         protected $last_query = '';
 
@@ -84 +84 @@
                         {
                                 $name = $config;
-                                
+
                                 // Test the config group name
                                 if (($config = Config::item('database.'.$config)) === FALSE)
@@ -194 +194 @@
         public function connect()
         {
-                $this->connected = $this->driver->connect($this->config);
-
-                if ($this->connected != TRUE)
-                        throw new Kohana_Exception('database.connection', $this->driver->show_error());
+                if ( ! is_resource($this->link))
+                {
+                        if ( ! is_resource($this->link = $this->driver->connect($this->config)))
+                                throw new Kohana_Exception('database.connection', $this->driver->show_error());
+                }
         }
 
@@ -211 +212 @@
                 if ($sql == '') return FALSE;
 
-                if ( ! $this->connected) $this->connect();
+                // No link? Connect!
+                $this->link or $this->connect();
+
+                // Start the benchmark
+                $start = microtime(TRUE);
 
                 if (func_num_args() > 1) //if we have more than one argument ($sql)
@@ -218 +223 @@
                         $binds = (is_array(next($argv))) ? current($argv) : $argv;
                 }
+
                 // Compile binds if needed
                 if (isset($binds))
@@ -223 +229 @@
                         $sql = $this->compile_binds($sql, $binds);
                 }
-                $this->last_query = $sql;
-                return $this->driver->query($sql);
+
+                // Fetch the result
+                $result = $this->driver->query($this->last_query = $sql);
+
+                // Stop the benchmark
+                $stop = microtime(TRUE);
+
+                if ($this->config['benchmark'] == TRUE)
+                {
+                        // Benchmark the query
+                        self::$benchmarks[] = array('query' => $sql, 'time' => $stop - $start);
+                }
+
+                return $result;
         }
 
@@ -540 +558 @@
                 $sql = $this->driver->compile_select(get_object_vars($this));
 
-                $start = microtime(TRUE);
                 $result = $this->query($sql);
-                $stop = microtime(TRUE);
-
-                if ($this->config['benchmark'] == TRUE)
-                {
-                        // Benchmark the query
-                        self::$benchmarks[] = array('query' => $sql, 'time' => $stop - $start);
-                }
 
                 $this->reset_select();