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

Timestamp:

10/05/2007 01:15:08 AM (14 months ago)

Author:

Shadowhand

Message:

Cleaned up Profiler and related files.

Files:

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

trunk/system/libraries/Database.php

@@ -30 +30 @@
 class Database_Core {
 
+        // Global benchmark
+        public static $benchmarks = array();
+
         // Configuration
-        protected $config  = array
+        protected $config = array
         (
+                'show_errors'   => TRUE,
+                'benchmark'     => TRUE,
+                'persistent'    => FALSE,
                 'connection'    => '',
-                'persistent'    => FALSE,
-                'show_errors'   => TRUE,
                 'character_set' => 'utf8',
-                'table_prefix'  => ''
+                'table_prefix'  => '',
+                'object'        => TRUE
         );
 
@@ -59 +64 @@
         protected $connected  = FALSE;
         protected $last_query = '';
-        public $benchmark  = array();
 
         /**
@@ -474 +478 @@
                 $stop = microtime(TRUE);
 
-                // benchmark the query
-                $this->benchmark[] = array('query' => $sql, 'time' => $stop - $start);
+                if ($this->config['benchmark'] == TRUE)
+                {
+                        // Benchmark the query
+                        self::$benchmarks[] = array('query' => $sql, 'time' => $stop - $start);
+                }
 
                 $this->reset_select();