Merge pull request #29646 from staudenmeir/insert-using

[6.0] Return number of inserted rows from insertUsing()
laravel · Aug 20, 2019 · 6f2a3b3 · 6f2a3b3
2 parents c451f22 + 390a864
commit 6f2a3b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Illuminate/Database/Query/Builder.php b/src/Illuminate/Database/Query/Builder.php
@@ -2636,13 +2636,13 @@ public function insertGetId(array $values, $sequence = null)
      *
      * @param  array  $columns
      * @param  \Closure|\Illuminate\Database\Query\Builder|string  $query
-     * @return bool
+     * @return int
      */
     public function insertUsing(array $columns, $query)
     {
         [$sql, $bindings] = $this->createSub($query);
 
-        return $this->connection->insert(
+        return $this->connection->affectingStatement(
             $this->grammar->compileInsertUsing($this, $columns, $sql),
             $this->cleanBindings($bindings)
         );

diff --git a/tests/Database/DatabaseQueryBuilderTest.php b/tests/Database/DatabaseQueryBuilderTest.php
@@ -1905,7 +1905,7 @@ public function testInsertMethod()
     public function testInsertUsingMethod()
     {
         $builder = $this->getBuilder();
-        $builder->getConnection()->shouldReceive('insert')->once()->with('insert into "table1" ("foo") select "bar" from "table2" where "foreign_id" = ?', [5])->andReturn(true);
+        $builder->getConnection()->shouldReceive('affectingStatement')->once()->with('insert into "table1" ("foo") select "bar" from "table2" where "foreign_id" = ?', [5])->andReturn(1);
 
         $result = $builder->from('table1')->insertUsing(
             ['foo'],
@@ -1914,7 +1914,7 @@ function (Builder $query) {
             }
         );
 
-        $this->assertTrue($result);
+        $this->assertEquals(1, $result);
     }
 
     public function testInsertGetIdMethod()