Make Query::insert() behave when called multiple times.

When insert() is invoked multiple times, it should reset the ValueExpression. Not doing so causes an incorrect query to be generated. Refs #8815
cakephp · May 12, 2016 · dc5cc8b · dc5cc8b
1 parent f61575f
commit dc5cc8b
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 4 deletions.
diff --git a/src/Database/Query.php b/src/Database/Query.php
@@ -1320,10 +1320,7 @@ public function insert(array $columns, array $types = [])
         $this->_dirty();
         $this->_type = 'insert';
         $this->_parts['insert'][1] = $columns;
-
-        if (!$this->_parts['values']) {
-            $this->_parts['values'] = new ValuesExpression($columns, $this->typeMap()->types($types));
-        }
+        $this->_parts['values'] = new ValuesExpression($columns, $this->typeMap()->types($types));
 
         return $this;
     }

diff --git a/tests/TestCase/Database/QueryTest.php b/tests/TestCase/Database/QueryTest.php
@@ -2719,6 +2719,31 @@ public function testInsertNothing()
         $query->insert([]);
     }
 
+    /**
+     * Test insert overwrites values
+     *
+     * @return void
+     */
+    public function testInsertOverwritesValues()
+    {
+        $this->loadFixtures('Articles');
+        $query = new Query($this->connection);
+        $query->insert(['title', 'body'])
+            ->insert(['title'])
+            ->into('articles')
+            ->values([
+                'title' => 'mark',
+            ]);
+
+        $result = $query->sql();
+        $this->assertQuotedQuery(
+            'INSERT INTO <articles> \(<title>\) (OUTPUT INSERTED\.\* )?' .
+            'VALUES \(:c0\)',
+            $result,
+            !$this->autoQuote
+        );
+    }
+
     /**
      * Test inserting a single row.
      *