Fixed major bug in database.

 - A rejected promise was not passed back from the connection to the command.
Improved unit tests, cleared skipped tests.
Improved code coverage.
Added testing on actual loop->run callbacks.
Looks like code formatter formats sql differently than phpmyadmin exports.

Author: dustingraham

src/Command.php

@@ -17,6 +17,13 @@ class Command
      */
     protected $params = [];
 
+    /**
+     * @var array
+     */
+    protected $reserved_words = [
+        'NOW()',
+    ];
+    
     public function __construct(Database $database, $sql = null)
     {
         $this->db = $database;
@@ -63,15 +70,17 @@ public function bindValues($params)
      */
     public function getPreparedQuery(Connection $connection)
     {
-        $quotedSql = $this->quoteIntoSql($connection); 
+        $quotedSql = $this->quoteIntoSql($connection);
 
         return $quotedSql;
     }
 
+    // TODO: Find all of these...
+    
     /**
      * TODO: This is exactly what I don't want to do. "Roll my own" SQL handler.
      * However, the requirements for this package have led to this point for now.
-     * 
+     *
      * @param Connection $connection
      * @return mixed
      */
@@ -80,7 +89,7 @@ protected function quoteIntoSql(Connection $connection)
         $quotedSql = $this->sql;
         $quotedParams = [];
 
-        foreach($this->params as $key => $value)
+        foreach ($this->params as $key => $value)
         {
             if (is_null($value))
             {
@@ -96,23 +105,20 @@ protected function quoteIntoSql(Connection $connection)
             }
             else
             {
-                $quotedParams[$key] = '\''.$connection->escape($value).'\'';
+                $quotedParams[$key] = '\'' . $connection->escape($value) . '\'';
             }
         }
 
         return strtr($quotedSql, $quotedParams);
     }
 
-    // TODO: Find all of these...
-    protected $reserved_words = [
-        'NOW()'
-    ];
-    
     /**
-     * @return \React\Promise\PromiseInterface
+     * @return \React\Promise\Promise
      */
     public function execute()
     {
-        return $this->db->executeCommand($this);
+        $thing = $this->db->executeCommand($this);
+        
+        return $thing;
     }
 }

src/Connection.php

@@ -7,48 +7,60 @@
 class Connection
 {
     /**
-     * @var \mysqli
+     * @var LoopInterface
      */
-    protected $mysqli;
+    public $loop;
 
     /**
-     * @var LoopInterface
+     * @var \mysqli
      */
-    protected $loop;
+    protected $mysqli;
 
     /**
      * @var float
      */
     protected $pollInterval = 0.01;
 
+    /**
+     * @var bool|string
+     */
+    protected $currentQuery = false;
+    
     public function __construct(\mysqli $mysqli, LoopInterface $loop)
     {
         $this->mysqli = $mysqli;
         $this->loop = $loop;
     }
 
-    public function escape($data)
+    /**
+     * Proxy to the mysqli connection object.
+     *
+     * @param $string
+     * @return string
+     */
+    public function escape($string)
     {
-        if (is_array($data))
-        {
-            $data = array_map([
-                $this,
-                'escape',
-            ], $data);
-        }
-        else
-        {
-            $data = $this->mysqli->real_escape_string($data);
-        }
-        
-        return $data;
+        return $this->mysqli->real_escape_string($string);
+    }
+    
+    /**
+     * Close the mysqli connection.
+     */
+    public function close()
+    {
+        $this->mysqli->close();
     }
 
     public function execute(Command $command)
     {
-        $query = $command->getPreparedQuery($this);
+        if ($this->currentQuery)
+        {
+            throw new \Exception('Another query is already pending for this connection.');
+        }
+        
+        $this->currentQuery = $command->getPreparedQuery($this);
 
-        $status = $this->mysqli->query($query, MYSQLI_ASYNC);
+        $status = $this->mysqli->query($this->currentQuery, MYSQLI_ASYNC);
         if ($status === false)
         {
             throw new \Exception($this->mysqli->error);
@@ -74,7 +86,7 @@ function (TimerInterface $timer) use ($deferred)
                     $result = $this->mysqli->reap_async_query();
                     if ($result === false)
                     {
-                        $deferred->reject(new \Exception($this->mysqli->error));
+                        $deferred->reject($this->mysqli->error);
                     }
                     else
                     {
@@ -86,20 +98,21 @@ function (TimerInterface $timer) use ($deferred)
                 {
                     if ($error)
                     {
-                        $deferred->reject(new \Exception($this->mysqli->error));
+                        $deferred->reject($this->mysqli->error);
                     }
                     else
                     {
                         if ($reject)
                         {
-                            $deferred->reject(new \Exception($this->mysqli->error));
+                            $deferred->reject($this->mysqli->error);
                         }
                     }
                 }
 
                 // If poll yielded something for this connection, we're done!
                 if ($read || $error || $reject)
                 {
+                    $this->currentQuery = false;
                     $timer->cancel();
                 }
             }

src/ConnectionFactory.php

@@ -7,7 +7,7 @@ class ConnectionFactory
     /**
      * @var LoopInterface
      */
-    protected static $loop;
+    public static $loop;
 
     /**
      * @var array

src/ConnectionPool.php

@@ -36,7 +36,7 @@ public function __construct()
     /**
      * We use a promise in case all connections are busy.
      *
-     * @return \React\Promise\PromiseInterface
+     * @return \React\Promise\Promise
      */
     public function getConnection()
     {

src/Database.php

@@ -4,6 +4,9 @@
 
 class Database
 {
+    /**
+     * @var ConnectionPool
+     */
     protected $pool;
 
     public function __construct()
@@ -25,7 +28,7 @@ public function createCommand($sql = null, $params = [])
 
     /**
      * @param Command $command
-     * @return \React\Promise\PromiseInterface
+     * @return \React\Promise\Promise
      */
     public function executeCommand(Command $command)
     {
@@ -44,6 +47,11 @@ public function executeCommand(Command $command)
                         // Doesn't hurt to close it again.
                         $result->close();
                     })
+                    ->otherwise(function ($reason) use ($deferred)
+                    {
+                        // If the connection execution fails, pass the failure back to the command.
+                        $deferred->reject($reason);
+                    })
                     ->always(function () use ($connection)
                     {
                         // Ensure we always return the connection to the pool.
@@ -53,4 +61,12 @@ public function executeCommand(Command $command)
 
         return $deferred->promise();
     }
+    
+    /**
+     * @return ConnectionPool
+     */
+    public function getPool()
+    {
+        return $this->pool;
+    }
 }