- Removed method getAliasRegistry() from Kir\MySQL\Database because it does not belong there

Author: rkrx

src/Builder/QueryStatement.php

@@ -1,11 +1,12 @@
 <?php
 namespace Kir\MySQL\Builder;
 
-use Kir\MySQL\QueryLogger\QueryLoggers;
 use PDO;
 use PDOStatement;
+use Kir\MySQL\Database\DatabaseStatement;
+use Kir\MySQL\QueryLogger\QueryLoggers;
 
-class QueryStatement {
+class QueryStatement implements DatabaseStatement {
 	/** @var PDOStatement */
 	private $statement;
 	/** @var QueryLoggers */

src/Builder/Statement.php

@@ -2,6 +2,7 @@
 namespace Kir\MySQL\Builder;
 
 use Kir\MySQL\Database;
+use Kir\MySQL\Databases\MySQL;
 use Kir\MySQL\Tools\AliasReplacer;
 
 abstract class Statement {
@@ -11,9 +12,9 @@ abstract class Statement {
 	private $aliasReplacer;
 
 	/**
-	 * @param Database $db
+	 * @param MySQL $db
 	 */
-	public function __construct(Database $db) {
+	public function __construct(MySQL $db) {
 		$this->db = $db;
 		$this->aliasReplacer = new AliasReplacer($db->getAliasRegistry());
 	}

src/Database.php

@@ -2,20 +2,20 @@
 namespace Kir\MySQL;
 
 use Kir\MySQL\Builder\Exception;
-use Kir\MySQL\Builder\QueryStatement;
+use Kir\MySQL\Database\DatabaseStatement;
 
 interface Database {
 	/**
 	 * @param string $query
 	 * @throws Exception
-	 * @return QueryStatement
+	 * @return DatabaseStatement
 	 */
 	public function query($query);
 
 	/**
 	 * @param string $query
 	 * @throws Exception
-	 * @return QueryStatement
+	 * @return DatabaseStatement
 	 */
 	public function prepare($query);
 

src/Database/DatabaseStatement.php

@@ -0,0 +1,53 @@
+<?php
+namespace Kir\MySQL\Database;
+
+use PDO;
+use PDOStatement;
+
+interface DatabaseStatement {
+	/**
+	 * @return PDOStatement
+	 */
+	public function getStatement();
+
+	/**
+	 * @param array $params
+	 * @return bool
+	 */
+	public function execute(array $params = []);
+
+	/**
+	 * @return array
+	 */
+	public function fetchAll();
+
+	/**
+	 * @param int $fetchStyle
+	 * @param int $cursorOrientation
+	 * @param int $cursorOffset
+	 * @return mixed
+	 */
+	public function fetch($fetchStyle = PDO::FETCH_ASSOC, $cursorOrientation = PDO::FETCH_ORI_NEXT, $cursorOffset = 0);
+
+	/**
+	 * @param int $columnNo
+	 * @return mixed
+	 */
+	public function fetchColumn($columnNo = 0);
+
+	/**
+	 * @return bool
+	 */
+	public function closeCursor();
+
+	/**
+	 * @return int
+	 */
+	public function columnCount();
+
+	/**
+	 * @param int $columnNo
+	 * @return array
+	 */
+	public function getColumnMeta($columnNo);
+}

tests/Builder/InsertTest.php

@@ -41,7 +41,7 @@ public function testAddAll() {
 		$reg = Phake::mock('Kir\\MySQL\\Tools\\AliasRegistry');
 		Phake::when($reg)->__call('get', ['travis'])->thenReturn('travis_test.');
 
-		$db = Phake::mock('Kir\\MySQL\\Database');
+		$db = Phake::mock('Kir\\MySQL\\Databases\\MySQL');
 		Phake::when($db)->__call('getTableFields', ['test1'])->thenReturn(['field1', 'field2']);
 		Phake::when($db)->__call('getTableFields', ['travis_test.test1'])->thenReturn(['field1', 'field2']);
 		Phake::when($db)->__call('quoteField', [Phake::anyParameters()])->thenGetReturnByLambda(function ($fieldName) { return "`{$fieldName}`"; });
@@ -71,7 +71,7 @@ public function testUpdateAll() {
 		$reg = Phake::mock('Kir\\MySQL\\Tools\\AliasRegistry');
 		Phake::when($reg)->__call('get', ['travis'])->thenReturn('travis_test.');
 
-		$db = Phake::mock('Kir\\MySQL\\Database');
+		$db = Phake::mock('Kir\\MySQL\\Databases\\MySQL');
 		Phake::when($db)->__call('getTableFields', ['test1'])->thenReturn(['field1', 'field2']);
 		Phake::when($db)->__call('getTableFields', ['travis_test.test1'])->thenReturn(['field1', 'field2']);
 		Phake::when($db)->__call('quoteField', [Phake::anyParameters()])->thenGetReturnByLambda(function ($fieldName) { return "`{$fieldName}`"; });
@@ -104,7 +104,7 @@ public function testAddOrUpdateAll() {
 		$reg = Phake::mock('Kir\\MySQL\\Tools\\AliasRegistry');
 		Phake::when($reg)->__call('get', ['travis'])->thenReturn('travis_test.');
 
-		$db = Phake::mock('Kir\\MySQL\\Database');
+		$db = Phake::mock('Kir\\MySQL\\Databases\\MySQL');
 		Phake::when($db)->__call('getTableFields', ['test1'])->thenReturn(['field1', 'field2']);
 		Phake::when($db)->__call('getTableFields', ['travis_test.test1'])->thenReturn(['field1', 'field2']);
 		Phake::when($db)->__call('quoteField', [Phake::anyParameters()])->thenGetReturnByLambda(function ($fieldName) { return "`{$fieldName}`"; });

tests/Builder/UpdateTest.php

@@ -64,7 +64,7 @@ public function testSetAll1() {
 	}
 
 	public function testSetAll2() {
-		$db = Phake::mock('Kir\\MySQL\\Database');
+		$db = Phake::mock('Kir\\MySQL\\Databases\\MySQL');
 		$reg = Phake::mock('Kir\\MySQL\\Tools\\AliasRegistry');
 		Phake::when($db)->__call('getTableFields', ['test1'])->thenReturn(['field1', 'field2']);
 		Phake::when($db)->__call('quoteField', [Phake::anyParameters()])->thenGetReturnByLambda(function ($fieldName) { return "`{$fieldName}`"; });
@@ -123,4 +123,3 @@ public function testMask() {
 		$this->assertEquals("UPDATE\n\ttest1\nSET\n\t`field1`='1'\nLIMIT\n\t10\n", $sql);
 	}
 }
-