Adding bug fixes and updates for 2.1. Fixes #139.

Author: kwhat

src/AbstractStatement.php

@@ -9,6 +9,7 @@
 
 use PDO;
 use PDOException;
+use PDOStatement;
 
 abstract class AbstractStatement implements QueryInterface
 {
@@ -28,22 +29,10 @@ public function __construct(PDO $dbh)
      *
      * @return mixed
      */
-    public function execute()
+    public function execute(): PDOStatement
     {
         $stmt = $this->dbh->prepare($this->__toString());
-
-        try {
-            $success = $stmt->execute($this->getValues());
-            if (!$success) {
-                list($state, $code, $message) = $stmt->errorInfo();
-
-                // We are not in exception mode, raise error.
-                trigger_error("SQLSTATE[{$state}] [{$code}] {$message}", E_USER_ERROR);
-            }
-        } catch (PDOException $e) {
-            // We are in exception mode, carry on.
-            throw $e;
-        }
+        $stmt->execute($this->getValues());
 
         return $stmt;
     }

src/Database.php

@@ -19,7 +19,7 @@ class Database extends PDO
      *
      * @codeCoverageIgnore
      */
-    public function __construct(string $dsn, string $username = null, string $password = null, array $options = [])
+    public function __construct(string $dsn, ?string $username = null, ?string $password = null, array $options = [])
     {
         parent::__construct($dsn, $username, $password, $options + $this->getDefaultOptions());
     }

src/Statement/Delete.php

@@ -110,12 +110,4 @@ public function __toString(): string
 
         return $sql;
     }
-
-    /**
-     * @return int
-     */
-    public function execute()
-    {
-        return parent::execute()->rowCount();
-    }
 }

src/Statement/Insert.php

@@ -223,14 +223,4 @@ public function getValues(): array
 
         return $values;
     }
-
-    /**
-     * @return int|string
-     */
-    public function execute()
-    {
-        parent::execute();
-
-        return $this->dbh->lastInsertId();
-    }
 }

src/Statement/Update.php

@@ -72,7 +72,14 @@ public function set(string $column, $value): self
      */
     public function getValues(): array
     {
-        $values = array_values($this->pairs);
+        $values = [];
+        foreach ($this->pairs as $value) {
+            if ($value instanceof QueryInterface) {
+                $values = array_merge($values, $value->getValues());
+            } else {
+                $values[] = $value;
+            }
+        }
 
         if ($this->where !== null) {
             $values = array_merge($values, $this->where->getValues());
@@ -143,12 +150,4 @@ public function __toString(): string
 
         return $sql;
     }
-
-    /**
-     * @return int
-     */
-    public function execute()
-    {
-        return parent::execute()->rowCount();
-    }
 }

tests/AbstractStatementTest.php

@@ -52,37 +52,12 @@ public function __toString(): string
         };
     }
 
-    public function testExecuteSuccess()
+    public function testExecute()
     {
         $this->mock
             ->method('execute')
             ->willReturn(true);
 
         $this->assertEquals($this->mock, $this->subject->execute());
     }
-
-    public function testExecuteException()
-    {
-        $this->mock
-            ->method('execute')
-            ->willThrowException(new PDOException('message', 100));
-
-        $this->expectException(PDOException::class);
-        $this->expectExceptionCode(100);
-        $this->expectExceptionMessage('message');
-
-        $this->subject->execute();
-    }
-
-    public function testExecuteFailure()
-    {
-        $this->mock
-            ->method('execute')
-            ->willReturn(false);
-
-        $this->expectError();
-        $this->expectErrorMessage('SQLSTATE[HY100] [100] near "bogus": syntax error');
-
-        $this->subject->execute();
-    }
 }

tests/Statement/DeleteTest.php

@@ -167,12 +167,4 @@ public function testGetValuesWithLimit()
         $this->assertIsArray($this->subject->getValues());
         $this->assertCount(2, $this->subject->getValues());
     }
-
-    public function testExecute()
-    {
-        $this->subject
-            ->from('test');
-
-        $this->assertEquals(1, $this->subject->execute());
-    }
 }

tests/Statement/InsertTest.php

@@ -200,14 +200,4 @@ public function testGetValuesWithDuplicate()
         $this->assertIsArray($this->subject->getValues());
         $this->assertCount(2, $this->subject->getValues());
     }
-
-    public function testExecute()
-    {
-        $this->subject
-            ->into('test')
-            ->columns('id')
-            ->values(1);
-
-        $this->assertEquals(1, $this->subject->execute());
-    }
 }

tests/Statement/UpdateTest.php

@@ -198,13 +198,4 @@ public function testGetValuesEmpty()
         $this->assertIsArray($this->subject->getValues());
         $this->assertEmpty($this->subject->getValues());
     }
-
-    public function testExecute()
-    {
-        $this->subject
-            ->table('test')
-            ->set('col', 'value');
-
-        $this->assertEquals(1, $this->subject->execute());
-    }
 }