Merge branch 'bugfix/28'

bjyoungblood · Mar 25, 2013 · 39286d8 · 39286d8
2 parents 19cf978 + b8c6e4b
commit 39286d8
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 308 deletions.
diff --git a/src/BjyProfiler/Db/Adapter/Driver/IbmDb2/ProfilingStatement.php b/src/BjyProfiler/Db/Adapter/Driver/IbmDb2/ProfilingStatement.php
diff --git a/src/BjyProfiler/Db/Adapter/Driver/Mysqli/ProfilingStatement.php b/src/BjyProfiler/Db/Adapter/Driver/Mysqli/ProfilingStatement.php
diff --git a/src/BjyProfiler/Db/Adapter/Driver/Oci8/ProfilingStatement.php b/src/BjyProfiler/Db/Adapter/Driver/Oci8/ProfilingStatement.php
diff --git a/src/BjyProfiler/Db/Adapter/Driver/Pdo/ProfilingStatement.php b/src/BjyProfiler/Db/Adapter/Driver/Pdo/ProfilingStatement.php
diff --git a/src/BjyProfiler/Db/Adapter/Driver/Pgsql/ProfilingStatement.php b/src/BjyProfiler/Db/Adapter/Driver/Pgsql/ProfilingStatement.php
diff --git a/src/BjyProfiler/Db/Adapter/Driver/Sqlsrv/ProfilingStatement.php b/src/BjyProfiler/Db/Adapter/Driver/Sqlsrv/ProfilingStatement.php
diff --git a/src/BjyProfiler/Db/Adapter/ProfilingAdapter.php b/src/BjyProfiler/Db/Adapter/ProfilingAdapter.php
@@ -4,6 +4,7 @@
 
 use BjyProfiler\Db\Profiler\Profiler;
 use Zend\Db\Adapter\Adapter;
+use Zend\Db\Adapter\Driver as ZdbDriver;
 use Zend\Db\Adapter\Profiler\ProfilerInterface;
 
 class ProfilingAdapter extends Adapter
@@ -21,7 +22,6 @@ public function getProfiler()
         return $this->profiler;
     }
 
-
     public function injectProfilingStatementPrototype(array $options = array())
     {
         $profiler = $this->getProfiler();
@@ -34,33 +34,30 @@ public function injectProfilingStatementPrototype(array $options = array())
             $driverName = get_class($driver);
             switch ($driverName) {
                 case 'Zend\Db\Adapter\Driver\IbmDb2\IbmDb2':
-                    $statementPrototype = new Driver\IbmDb2\ProfilingStatement();
+                    $statementPrototype = new ZdbDriver\IbmDb2\Statement();
                     break;
                 case 'Zend\Db\Adapter\Driver\Mysqli\Mysqli':
                     $defaults = array('buffer_results' => false);
                     $options = array_intersect_key(array_merge($defaults, $options), $defaults);
 
-                    $statementPrototype = new Driver\Mysqli\ProfilingStatement($options['buffer_results']);
+                    $statementPrototype = new ZdbDriver\Mysqli\Statement($options['buffer_results']);
                     break;
                 case 'Zend\Db\Adapter\Driver\Oci8\Oci8':
-                    $statementPrototype = new Driver\Oci8\ProfilingStatement();
+                    $statementPrototype = new ZdbDriver\Oci8\Statement();
                     break;
                 case 'Zend\Db\Adapter\Driver\Sqlsrv\Sqlsrv':
-                    $statementPrototype = new Driver\Sqlsrv\ProfilingStatement();
+                    $statementPrototype = new ZdbDriver\Sqlsrv\Statement();
                     break;
                 case 'Zend\Db\Adapter\Driver\Pgsql\Pgsql':
-                    $statementPrototype = new Driver\Pgsql\ProfilingStatement();
+                    $statementPrototype = new ZdbDriver\Pgsql\Statement();
                     break;
                 case 'Zend\Db\Adapter\Driver\Pdo\Pdo':
                 default:
-                    $statementPrototype = new Driver\Pdo\ProfilingStatement();
-            }
-
-            if(isset($statementPrototype)) {
-                $statementPrototype->setProfiler($this->getProfiler());
-                $driver->registerStatementPrototype($statementPrototype);
+                    $statementPrototype = new ZdbDriver\Pdo\Statement();
             }
 
+            $statementPrototype->setProfiler($this->getProfiler());
+            $driver->registerStatementPrototype($statementPrototype);
         }
     }
 }