- Table-Names can now also be arrays

Author: rkrx

src/Builder/Insert.php

@@ -250,6 +250,7 @@ private function addAllTo(array $data, array $mask = null, array $excludeFields
 		foreach ($data as $field => $value) {
 			call_user_func($fn, $field, $value);
 		}
+		return $this;
 	}
 
 	/**

src/Builder/QueryStatement.php

@@ -152,5 +152,6 @@ private function exceptionHandler($fn) {
 		} catch (PDOException $e) {
 			$this->exceptionInterpreter->throwMoreConcreteException($e);
 		}
+		return null;
 	}
 }

src/Builder/Traits/TableBuilder.php

@@ -36,7 +36,7 @@ protected function buildTables($query) {
 	}
 
 	/**
-	 * @return string[]
+	 * @return array[]
 	 */
 	protected function getTables() {
 		return $this->tables;

src/Builder/Traits/TableNameBuilder.php

@@ -1,6 +1,8 @@
 <?php
 namespace Kir\MySQL\Builder\Traits;
 
+use Kir\MySQL\Database;
+
 trait TableNameBuilder {
 	use AbstractAliasReplacer;
 
@@ -19,10 +21,26 @@ protected function buildTableName($alias, $name) {
 			$name = join("\n", $lines);
 			$name = '(' . trim(rtrim(trim($name), ';')) . ')';
 		}
+		if(is_array($name)) {
+			$parts = [];
+			foreach($name as $bucket) {
+				$values = [];
+				foreach($bucket as $field => $value) {
+					$values[] = sprintf('%s AS %s', $this->db()->quote($value), $this->db()->quoteField($field));
+				}
+				$parts[] = sprintf("SELECT %s", join(', ', $values));
+			}
+			$name = '(' . join("\n\tUNION\n\t", $parts) . ')';
+		}
 		$name = $this->aliasReplacer()->replace($name);
 		if($alias !== null) {
 			return sprintf("%s %s", $name, $alias);
 		}
 		return $name;
 	}
+	
+	/**
+	 * @return Database
+	 */
+	abstract protected function db();
 }

src/Databases/MySQL.php

@@ -377,6 +377,7 @@ private function exceptionHandler($fn) {
 		} catch (PDOException $e) {
 			$this->exceptionInterpreter->throwMoreConcreteException($e);
 		}
+		return null;
 	}
 
 	/**

tests/Builder/SelectTest.php

@@ -22,6 +22,16 @@ public function testFrom() {
 		$this->assertEquals("SELECT\n\ta\nFROM\n\ttest t\n", $str);
 	}
 
+	public function testFromArray() {
+		$str = TestSelect::create()
+		->field('a.a')
+		->field('b.b')
+		->from('a', [['a' => 1, 'b' => 3], ['a' => 2, 'b' => 2], ['a' => 3, 'b' => 1]])
+		->joinInner('b', [['a' => 1, 'b' => 3], ['a' => 2, 'b' => 2], ['a' => 3, 'b' => 1]])
+		->asString();
+		$this->assertEquals("SELECT\n\ta.a,\n\tb.b\nFROM\n\t(SELECT '1' AS `a`, '3' AS `b`\n\tUNION\n\tSELECT '2' AS `a`, '2' AS `b`\n\tUNION\n\tSELECT '3' AS `a`, '1' AS `b`) a\nINNER JOIN\n\t(SELECT '1' AS `a`, '3' AS `b`\n\tUNION\n\tSELECT '2' AS `a`, '2' AS `b`\n\tUNION\n\tSELECT '3' AS `a`, '1' AS `b`) b\n", $str);
+	}
+
 	public function testMultipleFrom() {
 		$str = TestSelect::create()
 		->field('a')