Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Builder/Insert.php

Author: rkrx

.gitattributes

@@ -0,0 +1,5 @@
+# Autodetect text files
+* text=auto
+
+# Force the following filetypes to have unix eols, so Windows does not break them
+*.* text eol=lf

.gitignore

@@ -1,5 +1,9 @@
-/.idea
-/vendor
-/composer.lock
-/atlassian-ide-plugin.xml
-/test.php
+/*
+!/src
+!/tests
+!/.gitattributes
+!/.gitignore
+!/.travis.yml
+!/composer.json
+!/README.md
+!/tests.xml

.travis.yml

@@ -10,4 +10,4 @@ before_script:
   - composer update
 
 script:
-  - phpunit -c tests.xml
+  - phpunit -c tests.xml

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

@@ -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,15 +172,6 @@ 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
@@ -190,6 +181,16 @@ 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();
@@ -231,7 +232,8 @@ public function __toString() {
 	 */
 	private function buildUpdate() {
 		$queryArr = array();
-		$tableFields = $this->db()->getTableFields($this->table);
+		$tableName = $this->aliasReplacer()->replace($this->table);
+		$tableFields = $this->db()->getTableFields($tableName);
 		if(!empty($this->update)) {
 			$queryArr[] = "ON DUPLICATE KEY UPDATE\n";
 			$updateArr = array();

src/Builder/RunnableSelect.php

@@ -165,7 +165,8 @@ public function getFoundRows() {
 	 */
 	private function createStatement() {
 		$db = $this->db();
-		$statement = $db->prepare($this->__toString());
+		$query = $this->__toString();
+		$statement = $db->query($query);
 		$statement->execute($this->values);
 		if($this->getCalcFoundRows()) {
 			$this->foundRows = $db->query('SELECT FOUND_ROWS()')->fetchColumn();

src/Builder/Select.php

@@ -436,7 +436,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";
 

src/Database.php

@@ -101,7 +101,7 @@ public function transactionRollback();
 	/**
 	 * @param callable $callback
 	 * @throws \Exception
-	 * @return $this
+	 * @return mixed
 	 */
 	public function transaction($callback);
 }