Changed the internal behavior of aliasReplacer

Author: rkrx

src/Builder/Delete.php

@@ -46,7 +46,7 @@ public function __toString() {
 			throw new Exception('Specify a table-name');
 		}
 
-		$sqlTable = (new AliasReplacer($this->db()->getAliasRegistry()))->replace($this->table);
+		$sqlTable = $this->aliasReplacer()->replace($this->table);
 		$queryArr = array();
 		$queryArr[] = "DELETE "."FROM\n\t{$sqlTable}\n";
 

src/Builder/Insert.php

@@ -181,8 +181,10 @@ public function __toString() {
 			throw new Exception('Specify a table-name');
 		}
 
+		$tableName = $this->aliasReplacer()->replace($this->table);
+
 		$fields = $this->fields;
-		$tableFields = $this->db()->getTableFields($this->table);
+		$tableFields = $this->db()->getTableFields($tableName);
 
 		$insertData = $this->buildFieldList($fields, $tableFields);
 		$updateData = $this->buildUpdate();
@@ -191,8 +193,6 @@ public function __toString() {
 			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";

src/Builder/Select.php

@@ -429,7 +429,7 @@ private function buildTableName($alias, $name) {
 			$name = join("\n", $lines);
 			$name = '(' . trim(rtrim(trim($name), ';')) . ')';
 		}
-		$name = (new AliasReplacer($this->db()->getAliasRegistry()))->replace($name);
+		$name = $this->aliasReplacer()->replace($name);
 		return sprintf("%s %s", $name, $alias);
 	}
 

src/Builder/Statement.php

@@ -2,18 +2,25 @@
 namespace Kir\MySQL\Builder;
 
 use Kir\MySQL\Database;
+use Kir\MySQL\Tools\AliasReplacer;
 
 abstract class Statement {
 	/**
-	 * @var
+	 * @var Database
 	 */
 	private $db;
 
+	/**
+	 * @var AliasReplacer
+	 */
+	private $aliasReplacer;
+
 	/**
 	 * @param Database $db
 	 */
 	public function __construct(Database $db) {
 		$this->db = $db;
+		$this->aliasReplacer = new AliasReplacer($db->getAliasRegistry());
 	}
 
 	/**
@@ -39,6 +46,13 @@ public function cloneStatement() {
 		return clone $this;
 	}
 
+	/**
+	 * @return AliasReplacer
+	 */
+	public function aliasReplacer() {
+		return $this->aliasReplacer;
+	}
+
 	/**
 	 * @return Database
 	 */

src/Builder/Update.php

@@ -94,15 +94,15 @@ public function __toString() {
 			throw new Exception('Specify a table-name');
 		}
 
-		$tableFields = $this->db()->getTableFields($this->table);
+		$tableName = $this->aliasReplacer()->replace($this->table);
+
+		$tableFields = $this->db()->getTableFields($tableName);
 		$sqlFields = $this->buildFieldList($this->fields, $tableFields);
 
 		if (empty($sqlFields)) {
 			throw new Exception('No field-data found');
 		}
 
-		$tableName = (new AliasReplacer($this->db()->getAliasRegistry()))->replace($this->table);
-
 		$queryArr = array();
 		$queryArr[] = "UPDATE\n\t{$tableName}\nSET\n{$sqlFields}\n";