Added massive functionality

Author: rkrx

src/Builder/Delete.php

@@ -1,39 +1,42 @@
 <?php
 namespace Kir\MySQL\Builder;
 
-use Kir\MySQL\Tools\AliasReplacer;
+use Kir\MySQL\Builder\Traits\JoinBuilder;
+use Kir\MySQL\Builder\Traits\LimitBuilder;
+use Kir\MySQL\Builder\Traits\OffsetBuilder;
+use Kir\MySQL\Builder\Traits\OrderByBuilder;
+use Kir\MySQL\Builder\Traits\TableBuilder;
+use Kir\MySQL\Builder\Traits\TableNameBuilder;
+use Kir\MySQL\Builder\Traits\WhereBuilder;
 
 class Delete extends Statement {
-	/**
-	 * @var string
-	 */
-	private $table = null;
+	use TableNameBuilder;
+	use TableBuilder;
+	use JoinBuilder;
+	use WhereBuilder;
+	use OrderByBuilder;
+	use LimitBuilder;
+	use OffsetBuilder;
 
 	/**
-	 * @var array
+	 * @var string[]
 	 */
-	private $where = array();
+	private $aliases = array();
 
 	/**
 	 * Name der Tabelle
 	 *
-	 * @param string $name
+	 * @param string $alias
+	 * @param string $table
 	 * @return $this
-
 	 */
-	public function from($name) {
-		$this->table = $name;
-		return $this;
-	}
-
-	/**
-	 * @param string $expr
-	 * @return $this
-	 */
-	public function where($expr) {
-		$arguments = array_slice(func_get_args(), 1);
-		$expr = $this->db()->quoteExpression($expr, $arguments);
-		$this->where[] = "({$expr})";
+	public function from($alias, $table = null) {
+		if($table === null) {
+			list($alias, $table) = [$table, $alias];
+		} else {
+			$this->aliases[] = $alias;
+		}
+		$this->addTable($alias, $table);
 		return $this;
 	}
 
@@ -42,20 +45,16 @@ public function where($expr) {
 	 * @throws Exception
 	 */
 	public function __toString() {
-		if ($this->table === null) {
-			throw new Exception('Specify a table-name');
-		}
-
-		$sqlTable = $this->aliasReplacer()->replace($this->table);
-		$queryArr = array();
-		$queryArr[] = "DELETE "."FROM\n\t{$sqlTable}\n";
-
-		if (!empty($this->where)) {
-			$sqlWhere = join("\n\tAND\n\t", $this->where);
-			$queryArr[] = "WHERE\n\t{$sqlWhere}\n";
-		}
-		$queryArr[] = ";";
-
-		return join('', $queryArr);
+		$query = "DELETE ";
+		$query .= join(', ', $this->aliases);
+		$query = trim($query) . " FROM\n";
+		$query = $this->buildTables($query);
+		$query = $this->buildJoins($query);
+		$query = $this->buildWhereConditions($query);
+		$query = $this->buildOrder($query);
+		$query = $this->buildLimit($query);
+		$query = $this->buildOffset($query);
+		$query .= ";\n";
+		return $query;
 	}
 }

src/Builder/Insert.php

@@ -29,14 +29,23 @@ class Insert extends InsertUpdateStatement {
 	 * @var Select
 	 */
 	private $from = null;
+	/**
+	 * @var callable
+	 */
+	private $tableFields = null;
 
 	/**
 	 * @param string $table
 	 * @return $this
-
 	 */
 	public function into($table) {
 		$this->table = $table;
+		$this->tableFields = function () {
+			static $cache = null;
+			if($cache === null) {
+				$cache = $this->db()->getTableFields($this->table);
+			}
+		};
 		return $this;
 	}
 
@@ -141,6 +150,7 @@ public function addOrUpdateExpr($str) {
 	 * @throws UnexpectedValueException
 	 */
 	public function addAll(array $data) {
+		$data = $this->clearValues($data);
 		foreach ($data as $field => $value) {
 			$this->add($field, $value);
 		}
@@ -153,6 +163,7 @@ public function addAll(array $data) {
 	 * @return $this
 	 */
 	public function updateAll(array $data) {
+		$data = $this->clearValues($data);
 		foreach ($data as $field => $value) {
 			if ($field != $this->keyField) {
 				$this->update($field, $value);
@@ -202,15 +213,11 @@ public function __toString() {
 			$queryArr[] = trim(trim($this->from), ';');
 		} else {
 			$fields = $this->fields;
-			$tableFields = $this->db()->getTableFields($tableName);
-
-			$insertData = $this->buildFieldList($fields, $tableFields);
-
-			if (empty($insertData)) {
+			$insertData = $this->buildFieldList($fields);
+			if (!count($insertData)) {
 				throw new Exception('No field-data found');
 			}
-
-			$queryArr[] = "SET\n{$insertData}\n";
+			$queryArr[] = sprintf("SET\n%s\n", join(",\n", $insertData));
 		}
 
 		$updateData = $this->buildUpdate();
@@ -230,17 +237,15 @@ public function __toString() {
 	 */
 	private function buildUpdate() {
 		$queryArr = array();
-		$tableName = $this->aliasReplacer()->replace($this->table);
-		$tableFields = $this->db()->getTableFields($tableName);
 		if(!empty($this->update)) {
 			$queryArr[] = "ON DUPLICATE KEY UPDATE\n";
 			$updateArr = array();
-
 			if($this->keyField !== null) {
-				$updateArr[] = "`{$this->keyField}` = LAST_INSERT_ID({$this->keyField})";
+				$updateArr[] = "\t`{$this->keyField}` = LAST_INSERT_ID({$this->keyField})";
 			}
+			$updateArr = $this->buildFieldList($this->update, $updateArr);
 
-			$queryArr[] = $this->buildFieldList($this->update, $tableFields, $updateArr);
+			$queryArr[] = join(",\n", $updateArr);
 		}
 		return join('', $queryArr);
 	}
@@ -252,4 +257,25 @@ private function buildUpdate() {
 	private function isFieldNameValid($fieldName) {
 		return is_numeric($fieldName) || !is_scalar($fieldName);
 	}
+
+	/**
+	 * @param array $values
+	 * @return array
+	 * @throws Exception
+	 */
+	private function clearValues(array $values) {
+		if(!count($values)) {
+			return [];
+		}
+		$fields = $this->db()->getTableFields($this->table);
+		$result = array();
+
+		foreach ($values as $fieldName => $fieldValue) {
+			if(in_array($fieldName, $fields)) {
+				$result[$fieldName] = $fieldValue;
+			}
+		}
+
+		return $result;
+	}
 }

src/Builder/InsertUpdateStatement.php

@@ -1,6 +1,8 @@
 <?php
 namespace Kir\MySQL\Builder;
 
+use Kir\MySQL\Builder\Internal\DefaultValue;
+
 abstract class InsertUpdateStatement extends Statement {
 	/**
 	 * @var array
@@ -25,23 +27,22 @@ public function setMask(array $mask) {
 
 	/**
 	 * @param array $fields
-	 * @param array $tableFields
-	 * @param array $result
+	 * @param array $query
 	 * @return string
 	 */
-	protected function buildFieldList(array $fields, array $tableFields, array $result = array()) {
+	protected function buildFieldList(array $fields, array $query = array()) {
 		foreach ($fields as $fieldName => $fieldValue) {
-			if(is_array($this->mask) && !in_array($fieldName, $this->mask)) {
-				continue;
+			if($fieldValue instanceof DefaultValue) {
+				$fieldValue = 'DEFAULT';
 			}
 			if (is_int($fieldName)) {
-				$result[] = $fieldValue;
-			} elseif ($this->isFieldAccessible($fieldName, $tableFields)) {
+				$query[] = "\t{$fieldValue}";
+			} else {
 				$fieldName = $this->db()->quoteField($fieldName);
-				$result[] = "\t{$fieldName} = {$fieldValue}";
+				$query[] = "\t{$fieldName}={$fieldValue}";
 			}
 		}
-		return join(",\n", $result);
+		return $query;
 	}
 
 	/**

src/Builder/Internal/DefaultValue.php

@@ -0,0 +1,5 @@
+<?php
+namespace Kir\MySQL\Builder\Internal;
+
+class DefaultValue {
+}