Fixed issue amphp#33

Author: bwoebi

composer.json

@@ -14,7 +14,7 @@
 		}
 	],
 	"require-dev": {
-		"phpunit/phpunit": "~4.8"
+		"phpunit/phpunit": "^5"
 	},
 	"autoload": {
 		"psr-4": {

lib/Processor.php

@@ -221,7 +221,7 @@ public function startCommand($callback) {
 
 	public function setQuery($query) {
 		$this->query = $query;
-		$this->packetCallback = [$this, "handleQuery"];
+		$this->parseCallback = [$this, "handleQuery"];
 	}
 
 	public function setPrepare($query) {
@@ -322,6 +322,7 @@ public function execute($stmtId, $query, &$params, $prebound, $data = []) {
 			$this->out[] = null;
 			$this->deferreds[] = $deferred;
 			$this->sendPacket($payload);
+			// apparently LOAD DATA LOCAL INFILE requests are not supported via prepared statements
 			$this->packetCallback = [$this, "handleExecute"];
 		});
 		return $deferred->promise(); // do not use $this->startCommand(), that might unexpectedly reset the seqId!
@@ -543,11 +544,32 @@ private function handleLocalInfileRequest($packet) {
 
 	/** @see 14.6.4.1.1 Text Resultset */
 	private function handleQuery($packet) {
+		switch (\ord($packet)) {
+			case self::OK_PACKET:
+				$this->parseOk($packet);
+				if ($this->connInfo->statusFlags & StatusFlags::SERVER_MORE_RESULTS_EXISTS) {
+					$this->getDeferred()->succeed(new ResultSet($this->connInfo, $result = new ResultProxy));
+					$this->result = $result;
+					$result->updateState(ResultProxy::COLUMNS_FETCHED);
+					$this->successfulResultsetFetch();
+				} else {
+					$this->getDeferred()->succeed($this->getConnInfo());
+					$this->ready();
+				}
+				return;
+			case self::LOCAL_INFILE_REQUEST:
+				$this->handleLocalInfileRequest($packet);
+				return;
+			case self::ERR_PACKET:
+				$this->handleError($packet);
+				return;
+		}
+
 		$this->parseCallback = [$this, "handleTextColumnDefinition"];
 		$this->getDeferred()->succeed(new ResultSet($this->connInfo, $result = new ResultProxy));
 		/* we need to succeed before assigning vars, so that a when() handler won't have a partial result available */
 		$this->result = $result;
-		$this->result->setColumns(DataTypes::decodeInt($packet));
+		$result->setColumns(DataTypes::decodeInt($packet));
 	}
 
 	/** @see 14.7.1 Binary Protocol Resultset */
@@ -556,7 +578,7 @@ private function handleExecute($packet) {
 		$this->getDeferred()->succeed(new ResultSet($this->connInfo, $result = new ResultProxy));
 		/* we need to succeed before assigning vars, so that a when() handler won't have a partial result available */
 		$this->result = $result;
-		$this->result->setColumns(ord($packet));
+		$result->setColumns(ord($packet));
 	}
 
 	private function handleFieldList($packet) {
@@ -619,9 +641,9 @@ private function prepareParams($packet) {
 	private function prepareFields($packet) {
 		if (!$this->result->columnsToFetch--) {
 			$this->parseCallback = null;
-			$this->result->updateState(ResultProxy::COLUMNS_FETCHED);
 			$this->query = null;
 			$this->ready();
+			$this->result->updateState(ResultProxy::COLUMNS_FETCHED);
 
 			return;
 		}
@@ -694,17 +716,17 @@ private function parseColumnDefinition($packet) {
 	private function successfulResultsetFetch() {
 		$deferred = &$this->result->next;
 		if ($this->connInfo->statusFlags & StatusFlags::SERVER_MORE_RESULTS_EXISTS) {
-			$this->packetCallback = [$this, "handleQuery"];
+			$this->parseCallback = [$this, "handleQuery"];
 			$this->deferreds[] = $deferred ?: $deferred = new Deferred;
 		} else {
 			if (!$deferred) {
 				$deferred = new Deferred;
 			}
 			$deferred->succeed();
+			$this->parseCallback = null;
+			$this->query = null;
+			$this->ready();
 		}
-		$this->parseCallback = null;
-		$this->query = null;
-		$this->ready();
 		$this->result->updateState(ResultProxy::ROWS_FETCHED);
 	}
 
@@ -1090,9 +1112,6 @@ private function parsePayload($packet) {
 				case self::OK_PACKET:
 					$this->handleOk($packet);
 					break;
-				case self::LOCAL_INFILE_REQUEST:
-					$this->handleLocalInfileRequest($packet);
-					break;
 				case self::ERR_PACKET:
 					$this->handleError($packet);
 					break;

lib/ResultProxy.php

@@ -7,7 +7,7 @@ class ResultProxy {
 	public $columns = [];
 	public $params = [];
 	public $columnsToFetch;
-	public $rows = null;
+	public $rows = [];
 	public $fetchedRows = 0;
 	public $userFetched = 0;
 	public $deferreds = [self::SINGLE_ROW_FETCH => [], self::COLUMNS_FETCHED => [], self::ROWS_FETCHED => []];
@@ -53,7 +53,7 @@ public function __debugInfo() {
 		$tmp = clone $this;
 		foreach ($tmp->deferreds as &$type) {
 			foreach ($type as &$entry) {
-				$entry[2] = null;
+				unset($entry[0], $entry[2]);
 			}
 		}
 

test/Mysql/ConnectionTest.php

@@ -74,9 +74,11 @@ function testMultiStmt() {
 
 			$db->query("DROP TABLE tmp"); // just in case it would exist...
 			$db->query("CREATE TABLE tmp SELECT 1 AS a, 2 AS b");
-			$db->query("INSERT INTO tmp VALUES (5, 6), (8, 9)");
 
-			$resultset = (yield $db->query("SELECT a FROM tmp; SELECT b FROM tmp WHERE a = 5; SELECT b AS d, a + 1 AS c FROM tmp WHERE b < 7"));
+			$resultset = (yield $db->query("INSERT INTO tmp VALUES (5, 6), (8, 9); SELECT a FROM tmp; SELECT b FROM tmp WHERE a = 5; SELECT b AS d, a + 1 AS c FROM tmp WHERE b < 7"));
+			$this->assertEquals((yield $resultset->rowCount()), 0);
+
+			$resultset = (yield $resultset->next());
 			$this->assertEquals((yield $resultset->rowCount()), 3);
 
 			$resultset = (yield $resultset->next());

test/phpunit_bootstrap.php

@@ -13,7 +13,7 @@
 	if (stripos(PHP_OS, "win") === 0) {
 		shell_exec("Taskkill /PID ".file_get_contents($pidfile)." /F");
 	} else {
-		shell_exec("kill -9 `cat '$pidfile'`");
+		shell_exec("kill -9 `cat '$pidfile'` 2>/dev/null");
 	}
 	sleep(1);
 }