Changed directory structure to psr-4

rkrx · rkrx · commit a967b6ccb106 · 2014-11-13T01:19:52.000+01:00
diff --git a/composer.json b/composer.json
@@ -7,6 +7,7 @@
 		"email": "ron.kirschler@gmail.com"
 	}],
 	"require-dev": {
+		"php": ">= 5.4"
 		"phpunit/phpunit": "~4.0"
 	},
 	"autoload": {
diff --git a/src/Builder/Delete.php b/src/Builder/Delete.php
@@ -1,6 +1,8 @@
 <?php
 namespace Kir\MySQL\Builder;
 
+use Kir\MySQL\Tools\AliasReplacer;
+
 class Delete extends Statement {
 	/**
 	 * @var string
@@ -44,7 +46,7 @@ public function __toString() {
 			throw new Exception('Specify a table-name');
 		}
 
-		$sqlTable = $this->table;
+		$sqlTable = (new AliasReplacer($this->db()->getAliasRegistry()))->replace($this->table);
 		$queryArr = array();
 		$queryArr[] = "DELETE "."FROM\n\t{$sqlTable}\n";
 
diff --git a/src/Builder/Insert.php b/src/Builder/Insert.php
@@ -1,6 +1,7 @@
 <?php
 namespace Kir\MySQL\Builder;
 
+use Kir\MySQL\Tools\AliasReplacer;
 use UnexpectedValueException;
 
 class Insert extends InsertUpdateStatement {
@@ -190,9 +191,11 @@ 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{$this->table}\n";
+		$queryArr[] = "INSERT{$ignoreStr} INTO\n\t{$tableName}\n";
 		$queryArr[] = "SET\n{$insertData}\n";
 		if($updateData) {
 			$queryArr[] = "{$updateData}\n";
diff --git a/src/Builder/Select.php b/src/Builder/Select.php
@@ -1,6 +1,8 @@
 <?php
 namespace Kir\MySQL\Builder;
 
+use Kir\MySQL\Tools\AliasReplacer;
+
 class Select extends Statement {
 	/**
 	 * @var string[]
@@ -427,6 +429,7 @@ private function buildTableName($alias, $name) {
 			$name = join("\n", $lines);
 			$name = '(' . trim(rtrim(trim($name), ';')) . ')';
 		}
+		$name = (new AliasReplacer($this->db()->getAliasRegistry()))->replace($name);
 		return sprintf("%s %s", $name, $alias);
 	}
 
diff --git a/src/Builder/Update.php b/src/Builder/Update.php
@@ -1,6 +1,8 @@
 <?php
 namespace Kir\MySQL\Builder;
 
+use Kir\MySQL\Tools\AliasReplacer;
+
 class Update extends InsertUpdateStatement {
 	/**
 	 * @var array
@@ -99,8 +101,10 @@ public function __toString() {
 			throw new Exception('No field-data found');
 		}
 
+		$tableName = (new AliasReplacer($this->db()->getAliasRegistry()))->replace($this->table);
+
 		$queryArr = array();
-		$queryArr[] = "UPDATE\n\t{$this->table}\nSET\n{$sqlFields}\n";
+		$queryArr[] = "UPDATE\n\t{$tableName}\nSET\n{$sqlFields}\n";
 
 		if (!empty($this->where)) {
 			$sqlWhere = join("\n\tAND\n\t", $this->where);
diff --git a/src/Database.php b/src/Database.php
@@ -3,8 +3,14 @@
 
 use Kir\MySQL\Builder\Exception;
 use Kir\MySQL\Builder\RunnableSelect;
+use Kir\MySQL\Tools\AliasRegistry;
 
 interface Database {
+	/**
+	 * @return AliasRegistry
+	 */
+	public function getAliasRegistry();
+
 	/**
 	 * @param string $query
 	 * @throws Exception
diff --git a/src/Databases/MySQL.php b/src/Databases/MySQL.php
@@ -4,25 +4,39 @@
 use Kir\MySQL\Builder;
 use Kir\MySQL\Builder\Exception;
 use Kir\MySQL\Database;
+use Kir\MySQL\Tools\AliasRegistry;
 use UnexpectedValueException;
 use Kir\MySQL\Builder\RunnableSelect;
 
+/**
+ */
 class MySQL implements Database {
 	/**
 	 * @var array
 	 */
 	private static $tableFields = array();
-
 	/**
 	 * @var \PDO
 	 */
 	private $pdo;
+	/**
+	 * @var AliasRegistry
+	 */
+	private $aliasRegistry;
 
 	/**
 	 * @param \PDO $pdo
 	 */
 	public function __construct(\PDO $pdo) {
 		$this->pdo = $pdo;
+		$this->aliasRegistry = new AliasRegistry();
+	}
+
+	/**
+	 * @return AliasRegistry
+	 */
+	public function getAliasRegistry() {
+		return $this->aliasRegistry;
 	}
 
 	/**
diff --git a/src/Tools/AliasRegistry.php b/src/Tools/AliasRegistry.php
@@ -0,0 +1,38 @@
+<?php
+namespace Kir\MySQL\Tools;
+
+class AliasRegistry {
+	/**
+	 * @var string[]
+	 */
+	private $aliases = array();
+
+	/**
+	 * @param string $alias
+	 * @param string $string
+	 * @return $this
+	 */
+	public function add($alias, $string) {
+		$this->aliases[$alias] = $string;
+		return $this;
+	}
+
+	/**
+	 * @param string $alias
+	 * @throws \Exception
+	 * @return string
+	 */
+	public function get($alias) {
+		if(!array_key_exists($alias, $this->aliases)) {
+			throw new \Exception("Alias not found: {$alias}");
+		}
+		return $this->aliases[$alias];
+	}
+
+	/**
+	 * @return string[]
+	 */
+	public function getAll() {
+		return $this->aliases;
+	}
+}
diff --git a/src/Tools/AliasReplacer.php b/src/Tools/AliasReplacer.php
@@ -0,0 +1,30 @@
+<?php
+namespace Kir\MySQL\Tools;
+
+class AliasReplacer {
+	/**
+	 * @var AliasRegistry
+	 */
+	private $aliasRegistry;
+
+	/**
+	 * @param AliasRegistry $aliasRegistry
+	 */
+	public function __construct(AliasRegistry $aliasRegistry) {
+		$this->aliasRegistry = $aliasRegistry;
+	}
+
+	/**
+	 * @param string $name
+	 * @return string
+	 */
+	public function replace($name) {
+		$fn = function ($values) {
+			$alias = $values[1];
+			$part = $values[2];
+			$string = $this->aliasRegistry->get($alias);
+			return $string . $part;
+		};
+		return preg_replace_callback('/^(\\w+)#(\\w+)$/', $fn, $name);
+	}
+}
diff --git a/tests.xml b/tests.xml
@@ -8,6 +8,8 @@
 		<testsuite name="Streams">
 			<file>tests/Builder/SelectTest.php</file>
 			<file>tests/Builder/UpdateTest.php</file>
+			<file>tests/Builder/InsertTest.php</file>
+			<file>tests/Builder/DeleteTest.php</file>
 		</testsuite>
 	</testsuites>
 </phpunit>
diff --git a/tests/Builder/DeleteTest.php b/tests/Builder/DeleteTest.php
@@ -0,0 +1,14 @@
+<?php
+namespace Kir\MySQL\Builder;
+
+use Kir\MySQL\Builder\DeleteTest\TestDelete;
+
+class DeleteTest extends \PHPUnit_Framework_TestCase {
+	public function testAlias() {
+		$query = TestDelete::create()
+		->from('orders#test')
+		->where('a = 1')
+		->asString();
+		$this->assertEquals('DELETE FROM shop.orders_test WHERE (a = 1) ;', $query);
+	}
+}
diff --git a/tests/Builder/DeleteTest/TestDelete.php b/tests/Builder/DeleteTest/TestDelete.php
@@ -0,0 +1,32 @@
+<?php
+namespace Kir\MySQL\Builder\DeleteTest;
+
+use Kir\MySQL\Builder\Delete;
+use Kir\MySQL\Databases\Mock;
+
+class TestDelete extends Delete {
+	/**
+	 * @return static
+	 */
+	public static function create() {
+		$functions = array(
+			'getTableFields' => function ($tableName) {
+				return array(
+					'id',
+					'name',
+					'last_update'
+				);
+			}
+		);
+		$db = new Mock($functions);
+		return new static($db);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function asString() {
+		$str = $this->__toString();
+		return trim(preg_replace('/\\s+/', ' ', $str));
+	}
+}
diff --git a/tests/Builder/InsertTest.php b/tests/Builder/InsertTest.php
@@ -0,0 +1,15 @@
+<?php
+namespace Kir\MySQL\Builder;
+
+use Kir\MySQL\Builder\InsertTest\TestInsert;
+
+class InsertTest extends \PHPUnit_Framework_TestCase {
+	public function testAlias() {
+		$query = TestInsert::create()
+		->into('orders#items')
+		->addExpr('last_update=NOW()')
+		->asString();
+
+		$this->assertEquals($query, 'INSERT'.' INTO shop.orders_items SET last_update=NOW() ;');
+	}
+}
diff --git a/tests/Builder/InsertTest/TestInsert.php b/tests/Builder/InsertTest/TestInsert.php
@@ -0,0 +1,32 @@
+<?php
+namespace Kir\MySQL\Builder\InsertTest;
+
+use Kir\MySQL\Builder\Insert;
+use Kir\MySQL\Databases\Mock;
+
+class TestInsert extends Insert {
+	/**
+	 * @return static
+	 */
+	public static function create() {
+		$functions = array(
+			'getTableFields' => function ($tableName) {
+				return array(
+					'id',
+					'name',
+					'last_update'
+				);
+			}
+		);
+		$db = new Mock($functions);
+		return new static($db);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function asString() {
+		$str = $this->__toString();
+		return trim(preg_replace('/\\s+/', ' ', $str));
+	}
+}
diff --git a/tests/Builder/SelectTest.php b/tests/Builder/SelectTest.php
@@ -144,4 +144,12 @@ public function testInnerSelect() {
 
 		$this->assertEquals('SELECT * FROM (SELECT * FROM table a WHERE (a.id=1)) t ;', $str);
 	}
+
+	public function testAlias() {
+		$query = TestSelect::create()
+		->from('t', 'orders#orders')
+		->asString();
+
+		$this->assertEquals('SELECT * FROM shop.orders_orders t ;', $query);
+	}
 }
diff --git a/tests/Builder/UpdateTest.php b/tests/Builder/UpdateTest.php
@@ -11,5 +11,13 @@ public function testWhere() {
 		->asString();
 		$this->assertEquals('UPDATE test SET `ean` = \'0000000001011\' ;', $sql);
 	}
+
+	public function testAlias() {
+		$sql = TestUpdate::create()
+		->table('orders#test')
+		->set('ean', '0000000001011')
+		->asString();
+		$this->assertEquals('UPDATE shop.orders_test SET `ean` = \'0000000001011\' ;', $sql);
+	}
 }
  
diff --git a/tests/Databases/Mock.php b/tests/Databases/Mock.php
@@ -4,17 +4,25 @@
 use Kir\MySQL\Builder;
 use Kir\MySQL\Builder\RunnableSelect;
 use Kir\MySQL\Database;
+use Kir\MySQL\Tools\AliasRegistry;
 
 class Mock implements Database {
 	/**
 	 * @var Database
 	 */
 	private $db = null;
+	/**
+	 * @var AliasRegistry
+	 */
+	private $aliasRegistry;
 
 	/**
 	 */
 	function __construct() {
 		$this->db = new MySQL(new \PDO('sqlite::memory:'));
+		$this->aliasRegistry = new AliasRegistry();
+		$this->getAliasRegistry()->add('orders', 'shop.orders_');
+		$this->getAliasRegistry()->add('products', 'shop.products_');
 	}
 
 	/**
@@ -138,4 +146,11 @@ public function transactionRollback() {
 	 */
 	public function transaction($callback) {
 	}
+
+	/**
+	 * @return AliasRegistry
+	 */
+	public function getAliasRegistry() {
+		return $this->aliasRegistry;
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`<?php`
`2`	`2`	`namespace Kir\MySQL\Builder;`
`3`	`3`
	`4`	`+use Kir\MySQL\Tools\AliasReplacer;`
	`5`	`+`
`4`	`6`	`class Select extends Statement {`
`5`	`7`	`/**`
`6`	`8`	`* @var string[]`
`@@ -427,6 +429,7 @@ private function buildTableName($alias, $name) {`
`427`	`429`	`$name = join("\n", $lines);`
`428`	`430`	`$name = '(' . trim(rtrim(trim($name), ';')) . ')';`
`429`	`431`	`}`
	`432`	`+ $name = (new AliasReplacer($this->db()->getAliasRegistry()))->replace($name);`
`430`	`433`	`return sprintf("%s %s", $name, $alias);`
`431`	`434`	`}`
`432`	`435`