Add prepare check

Author: odan

src/DeleteQuery.php

@@ -4,6 +4,7 @@
 
 use PDO;
 use PDOStatement;
+use RuntimeException;
 
 /**
  * Delete Query.
@@ -221,11 +222,19 @@ public function execute(): bool
     /**
      * Prepares a statement for execution and returns a statement object.
      *
+     * @throws RuntimeException
+     *
      * @return PDOStatement
      */
     public function prepare(): PDOStatement
     {
-        return $this->pdo->prepare($this->build());
+        $statement = $this->pdo->prepare($this->build());
+
+        if (!$statement instanceof PDOStatement) {
+            throw new RuntimeException('The database statement could not be prepared.');
+        }
+
+        return $statement;
     }
 
     /**

src/FunctionExpression.php

@@ -29,11 +29,11 @@ public function __construct(string $value, Quoter $quoter)
     /**
      * Alias.
      *
-     * @param string|null $alias Alias
+     * @param string $alias Alias
      *
      * @return $this The self instance
      */
-    public function alias(string $alias = null): self
+    public function alias(string $alias): self
     {
         $clone = clone $this;
         $clone->value = sprintf('%s AS %s', $clone->value, $this->quoter->quoteName($alias));

src/InsertQuery.php

@@ -4,6 +4,7 @@
 
 use PDO;
 use PDOStatement;
+use RuntimeException;
 
 /**
  * Insert Query.
@@ -149,11 +150,19 @@ public function execute(): bool
     /**
      * Prepare statement.
      *
+     * @throws RuntimeException
+     *
      * @return PDOStatement The pdo statement
      */
     public function prepare(): PDOStatement
     {
-        return $this->pdo->prepare($this->build());
+        $statement = $this->pdo->prepare($this->build());
+
+        if (!$statement instanceof PDOStatement) {
+            throw new RuntimeException('The database statement could not be prepared.');
+        }
+
+        return $statement;
     }
 
     /**

src/SelectQuery.php

@@ -4,6 +4,7 @@
 
 use PDO;
 use PDOStatement;
+use RuntimeException;
 
 /**
  * Select Query.
@@ -631,11 +632,19 @@ public function execute(): PDOStatement
     /**
      * Prepares a statement for execution and returns a statement object.
      *
+     * @throws RuntimeException
+     *
      * @return PDOStatement The pdo statement
      */
     public function prepare(): PDOStatement
     {
-        return $this->pdo->prepare($this->build());
+        $statement = $this->pdo->prepare($this->build());
+
+        if (!$statement instanceof PDOStatement) {
+            throw new RuntimeException('The database statement could not be prepared.');
+        }
+
+        return $statement;
     }
 
     /**

src/UpdateQuery.php

@@ -4,6 +4,7 @@
 
 use PDO;
 use PDOStatement;
+use RuntimeException;
 
 /**
  * Update Query.
@@ -226,11 +227,19 @@ public function execute(): bool
     /**
      * Prepares a statement for execution and returns a statement object.
      *
+     * @throws RuntimeException
+     *
      * @return PDOStatement The PDOStatement
      */
     public function prepare(): PDOStatement
     {
-        return $this->pdo->prepare($this->build());
+        $statement = $this->pdo->prepare($this->build());
+
+        if (!$statement instanceof PDOStatement) {
+            throw new RuntimeException('The database statement could not be prepared.');
+        }
+
+        return $statement;
     }
 
     /**

tests/QuoterTest.php

@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Odan\Database\Test;
 
@@ -87,7 +87,8 @@ public function testQuoteName()
         $this->assertSame('`dbname`.`tablename`', $quoter->quoteName('dbname.tablename'));
         $this->assertSame('`dbname`.`tablename`.`field`', $quoter->quoteName('dbname.tablename.field'));
         // Alias.field AS thing
-        $this->assertSame('`dbname`.`tablename`.`field` AS `thing`', $quoter->quoteName('dbname.tablename.field AS thing'));
+        $this->assertSame('`dbname`.`tablename`.`field` AS `thing`',
+            $quoter->quoteName('dbname.tablename.field AS thing'));
 
         $this->assertSame('`.`', $quoter->quoteName('.'));
         $this->assertSame('`?`', $quoter->quoteName('?'));
@@ -130,4 +131,22 @@ public function testQuoteNames()
         $row = ['a', 'a.b', 'a.b.c', new RawExp('a.z')];
         $this->assertSame(['`a`', '`a`.`b`', '`a`.`b`.`c`', 'a.z'], $quoter->quoteNames($row));
     }
+
+    /**
+     * Test.
+     *
+     * @return void
+     */
+    public function testQuoteByFields()
+    {
+        $quoter = $this->getConnection()->getQuoter();
+        $this->assertSame([], $quoter->quoteByFields([]));
+
+        $row = ['a', 'a.b', 'a.b.c', new RawExp('a.z')];
+        $this->assertSame(['`a`', '`a`.`b`', '`a`.`b`.`c`', 'a.z'], $quoter->quoteByFields($row));
+
+        $row = ['ÿ', "\0", "'", '"'];
+        $this->assertSame(['`ÿ`', '``', "`'`", '`"`'], $quoter->quoteByFields($row));
+    }
+
 }