DBAL-71 - Fix wrong exception call.

lib/Doctrine/DBAL/Logging/DebugStack.php

@@ -43,6 +43,8 @@ class DebugStack implements SQLLogger
 
     public $start = null;
 
+    public $currentQuery = 0;
+
     /**
      * {@inheritdoc}
      */
@@ -50,7 +52,7 @@ class DebugStack implements SQLLogger
     {
         if ($this->enabled) {
             $this->start = microtime(true);
-            $this->queries[] = array('sql' => $sql, 'params' => $params, 'types' => $types, 'executionMS' => 0);
+            $this->queries[++$this->currentQuery] = array('sql' => $sql, 'params' => $params, 'types' => $types, 'executionMS' => 0);
         }
     }
 
@@ -59,7 +61,7 @@ class DebugStack implements SQLLogger
      */
     public function stopQuery()
     {
-        $this->queries[(count($this->queries)-1)]['executionMS'] = microtime(true) - $this->start;
+        $this->queries[$this->currentQuery]['executionMS'] = microtime(true) - $this->start;
     }
 }
 

lib/Doctrine/DBAL/Platforms/AbstractPlatform.php

@@ -1418,7 +1418,7 @@ abstract class AbstractPlatform
                 return $upper;
             break;
             default:
-                throw \InvalidArgumentException('Invalid foreign key action: ' . $upper);
+                throw new \InvalidArgumentException('Invalid foreign key action: ' . $upper);
         }
     }
 

tests/Doctrine/Tests/DBAL/Platforms/AbstractPlatformTestCase.php

@@ -16,6 +16,12 @@ abstract class AbstractPlatformTestCase extends \Doctrine\Tests\DbalTestCase
         $this->_platform = $this->createPlatform();
     }
 
+    public function testGetInvalidtForeignKeyReferentialActionSQL()
+    {
+        $this->setExpectedException('InvalidArgumentException');
+        $this->_platform->getForeignKeyReferentialActionSQL('unknown');
+    }
+
     public function testGetUnknownDoctrineMappingType()
     {
         $this->setExpectedException('Doctrine\DBAL\DBALException');