Changed tests, all Numbers are now enclosed by single quotes, test for "update", changes to the internal structure.

rkrx · rkrx · commit 4c4f15caa3b5 · 2014-05-07T13:09:30.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 /.idea
 /vendor
-/composer.lock
+/composer.lock
+/atlassian-ide-plugin.xml
diff --git a/src/Kir/MySQL/Builder/Delete.php b/src/Kir/MySQL/Builder/Delete.php
@@ -32,7 +32,7 @@ public function from($name) {
 	 */
 	public function where($expr) {
 		$arguments = array_slice(func_get_args(), 1);
-		$expr = $this->mysql()->quoteExpression($expr, $arguments);
+		$expr = $this->db()->quoteExpression($expr, $arguments);
 		$this->where[] = "({$expr})";
 		return $this;
 	}
diff --git a/src/Kir/MySQL/Builder/Insert.php b/src/Kir/MySQL/Builder/Insert.php
@@ -74,7 +74,7 @@ public function add($field, $value) {
 			throw new UnexpectedValueException('Field name is invalid');
 		}
 		$sqlField = $field;
-		$sqlValue = $this->mysql()->quote($value);
+		$sqlValue = $this->db()->quote($value);
 		$this->fields[$sqlField] = $sqlValue;
 		return $this;
 	}
@@ -90,7 +90,7 @@ public function update($field, $value) {
 			throw new UnexpectedValueException('Field name is invalid');
 		}
 		$sqlField = $field;
-		$sqlValue = $this->mysql()->quote($value);
+		$sqlValue = $this->db()->quote($value);
 		$this->update[$sqlField] = $sqlValue;
 		return $this;
 	}
@@ -184,7 +184,7 @@ public function __toString() {
 		}
 
 		$fields = $this->fields;
-		$tableFields = $this->getTableFields($this->table);
+		$tableFields = $this->db()->getTableFields($this->table);
 
 		$insertData = $this->buildFieldList($fields, $tableFields);
 		$updateData = $this->buildUpdate();
@@ -212,7 +212,7 @@ public function __toString() {
 	 */
 	private function buildUpdate() {
 		$queryArr = array();
-		$tableFields = $this->getTableFields($this->table);
+		$tableFields = $this->db()->getTableFields($this->table);
 		if(!empty($this->update)) {
 			$queryArr[] = "ON DUPLICATE KEY UPDATE\n";
 			$updateArr = array();
diff --git a/src/Kir/MySQL/Builder/InsertUpdateStatement.php b/src/Kir/MySQL/Builder/InsertUpdateStatement.php
@@ -1,14 +1,7 @@
 <?php
 namespace Kir\MySQL\Builder;
 
-use PDO;
-
 abstract class InsertUpdateStatement extends Statement {
-	/**
-	 * @var array
-	 */
-	private static $tableFields = array();
-
 	/**
 	 * @var array
 	 */
@@ -23,22 +16,6 @@ public function setMask(array $mask) {
 		return $this;
 	}
 
-	/**
-	 * @param string $table
-	 * @return array
-	 */
-	protected function getTableFields($table) {
-		if(array_key_exists($table, self::$tableFields)) {
-			return self::$tableFields[$table];
-		}
-		$stmt = $this->mysql()->query("DESCRIBE {$table}");
-		$stmt->execute();
-		$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
-		self::$tableFields[$table] = array_map(function ($row) { return $row['Field']; }, $rows);
-		$stmt->closeCursor();
-		return self::$tableFields[$table];
-	}
-
 	/**
 	 * @param array $fields
 	 * @param array $tableFields
@@ -50,7 +27,7 @@ protected function buildFieldList(array $fields, array $tableFields, array $resu
 			if (is_int($fieldName)) {
 				$result[] = $fieldValue;
 			} elseif ($this->isFieldAccessible($fieldName, $tableFields)) {
-				$fieldName = $this->mysql()->quoteField($fieldName);
+				$fieldName = $this->db()->quoteField($fieldName);
 				$result[] = "\t{$fieldName} = {$fieldValue}";
 			}
 		}
diff --git a/src/Kir/MySQL/Builder/RunnableDelete.php b/src/Kir/MySQL/Builder/RunnableDelete.php
@@ -7,6 +7,6 @@ class RunnableDelete extends Delete {
 	 */
 	public function run() {
 		$query = (string)$this;
-		return $this->mysql()->exec($query);
+		return $this->db()->exec($query);
 	}
 }
diff --git a/src/Kir/MySQL/Builder/RunnableInsert.php b/src/Kir/MySQL/Builder/RunnableInsert.php
@@ -6,7 +6,7 @@ class RunnableInsert extends Insert {
 	 */
 	public function run() {
 		$query = $this->__toString();
-		$this->mysql()->exec($query);
-		return (int) $this->mysql()->getLastInsertId();
+		$this->db()->exec($query);
+		return (int) $this->db()->getLastInsertId();
 	}
 }
diff --git a/src/Kir/MySQL/Builder/RunnableSelect.php b/src/Kir/MySQL/Builder/RunnableSelect.php
@@ -62,6 +62,6 @@ public function fetchValue($default = null) {
 	 * @return PDOStatement
 	 */
 	private function createStatement() {
-		return $this->mysql()->query($this->__toString());
+		return $this->db()->query($this->__toString());
 	}
 }
diff --git a/src/Kir/MySQL/Builder/RunnableUpdate.php b/src/Kir/MySQL/Builder/RunnableUpdate.php
@@ -7,6 +7,6 @@ class RunnableUpdate extends Update {
 	 */
 	public function run() {
 		$query = $this->__toString();
-		return $this->mysql()->exec($query);
+		return $this->db()->exec($query);
 	}
 }
diff --git a/src/Kir/MySQL/Builder/Select.php b/src/Kir/MySQL/Builder/Select.php
@@ -147,7 +147,7 @@ public function orderBy($expression, $direction = 'asc') {
 				$expression[0],
 				array_slice($expression, 1)
 			);
-			$expression = call_user_func_array(array($this->mysql(), 'quoteExpression'), $arguments);
+			$expression = call_user_func_array(array($this->db(), 'quoteExpression'), $arguments);
 		}
 		$this->orderBy[] = array($expression, $direction);
 		return $this;
@@ -167,7 +167,7 @@ public function groupBy($expression) {
 					$expression[0],
 					array_slice($expression, 1)
 				);
-				$expression = call_user_func_array(array($this->mysql(), 'quoteExpression'), $arguments);
+				$expression = call_user_func_array(array($this->db(), 'quoteExpression'), $arguments);
 			}
 			$this->groupBy[] = $expression;
 		}
@@ -298,7 +298,7 @@ private function buildConditions($type, array $conditions, $query) {
 		$arr = array();
 		foreach($conditions as $condition) {
 			list($expression, $arguments) = $condition;
-			$expr = $this->mysql()->quoteExpression($expression, $arguments);
+			$expr = $this->db()->quoteExpression($expression, $arguments);
 			$arr[] = "\t{$expr}";
 		}
 		$query .= join("\n\tAND\n", $arr);
@@ -368,6 +368,6 @@ private function buildTableName($alias, $name) {
 	 * @return string
 	 */
 	private function buildExpression($expression, array $arguments) {
-		return $this->mysql()->quoteExpression($expression, $arguments);
+		return $this->db()->quoteExpression($expression, $arguments);
 	}
 }
diff --git a/src/Kir/MySQL/Builder/Statement.php b/src/Kir/MySQL/Builder/Statement.php
@@ -1,26 +1,26 @@
 <?php
 namespace Kir\MySQL\Builder;
 
-use Kir\MySQL\MySQL;
+use Kir\MySQL\Database;
 
 abstract class Statement {
 	/**
 	 * @var
 	 */
-	private $mysql;
+	private $db;
 
 	/**
-	 * @param MySQL $mysql
+	 * @param Database $db
 	 */
-	public function __construct(MySQL $mysql) {
-		$this->mysql = $mysql;
+	public function __construct(Database $db) {
+		$this->db = $db;
 	}
 
 	/**
-	 * @return MySQL
+	 * @return Database
 	 */
-	protected function mysql() {
-		return $this->mysql;
+	protected function db() {
+		return $this->db;
 	}
 
 	/**
diff --git a/src/Kir/MySQL/Builder/Update.php b/src/Kir/MySQL/Builder/Update.php
@@ -42,7 +42,7 @@ public function table($name) {
 	 */
 	public function set($field, $value) {
 		$sqlField = $field;
-		$sqlValue = $this->mysql()->quote($value);
+		$sqlValue = $this->db()->quote($value);
 		$this->fields[$sqlField] = $sqlValue;
 		return $this;
 	}
@@ -72,7 +72,7 @@ public function setAll(array $data) {
 	 * @return $this
 	 */
 	public function where($expr) {
-		$expr = $this->mysql()->quoteExpression($expr, array_slice(func_get_args(), 1));
+		$expr = $this->db()->quoteExpression($expr, array_slice(func_get_args(), 1));
 		$this->where[] = "({$expr})";
 		return $this;
 	}
@@ -95,7 +95,7 @@ public function __toString() {
 			throw new Exception('Specify a table-name');
 		}
 
-		$tableFields = $this->getTableFields($this->table);
+		$tableFields = $this->db()->getTableFields($this->table);
 		$sqlFields = $this->buildFieldList($this->fields, $tableFields);
 
 		if (empty($sqlFields)) {
diff --git a/src/Kir/MySQL/Database.php b/src/Kir/MySQL/Database.php
@@ -0,0 +1,70 @@
+<?php
+namespace Kir\MySQL;
+
+use Kir\MySQL\Builder\RunnableSelect;
+use PDOStatement;
+
+interface Database {
+	/**
+	 * @param string $query
+	 * @return PDOStatement
+	 */
+	public function query($query);
+
+	/**
+	 * @param string $query
+	 * @return int
+	 */
+	public function exec($query);
+
+	/**
+	 * @return int
+	 */
+	public function getLastInsertId();
+
+	/**
+	 * @param string $table
+	 * @return array
+	 */
+	public function getTableFields($table);
+
+	/**
+	 * @param mixed $expression
+	 * @param array $arguments
+	 * @return string
+	 */
+	public function quoteExpression($expression, array $arguments = array());
+
+	/**
+	 * @param mixed $value
+	 * @return string
+	 */
+	public function quote($value);
+
+	/**
+	 * @param string $field
+	 * @return string
+	 */
+	public function quoteField($field);
+
+	/**
+	 * @param array $fields
+	 * @return RunnableSelect
+	 */
+	public function select(array $fields = array());
+
+	/**
+	 * @return Builder\RunnableInsert
+	 */
+	public function insert();
+
+	/**
+	 * @return Builder\RunnableUpdate
+	 */
+	public function update();
+
+	/**
+	 * @return Builder\RunnableDelete
+	 */
+	public function delete();
+}
diff --git a/src/Kir/MySQL/Databases/MySQL.php b/src/Kir/MySQL/Databases/MySQL.php
@@ -1,12 +1,19 @@
 <?php
-namespace Kir\MySQL;
+namespace Kir\MySQL\Databases;
 
+use Kir\MySQL\Builder;
+use Kir\MySQL\Database;
 use PDO;
 use PDOStatement;
 use Kir\MySQL\Builder\RunnableSelect;
 use UnexpectedValueException;
 
-class MySQL {
+class MySQL implements Database {
+	/**
+	 * @var array
+	 */
+	private static $tableFields = array();
+
 	/**
 	 * @var PDO
 	 */
@@ -44,6 +51,22 @@ public function getLastInsertId() {
 		return $this->pdo->lastInsertId();
 	}
 
+	/**
+	 * @param string $table
+	 * @return array
+	 */
+	public function getTableFields($table) {
+		if(array_key_exists($table, self::$tableFields)) {
+			return self::$tableFields[$table];
+		}
+		$stmt = $this->pdo->query("DESCRIBE {$table}");
+		$stmt->execute();
+		$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
+		self::$tableFields[$table] = array_map(function ($row) { return $row['Field']; }, $rows);
+		$stmt->closeCursor();
+		return self::$tableFields[$table];
+	}
+
 	/**
 	 * @param mixed $expression
 	 * @param array $arguments
@@ -79,8 +102,8 @@ public function quote($value) {
 			$result = 'NULL';
 		} elseif(is_array($value)) {
 			$result = join(', ', array_map(function ($value) { return $this->quote($value); }, $value));
-		} elseif(is_numeric($value)) {
-			$result = $value;
+		/*} elseif(is_int(trim($value)) && strpos('123456789', substr(0, 1, trim($value))) !== null) {
+			$result = $value;*/
 		} else {
 			$result = $this->pdo->quote($value);
 		}
diff --git a/tests.xml b/tests.xml
@@ -7,6 +7,7 @@
 	<testsuites>
 		<testsuite name="Streams">
 			<file>tests/Kir/MySQL/Builder/SelectTest.php</file>
+			<file>tests/Kir/MySQL/Builder/UpdateTest.php</file>
 		</testsuite>
 	</testsuites>
 </phpunit>
diff --git a/tests/Kir/MySQL/Builder/SelectTest.php b/tests/Kir/MySQL/Builder/SelectTest.php
diff --git a/tests/Kir/MySQL/Builder/SelectTest/TestSelect.php b/tests/Kir/MySQL/Builder/SelectTest/TestSelect.php
diff --git a/tests/Kir/MySQL/Builder/UpdateTest.php b/tests/Kir/MySQL/Builder/UpdateTest.php
diff --git a/tests/Kir/MySQL/Builder/UpdateTest/TestUpdate.php b/tests/Kir/MySQL/Builder/UpdateTest/TestUpdate.php
diff --git a/tests/Kir/MySQL/Databases/Mock.php b/tests/Kir/MySQL/Databases/Mock.php

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public function from($name) {`
`32`	`32`	`*/`
`33`	`33`	`public function where($expr) {`
`34`	`34`	`$arguments = array_slice(func_get_args(), 1);`
`35`		`- $expr = $this->mysql()->quoteExpression($expr, $arguments);`
	`35`	`+ $expr = $this->db()->quoteExpression($expr, $arguments);`
`36`	`36`	`$this->where[] = "({$expr})";`
`37`	`37`	`return $this;`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ class RunnableDelete extends Delete {`
`7`	`7`	`*/`
`8`	`8`	`public function run() {`
`9`	`9`	`$query = (string)$this;`
`10`		`- return $this->mysql()->exec($query);`
	`10`	`+ return $this->db()->exec($query);`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ class RunnableInsert extends Insert {`
`6`	`6`	`*/`
`7`	`7`	`public function run() {`
`8`	`8`	`$query = $this->__toString();`
`9`		`- $this->mysql()->exec($query);`
`10`		`- return (int) $this->mysql()->getLastInsertId();`
	`9`	`+ $this->db()->exec($query);`
	`10`	`+ return (int) $this->db()->getLastInsertId();`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,6 @@ public function fetchValue($default = null) {`
`62`	`62`	`* @return PDOStatement`
`63`	`63`	`*/`
`64`	`64`	`private function createStatement() {`
`65`		`- return $this->mysql()->query($this->__toString());`
	`65`	`+ return $this->db()->query($this->__toString());`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@ class RunnableUpdate extends Update {`
`7`	`7`	`*/`
`8`	`8`	`public function run() {`
`9`	`9`	`$query = $this->__toString();`
`10`		`- return $this->mysql()->exec($query);`
	`10`	`+ return $this->db()->exec($query);`
`11`	`11`	`}`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public function orderBy($expression, $direction = 'asc') {`
`147`	`147`	`$expression[0],`
`148`	`148`	`array_slice($expression, 1)`
`149`	`149`	`);`
`150`		`- $expression = call_user_func_array(array($this->mysql(), 'quoteExpression'), $arguments);`
	`150`	`+ $expression = call_user_func_array(array($this->db(), 'quoteExpression'), $arguments);`
`151`	`151`	`}`
`152`	`152`	`$this->orderBy[] = array($expression, $direction);`
`153`	`153`	`return $this;`
`@@ -167,7 +167,7 @@ public function groupBy($expression) {`
`167`	`167`	`$expression[0],`
`168`	`168`	`array_slice($expression, 1)`
`169`	`169`	`);`
`170`		`- $expression = call_user_func_array(array($this->mysql(), 'quoteExpression'), $arguments);`
	`170`	`+ $expression = call_user_func_array(array($this->db(), 'quoteExpression'), $arguments);`
`171`	`171`	`}`
`172`	`172`	`$this->groupBy[] = $expression;`
`173`	`173`	`}`
`@@ -298,7 +298,7 @@ private function buildConditions($type, array $conditions, $query) {`
`298`	`298`	`$arr = array();`
`299`	`299`	`foreach($conditions as $condition) {`
`300`	`300`	`list($expression, $arguments) = $condition;`
`301`		`- $expr = $this->mysql()->quoteExpression($expression, $arguments);`
	`301`	`+ $expr = $this->db()->quoteExpression($expression, $arguments);`
`302`	`302`	`$arr[] = "\t{$expr}";`
`303`	`303`	`}`
`304`	`304`	`$query .= join("\n\tAND\n", $arr);`
`@@ -368,6 +368,6 @@ private function buildTableName($alias, $name) {`
`368`	`368`	`* @return string`
`369`	`369`	`*/`
`370`	`370`	`private function buildExpression($expression, array $arguments) {`
`371`		`- return $this->mysql()->quoteExpression($expression, $arguments);`
	`371`	`+ return $this->db()->quoteExpression($expression, $arguments);`
`372`	`372`	`}`
`373`	`373`	`}`