Merge pull request laravel#7346 from konomae/patch-1

taylorotwell · taylorotwell · commit 905415a17f0b · 2015-02-11T09:12:09.000-06:00
[5.0] Fix Multi-Row Insert For SQLite
diff --git a/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php b/src/Illuminate/Database/Query/Grammars/SQLiteGrammar.php
@@ -56,7 +56,7 @@ public function compileInsert(Builder $query, array $values)
 
 		$columns = array_fill(0, count($values), implode(', ', $columns));
 
-		return "insert into $table ($names) select ".implode(' union select ', $columns);
+		return "insert into $table ($names) select ".implode(' union all select ', $columns);
 	}
 
 	/**
diff --git a/tests/Database/DatabaseEloquentIntegrationTest.php b/tests/Database/DatabaseEloquentIntegrationTest.php
@@ -242,6 +242,32 @@ public function testBasicMorphManyRelationship()
 		$this->assertEquals('First Post', $photos[3]->imageable->name);
 	}
 
+
+	public function testMultiInsertsWithDifferentValues()
+	{
+		$date = '1970-01-01';
+		$result = EloquentTestPost::insert([
+			['user_id' => 1, 'name' => 'Post', 'created_at' => $date, 'updated_at' => $date],
+			['user_id' => 2, 'name' => 'Post', 'created_at' => $date, 'updated_at' => $date],
+		]);
+
+		$this->assertTrue($result);
+		$this->assertEquals(2, EloquentTestPost::count());
+	}
+
+
+	public function testMultiInsertsWithSameValues()
+	{
+		$date = '1970-01-01';
+		$result = EloquentTestPost::insert([
+			['user_id' => 1, 'name' => 'Post', 'created_at' => $date, 'updated_at' => $date],
+			['user_id' => 1, 'name' => 'Post', 'created_at' => $date, 'updated_at' => $date],
+		]);
+
+		$this->assertTrue($result);
+		$this->assertEquals(2, EloquentTestPost::count());
+	}
+
 	/**
 	 * Helpers...
 	 */
diff --git a/tests/Database/DatabaseQueryBuilderTest.php b/tests/Database/DatabaseQueryBuilderTest.php
@@ -837,7 +837,7 @@ public function testInsertMethod()
 	public function testSQLiteMultipleInserts()
 	{
 		$builder = $this->getSQLiteBuilder();
-		$builder->getConnection()->shouldReceive('insert')->once()->with('insert into "users" ("email", "name") select ? as "email", ? as "name" union select ? as "email", ? as "name"', array('foo', 'taylor', 'bar', 'dayle'))->andReturn(true);
+		$builder->getConnection()->shouldReceive('insert')->once()->with('insert into "users" ("email", "name") select ? as "email", ? as "name" union all select ? as "email", ? as "name"', array('foo', 'taylor', 'bar', 'dayle'))->andReturn(true);
 		$result = $builder->from('users')->insert(array(array('email' => 'foo', 'name' => 'taylor'), array('email' => 'bar', 'name' => 'dayle')));
 		$this->assertTrue($result);
 	}

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public function compileInsert(Builder $query, array $values)`
`56`	`56`
`57`	`57`	`$columns = array_fill(0, count($values), implode(', ', $columns));`
`58`	`58`
`59`		`- return "insert into $table ($names) select ".implode(' union select ', $columns);`
	`59`	`+ return "insert into $table ($names) select ".implode(' union all select ', $columns);`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -837,7 +837,7 @@ public function testInsertMethod()`
`837`	`837`	`public function testSQLiteMultipleInserts()`
`838`	`838`	`{`
`839`	`839`	`$builder = $this->getSQLiteBuilder();`
`840`		`- $builder->getConnection()->shouldReceive('insert')->once()->with('insert into "users" ("email", "name") select ? as "email", ? as "name" union select ? as "email", ? as "name"', array('foo', 'taylor', 'bar', 'dayle'))->andReturn(true);`
	`840`	`+ $builder->getConnection()->shouldReceive('insert')->once()->with('insert into "users" ("email", "name") select ? as "email", ? as "name" union all select ? as "email", ? as "name"', array('foo', 'taylor', 'bar', 'dayle'))->andReturn(true);`
`841`	`841`	`$result = $builder->from('users')->insert(array(array('email' => 'foo', 'name' => 'taylor'), array('email' => 'bar', 'name' => 'dayle')));`
`842`	`842`	`$this->assertTrue($result);`
`843`	`843`	`}`