[Db] loadDump reports sql statement which caused error (#4120)

* [Db] loadDump reports sql statement which caused error This functionality was accidently broken by removal of sqlToRun property in 2.2.10 Replaces #4115 * Made failing test pass on HHVM
Codeception · Apr 11, 2017 · c82a621 · c82a621
1 parent 5a254bd
commit c82a621
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 9 deletions.
diff --git a/src/Codeception/Lib/Driver/Db.php b/src/Codeception/Lib/Driver/Db.php
@@ -1,6 +1,8 @@
 <?php
 namespace Codeception\Lib\Driver;
 
+use Codeception\Exception\ModuleException;
+
 class Db
 {
     /**
@@ -212,7 +214,14 @@ protected function sqlLine($sql)
 
     protected function sqlQuery($query)
     {
-        $this->dbh->exec($query);
+        try {
+            $this->dbh->exec($query);
+        } catch (\PDOException $e) {
+            throw new ModuleException(
+                'Codeception\Module\Db',
+                $e->getMessage() . "\nSQL query being executed: " . $query
+            );
+        }
     }
 
     public function executeQuery($query, array $params)

diff --git a/src/Codeception/Module/Db.php b/src/Codeception/Module/Db.php
@@ -291,14 +291,7 @@ protected function loadDump()
         if (!$this->sql) {
             return;
         }
-        try {
-            $this->driver->load($this->sql);
-        } catch (\PDOException $e) {
-            throw new ModuleException(
-                __CLASS__,
-                $e->getMessage() . "\nSQL query being executed: " . $this->driver->sqlToRun
-            );
-        }
+        $this->driver->load($this->sql);
     }
 
     /**

diff --git a/tests/unit/Codeception/Lib/Driver/MysqlTest.php b/tests/unit/Codeception/Lib/Driver/MysqlTest.php
@@ -14,6 +14,9 @@ class MysqlTest extends \PHPUnit_Framework_TestCase
     ];
 
     protected static $sql;
+    /**
+     * @var \Codeception\Lib\Driver\MySql
+     */
     protected $mysql;
 
     public static function setUpBeforeClass()
@@ -126,4 +129,14 @@ public function testInsertIntoBitField()
         );
         $this->assertEquals(1, $res->rowCount());
     }
+
+    public function testLoadThrowsExceptionWhenDumpFileContainsSyntaxError()
+    {
+        $sql = "INSERT INTO `users` (`name`) VALS('')";
+        $expectedMessage = 'You have an error in your SQL syntax; ' .
+            'check the manual that corresponds to your MySQL server version for the right syntax to use near ' .
+            "'VALS('')' at line 1\nSQL query being executed: \n" . $sql;
+        $this->setExpectedException('Codeception\Exception\ModuleException', $expectedMessage);
+        $this->mysql->load([$sql]);
+    }
 }