Ticket #613: database.patch

config/database.php

@@ -41 +41 @@
         'table_prefix'  => '',
         'object'        => TRUE,
         'cache'         => FALSE,
-        'escape'        => TRUE
+        'escape'        => TRUE,
+        'profile_all'   => FALSE
 );
+ No newline at end of file

libraries/Database.php

@@ -13 +13 @@
 
         // Global benchmark
         public static $benchmarks = array();
+        
+        private static $profile_all = FALSE;
 
         // Configuration
         protected $config = array
@@ -101 +103 @@
 
                 // Merge the default config with the passed config
                 $this->config = array_merge($this->config, $config);
+                
+                // Set the profile_all flag
+                if(isset($this->config['profile_all']))
+                {
+                        $this->profile_all = $this->config['profile_all'];
+                }
 
                 if (is_string($this->config['connection']))
                 {
@@ -1064 +1072 @@
 
                 $this->reset_select();
 
-                return $this->driver->list_tables();
+                $start = microtime(true);
+
+                $result = $this->driver->list_tables();
+                
+                $stop = microtime(true);
+                
+                if($this->profile_all)
+                {
+                        self::$benchmarks[] = array('query' => 'Database::list_tables()', 'time' => $stop - $start, 'rows' => count($result));
+                }
+                
+                return $result;
         }
 
         /**
@@ -1117 +1136 @@
         {
                 $this->link or $this->connect();
 
-                return $this->driver->field_data($this->config['table_prefix'].$table);
+                $start = microtime(true);
+
+                $result = $this->driver->field_data($this->config['table_prefix'].$table);
+                
+                $stop = microtime(true);
+                
+                if($this->profile_all)
+                {
+                        self::$benchmarks[] = array('query' => 'Database::field_data(\'' . $table . '\')', 'time' => $stop - $start, 'rows' => count($result));
+                }
+                
+                return $result;
         }
 
         /**
@@ -1130 +1160 @@
         {
                 $this->link or $this->connect();
 
-                return $this->driver->list_fields($this->config['table_prefix'].$table);
+                $start = microtime(true);
+
+                $result = $this->driver->list_fields($this->config['table_prefix'].$table);
+                
+                $stop = microtime(true);
+                
+                if($this->profile_all)
+                {
+                        self::$benchmarks[] = array('query' => 'Database::list_fields(\'' . $table . '\')', 'time' => $stop - $start, 'rows' => count($result));
+                }
+                
+                return $result;
         }
 
         /**