Merge pull request #19 from katalonec/mysqli_buffer

Mysqli buffer option
bjyoungblood · Jan 10, 2013 · b4b37f8 · b4b37f8
2 parents 6f4f4d6 + bac0219
commit b4b37f8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,9 @@ $dbParams = array(
     'database'  => 'changeme',
     'username'  => 'changeme',
     'password'  => 'changeme',
-    'hostname'  => 'localhost'
+    'hostname'  => 'localhost',
+    // buffer_results - only for mysqli buffered queries, skip for others
+    'options' => array('buffer_results' => true)
 );
 
 return array(
@@ -40,7 +42,12 @@ return array(
                 ));
 
                 $adapter->setProfiler(new BjyProfiler\Db\Profiler\Profiler);
-                $adapter->injectProfilingStatementPrototype();
+                if (isset($dbParams['options']) && is_array($dbParams['options'])) {
+                    $options = $dbParams['options'];
+                } else {
+                    $options = array();
+                }
+                $adapter->injectProfilingStatementPrototype($options);
                 return $adapter;
             },
         ),

diff --git a/config/module.config.php b/config/module.config.php
@@ -10,7 +10,12 @@
                 if(class_exists('BjyProfiler\Db\Adapter\ProfilingAdapter')){
                     $adapter = new BjyProfiler\Db\Adapter\ProfilingAdapter($config['db']);
                     $adapter->setProfiler(new BjyProfiler\Db\Profiler\Profiler);
-                    $adapter->injectProfilingStatementPrototype();
+                    if (isset($config['db']['options']) && is_array($config['db']['options'])) {
+                        $options = $config['db']['options'];
+                    } else {
+                        $options = array();
+                    }
+                    $adapter->injectProfilingStatementPrototype($options);
                 } else {
                     $adapter = new Zend\Db\Adapter\Adapter($config['db']);
                 }

diff --git a/src/BjyProfiler/Db/Adapter/ProfilingAdapter.php b/src/BjyProfiler/Db/Adapter/ProfilingAdapter.php
@@ -21,7 +21,7 @@ public function getProfiler()
     }
 
 
-    public function injectProfilingStatementPrototype()
+    public function injectProfilingStatementPrototype(array $options = array())
     {
         $profiler = $this->getProfiler();
         if (!$profiler instanceof Profiler) {
@@ -33,7 +33,10 @@ public function injectProfilingStatementPrototype()
             $driverName = get_class($driver);
             switch ($driverName) {
                 case 'Zend\Db\Adapter\Driver\Mysqli\Mysqli':
-                    $statementPrototype = new Driver\Mysqli\ProfilingStatement();
+                    $defaults = array('buffer_results' => false);
+                    $options = array_intersect_key(array_merge($defaults, $options), $defaults);
+
+                    $statementPrototype = new Driver\Mysqli\ProfilingStatement($options['buffer_results']);
                     break;
                 case 'Zend\Db\Adapter\Driver\Sqlsrv\Sqlsrv':
                     $statementPrototype = new Driver\Sqlsrv\ProfilingStatement();