Added MassInsert

Author: rkrx

src/Builder/Insert.php

@@ -9,26 +9,26 @@ class Insert extends InsertUpdateStatement {
 	 * @var array
 	 */
 	private $fields = array();
-
 	/**
 	 * @var array
 	 */
 	private $update = array();
-
 	/**
 	 * @var string
 	 */
 	private $table = null;
-
 	/**
 	 * @var string
 	 */
 	private $keyField = null;
-
 	/**
 	 * @var bool
 	 */
 	private $ignore = false;
+	/**
+	 * @var Select
+	 */
+	private $from = null;
 
 	/**
 	 * @param string $table
@@ -172,6 +172,15 @@ public function addOrUpdateAll(array $data) {
 		return $this;
 	}
 
+	/**
+	 * @param Select $select
+	 * @return $this
+	 */
+	public function from(Select $select) {
+		$this->from = $select;
+		return $this;
+	}
+
 	/**
 	 * @throws Exception
 	 * @return string
@@ -181,25 +190,35 @@ public function __toString() {
 			throw new Exception('Specify a table-name');
 		}
 
-		$fields = $this->fields;
-		$tableFields = $this->db()->getTableFields($this->table);
-
-		$insertData = $this->buildFieldList($fields, $tableFields);
-		$updateData = $this->buildUpdate();
-
-		if (empty($insertData)) {
-			throw new Exception('No field-data found');
-		}
-
 		$tableName = (new AliasReplacer($this->db()->getAliasRegistry()))->replace($this->table);
 
 		$queryArr = array();
 		$ignoreStr = $this->ignore ? ' IGNORE' : '';
 		$queryArr[] = "INSERT{$ignoreStr} INTO\n\t{$tableName}\n";
-		$queryArr[] = "SET\n{$insertData}\n";
+
+		if($this->from !== null) {
+			$fields = $this->from->getFields();
+			$queryArr[] = sprintf("\t(%s)\n", join(', ', array_keys($fields)));
+			$queryArr[] = trim(trim($this->from), ';');
+		} else {
+			$fields = $this->fields;
+			$tableFields = $this->db()->getTableFields($this->table);
+
+			$insertData = $this->buildFieldList($fields, $tableFields);
+
+			if (empty($insertData)) {
+				throw new Exception('No field-data found');
+			}
+
+			$queryArr[] = "SET\n{$insertData}\n";
+
+		}
+
+		$updateData = $this->buildUpdate();
 		if($updateData) {
 			$queryArr[] = "{$updateData}\n";
 		}
+
 		$queryArr[] = ";\n";
 
 		$query = join('', $queryArr);

src/Builder/Select.php

@@ -82,6 +82,13 @@ public function fields(array $fields) {
 		return $this;
 	}
 
+	/**
+	 * @return array
+	 */
+	public function getFields() {
+		return $this->fields;
+	}
+
 	/**
 	 * @param string $alias
 	 * @param string $table

tests.xml

@@ -6,10 +6,7 @@
 		 timeoutForSmallTests="5">
 	<testsuites>
 		<testsuite name="Streams">
-			<file>tests/Builder/SelectTest.php</file>
-			<file>tests/Builder/UpdateTest.php</file>
-			<file>tests/Builder/InsertTest.php</file>
-			<file>tests/Builder/DeleteTest.php</file>
+			<directory>tests</directory>
 		</testsuite>
 	</testsuites>
 </phpunit>

tests/Builder/InsertTest.php

@@ -2,6 +2,7 @@
 namespace Kir\MySQL\Builder;
 
 use Kir\MySQL\Builder\InsertTest\TestInsert;
+use Kir\MySQL\Builder\SelectTest\TestSelect;
 
 class InsertTest extends \PHPUnit_Framework_TestCase {
 	public function testAlias() {
@@ -12,4 +13,20 @@ public function testAlias() {
 
 		$this->assertEquals($query, 'INSERT'.' INTO shop.orders_items SET last_update=NOW() ;');
 	}
+
+	public function testMassInsert() {
+		$select = TestSelect::create()
+		->fields(['a' => 'b'])
+		->from('oi', 'orders#items')
+		->where('1!=2');
+
+		$query = TestInsert::create()
+		->into('orders#items')
+		->from($select)
+		->updateExpr('a = VALUES(a)')
+		->debug()
+		->asString();
+
+		$this->assertEquals('', $query);
+	}
 }