Fixed Issue/4059 (Codeception#4071)

* [Db] Run the last statement in file even if it doesn't end with delimiter Fixes Codeception#4059 * Eliminated property sqltoRun
chris1312 · Jun 16, 2017 · c088c4b · c088c4b
1 parent 271083e
commit c088c4b
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 12 deletions.
diff --git a/src/Codeception/Lib/Driver/Db.php b/src/Codeception/Lib/Driver/Db.php
@@ -16,11 +16,6 @@ class Db
     protected $user;
     protected $password;
 
-    /**
-     * @var string
-     */
-    public $sqlToRun;
-
     /**
      * associative array with table name => primary-key
      *
@@ -123,11 +118,14 @@ public function load($sql)
             $query .= "\n" . rtrim($sqlLine);
 
             if (substr($query, -1 * $delimiterLength, $delimiterLength) == $delimiter) {
-                $this->sqlToRun = substr($query, 0, -1 * $delimiterLength);
-                $this->sqlQuery($this->sqlToRun);
-                $query = "";
+                $this->sqlQuery(substr($query, 0, -1 * $delimiterLength));
+                $query = '';
             }
         }
+
+        if ($query !== '') {
+            $this->sqlQuery($query);
+        }
     }
 
     public function insert($tableName, array &$data)

diff --git a/src/Codeception/Lib/Driver/Oci.php b/src/Codeception/Lib/Driver/Oci.php
@@ -69,11 +69,14 @@ public function load($sql)
             $query .= "\n" . rtrim($sqlLine);
 
             if (substr($query, -1 * $delimiterLength, $delimiterLength) == $delimiter) {
-                $this->sqlToRun = substr($query, 0, -1 * $delimiterLength);
-                $this->sqlQuery($this->sqlToRun);
+                $this->sqlQuery(substr($query, 0, -1 * $delimiterLength));
                 $query = "";
             }
         }
+
+        if ($query !== '') {
+            $this->sqlQuery($query);
+        }
     }
 
     /**

diff --git a/src/Codeception/Lib/Driver/PostgreSql.php b/src/Codeception/Lib/Driver/PostgreSql.php
@@ -51,11 +51,14 @@ public function load($sql)
             $query .= "\n" . rtrim($sqlLine);
 
             if (!$dollarsOpen && substr($query, -1 * $delimiterLength, $delimiterLength) == $delimiter) {
-                $this->sqlToRun = substr($query, 0, -1 * $delimiterLength);
-                $this->sqlQuery($this->sqlToRun);
+                $this->sqlQuery(substr($query, 0, -1 * $delimiterLength));
                 $query = '';
             }
         }
+
+        if ($query !== '') {
+            $this->sqlQuery($query);
+        }
     }
 
     public function cleanup()

diff --git a/tests/unit/Codeception/Lib/Driver/PostgresTest.php b/tests/unit/Codeception/Lib/Driver/PostgresTest.php
@@ -147,4 +147,16 @@ public function testGetPrimaryColumnThrowsExceptionIfTableHasCompositePrimaryKey
         );
         $this->postgres->getPrimaryColumn('composite_pk');
     }
+
+    /**
+     * @issue https://github.com/Codeception/Codeception/issues/4059
+     */
+    public function testLoadDumpEndingWithoutDelimiter()
+    {
+        $newDriver = new \Codeception\Lib\Driver\PostgreSql(self::$config['dsn'], self::$config['user'], self::$config['password']);
+        $newDriver->load(['INSERT INTO empty_table VALUES(1, \'test\')']);
+        $res = $newDriver->getDbh()->query("select * from empty_table where field = 'test'");
+        $this->assertNotEquals(false, $res);
+        $this->assertNotEmpty($res->fetchAll());
+    }
 }
diff --git a/tests/unit/Codeception/Lib/Driver/SqliteTest.php b/tests/unit/Codeception/Lib/Driver/SqliteTest.php
@@ -10,6 +10,9 @@ class SqliteTest extends \PHPUnit_Framework_TestCase
         'password' => ''
     );
 
+    /**
+     * @var \Codeception\Lib\Driver\Sqlite
+     */
     protected static $sqlite;
     protected static $sql;
 
@@ -124,4 +127,16 @@ public function testThrowsExceptionIfInMemoryDatabaseIsUsed()
 
         Db::create('sqlite::memory:', '', '');
     }
+
+    /**
+     * @issue https://github.com/Codeception/Codeception/issues/4059
+     */
+    public function testLoadDumpEndingWithoutDelimiter()
+    {
+        $newDriver = new \Codeception\Lib\Driver\Sqlite(self::$config['dsn'], '', '');
+        $newDriver->load(['INSERT INTO empty_table VALUES(1, "test")']);
+        $res = $newDriver->getDbh()->query("select * from empty_table where field = 'test'");
+        $this->assertNotEquals(false, $res);
+        $this->assertNotEmpty($res->fetchAll());
+    }
 }