Added Table not exists first implementation and tests

.php_cs.cache

@@ -1 +1 @@
-{"php":"7.4.1","version":"2.16.1","indent":"    ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":{"allow_single_line_closure":true},"class_definition":{"single_line":true},"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":true,"single_import_per_statement":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"binary_operator_spaces":true,"blank_line_after_opening_tag":true,"blank_line_before_statement":{"statements":["return"]},"cast_spaces":true,"class_attributes_separation":{"elements":["method"]},"concat_space":true,"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"lowercase_static_reference":true,"magic_constant_casing":true,"magic_method_casing":true,"native_function_casing":true,"native_function_type_declaration_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["curly_brace_block","extra","parenthesis_brace_block","square_brace_block","throw","use"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":true,"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"ordered_imports":true,"php_unit_fqcn_annotation":true,"phpdoc_align":{"tags":["method","param","property","return","throws","type","var"]},"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_trim_consecutive_blank_line_separation":true,"phpdoc_types":true,"phpdoc_types_order":{"null_adjustment":"always_last","sort_algorithm":"none"},"phpdoc_var_without_name":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_line_comment_style":{"comment_types":["hash"]},"single_line_throw":true,"single_quote":true,"single_trait_insert_per_statement":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"yoda_style":true},"hashes":{"src\/Driver\/MysqlDriver.php":197127788,"src\/Driver\/SQLiteDriver.php":1109810055,"src\/Driver\/Driver.php":2042956636,"src\/Driver\/PostgreSQLDriver.php":1279477825,"src\/Credentials.php":1692415050,"src\/Result.php":1584290880,"src\/Connection.php":816626996,"src\/Mock\/MockedDBALConnection.php":3644978697,"src\/Mock\/MockedDriver.php":1694662546,"tests\/ConnectionTest.php":1471950575,"tests\/SQLiteConnectionTest.php":3708921004,"tests\/PostgreSQLConnectionTest.php":3914901716,"tests\/MysqlConnectionTest.php":2079191261}}
+{"php":"7.4.1","version":"2.16.1","indent":"    ","lineEnding":"\n","rules":{"blank_line_after_namespace":true,"braces":{"allow_single_line_closure":true},"class_definition":{"single_line":true},"constant_case":true,"elseif":true,"function_declaration":true,"indentation_type":true,"line_ending":true,"lowercase_keywords":true,"method_argument_space":true,"no_break_comment":true,"no_closing_tag":true,"no_spaces_after_function_name":true,"no_spaces_inside_parenthesis":true,"no_trailing_whitespace":true,"no_trailing_whitespace_in_comment":true,"single_blank_line_at_eof":true,"single_class_element_per_statement":true,"single_import_per_statement":true,"switch_case_semicolon_to_colon":true,"switch_case_space":true,"visibility_required":true,"encoding":true,"full_opening_tag":true,"array_syntax":{"syntax":"short"},"binary_operator_spaces":true,"blank_line_after_opening_tag":true,"blank_line_before_statement":{"statements":["return"]},"cast_spaces":true,"class_attributes_separation":{"elements":["method"]},"concat_space":true,"declare_equal_normalize":true,"function_typehint_space":true,"include":true,"increment_style":true,"lowercase_cast":true,"lowercase_static_reference":true,"magic_constant_casing":true,"magic_method_casing":true,"native_function_casing":true,"native_function_type_declaration_casing":true,"new_with_braces":true,"no_blank_lines_after_class_opening":true,"no_blank_lines_after_phpdoc":true,"no_empty_comment":true,"no_empty_phpdoc":true,"no_empty_statement":true,"no_extra_blank_lines":{"tokens":["curly_brace_block","extra","parenthesis_brace_block","square_brace_block","throw","use"]},"no_leading_import_slash":true,"no_leading_namespace_whitespace":true,"no_mixed_echo_print":true,"no_multiline_whitespace_around_double_arrow":true,"no_short_bool_cast":true,"no_singleline_whitespace_before_semicolons":true,"no_spaces_around_offset":true,"no_trailing_comma_in_list_call":true,"no_trailing_comma_in_singleline_array":true,"no_unneeded_control_parentheses":true,"no_unneeded_curly_braces":true,"no_unneeded_final_method":true,"no_unused_imports":true,"no_whitespace_before_comma_in_array":true,"no_whitespace_in_blank_line":true,"normalize_index_brace":true,"object_operator_without_whitespace":true,"ordered_imports":true,"php_unit_fqcn_annotation":true,"phpdoc_align":{"tags":["method","param","property","return","throws","type","var"]},"phpdoc_annotation_without_dot":true,"phpdoc_indent":true,"phpdoc_inline_tag":true,"phpdoc_no_access":true,"phpdoc_no_alias_tag":true,"phpdoc_no_package":true,"phpdoc_no_useless_inheritdoc":true,"phpdoc_return_self_reference":true,"phpdoc_scalar":true,"phpdoc_separation":true,"phpdoc_single_line_var_spacing":true,"phpdoc_summary":true,"phpdoc_to_comment":true,"phpdoc_trim":true,"phpdoc_trim_consecutive_blank_line_separation":true,"phpdoc_types":true,"phpdoc_types_order":{"null_adjustment":"always_last","sort_algorithm":"none"},"phpdoc_var_without_name":true,"return_type_declaration":true,"semicolon_after_instruction":true,"short_scalar_cast":true,"single_blank_line_before_namespace":true,"single_line_comment_style":{"comment_types":["hash"]},"single_line_throw":true,"single_quote":true,"single_trait_insert_per_statement":true,"space_after_semicolon":{"remove_in_empty_for_expressions":true},"standardize_increment":true,"standardize_not_equals":true,"ternary_operator_spaces":true,"trailing_comma_in_multiline_array":true,"trim_array_spaces":true,"unary_operator_spaces":true,"whitespace_after_comma_in_array":true,"yoda_style":true},"hashes":{"src\/Driver\/MysqlDriver.php":1808796082,"src\/Driver\/SQLiteDriver.php":3459327179,"src\/Driver\/Driver.php":2379534927,"src\/Driver\/PostgreSQLDriver.php":503805631,"src\/Credentials.php":1470751445,"src\/Result.php":1940786624,"src\/Connection.php":2724048866,"src\/Mock\/MockedDBALConnection.php":2847858253,"src\/Mock\/MockedDriver.php":3163021275,"tests\/ConnectionTest.php":2058819372,"tests\/SQLiteConnectionTest.php":1617704118,"tests\/PostgreSQLConnectionTest.php":3923346312,"tests\/MysqlConnectionTest.php":2136983192,"src\/Exception\/DBALException.php":1503670777,"src\/Exception\/ConnectionException.php":3611662295,"src\/Exception\/TableNotFoundException.php":2519572257}}

src/Driver/MysqlDriver.php

@@ -16,9 +16,12 @@
 namespace Drift\DBAL\Driver;
 
 use Drift\DBAL\Credentials;
+use Drift\DBAL\Exception\DBALException;
+use Drift\DBAL\Exception\TableNotFoundException;
 use Drift\DBAL\Result;
 use React\EventLoop\LoopInterface;
 use React\MySQL\ConnectionInterface;
+use React\MySQL\Exception;
 use React\MySQL\Factory;
 use React\MySQL\QueryResult;
 use React\Promise\PromiseInterface;
@@ -74,6 +77,35 @@ public function query(
             ->query($sql, $parameters)
             ->then(function (QueryResult $queryResult) {
                 return new Result($queryResult->resultRows);
+            })
+            ->otherwise(function (Exception $exception) {
+                $this->parseException($exception);
             });
     }
+
+    /**
+     * Parse exception.
+     *
+     * @param Exception $exception
+     *
+     * @throws DBALException
+     */
+    private function parseException(Exception $exception)
+    {
+        $message = $exception->getMessage();
+        $match = null;
+
+        if (
+            preg_match('~^Unknown table \'(.*?)\'$~', $message, $match) ||
+            preg_match('~^Table \'(.*?)\' doesn\'t exist$~', $message, $match)
+        ) {
+            $tableName = $match[1];
+            $tableParts = explode('.', $tableName, 2);
+            $tableName = end($tableParts);
+
+            throw TableNotFoundException::createByTableName($tableName);
+        }
+
+        throw DBALException::createGeneric($message);
+    }
 }

src/Driver/PostgreSQLDriver.php

@@ -16,8 +16,11 @@
 namespace Drift\DBAL\Driver;
 
 use Drift\DBAL\Credentials;
+use Drift\DBAL\Exception\DBALException;
+use Drift\DBAL\Exception\TableNotFoundException;
 use Drift\DBAL\Result;
 use PgAsync\Client;
+use PgAsync\ErrorException;
 use React\EventLoop\LoopInterface;
 use React\Promise\Deferred;
 use React\Promise\PromiseInterface;
@@ -84,7 +87,9 @@ public function query(
             ->executeStatement($sql, $parameters)
             ->subscribe(function ($row) use (&$results) {
                 $results[] = $row;
-            }, null, function () use (&$results, $deferred) {
+            }, function (ErrorException $exception) {
+                $this->parseException($exception);
+            }, function () use (&$results, $deferred) {
                 $deferred->resolve($results);
             });
 
@@ -94,4 +99,28 @@ public function query(
                 return new Result($results);
             });
     }
+
+    /**
+     * Parse exception.
+     *
+     * @param ErrorException $exception
+     *
+     * @throws DBALException
+     */
+    private function parseException(ErrorException $exception)
+    {
+        $message = $exception->getMessage();
+        $match = null;
+
+        if (
+            preg_match('~^ERROR: table "(.*?)" does not exist.*$~', $message, $match) ||
+            preg_match('~^ERROR: relation "(.*?)" does not exist.*$~', $message, $match)
+        ) {
+            $tableName = $match[1];
+
+            throw TableNotFoundException::createByTableName($tableName);
+        }
+
+        throw DBALException::createGeneric($message);
+    }
 }

src/Driver/SQLiteDriver.php

@@ -19,9 +19,12 @@
 use Clue\React\SQLite\Factory;
 use Clue\React\SQLite\Result as SQLiteResult;
 use Drift\DBAL\Credentials;
+use Drift\DBAL\Exception\DBALException;
+use Drift\DBAL\Exception\TableNotFoundException;
 use Drift\DBAL\Result;
 use React\EventLoop\LoopInterface;
 use React\Promise\PromiseInterface;
+use RuntimeException;
 
 /**
  * Class SQLiteDriver.
@@ -70,6 +73,30 @@ public function query(
             ->query($sql, $parameters)
             ->then(function (SQLiteResult $sqliteResult) {
                 return new Result($sqliteResult->rows);
+            })
+            ->otherwise(function (RuntimeException $exception) {
+                $this->parseException($exception);
             });
     }
+
+    /**
+     * Parse exception.
+     *
+     * @param RuntimeException $exception
+     *
+     * @throws DBALException
+     */
+    private function parseException(RuntimeException $exception)
+    {
+        $message = $exception->getMessage();
+        $match = null;
+
+        if (preg_match('~^no such table:\s*(.*?)$~', $message, $match)) {
+            $tableName = $match[1];
+
+            throw TableNotFoundException::createByTableName($tableName);
+        }
+
+        throw DBALException::createGeneric($message);
+    }
 }

src/Exception/ConnectionException.php

@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the DriftPHP Project
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <[email protected]>
+ */
+
+declare(strict_types=1);
+
+namespace Drift\DBAL\Exception;
+
+use Exception;
+
+/**
+ * Class ConnectionException.
+ */
+class ConnectionException extends Exception
+{
+}

src/Exception/DBALException.php

@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the DriftPHP Project
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <[email protected]>
+ */
+
+declare(strict_types=1);
+
+namespace Drift\DBAL\Exception;
+
+use Exception;
+
+/**
+ * Class DBALException.
+ */
+class DBALException extends Exception
+{
+    /**
+     * Create generic.
+     *
+     * @param string $reason
+     *
+     * @return DBALException
+     */
+    public static function createGeneric(string $reason)
+    {
+        return new DBALException($reason);
+    }
+}

src/Exception/TableNotFoundException.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the DriftPHP Project
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Feel free to edit as you please, and have fun.
+ *
+ * @author Marc Morera <[email protected]>
+ */
+
+declare(strict_types=1);
+
+namespace Drift\DBAL\Exception;
+
+/**
+ * Class TableNotFoundException.
+ */
+class TableNotFoundException extends DBALException
+{
+    /**
+     * Create by table name.
+     *
+     * @param string $tableName
+     *
+     * @return TableNotFoundException
+     */
+    public static function createByTableName(string $tableName)
+    {
+        return new TableNotFoundException(sprintf('Table %s not found', $tableName));
+    }
+}

tests/ConnectionTest.php

@@ -16,6 +16,7 @@
 namespace Drift\DBAL\Tests;
 
 use Drift\DBAL\Connection;
+use Drift\DBAL\Exception\TableNotFoundException;
 use Drift\DBAL\Result;
 use function Clue\React\Block\await;
 use PHPUnit\Framework\TestCase;
@@ -128,8 +129,6 @@ public function testQuery()
 
     /**
      * Test multiple rows.
-     *
-     * @group lol
      */
     public function testMultipleRows()
     {
@@ -179,4 +178,27 @@ public function testMultipleRows()
 
         await($promise, $loop, self::MAX_TIMEOUT);
     }
+
+    /**
+     * Test connection exception.
+     *
+     * @group lol
+     */
+    public function testTableDoesntExistException()
+    {
+        $loop = $this->createLoop();
+        $connection = $this->getConnection($loop);
+        $promise = $this->dropInfrastructure($connection)
+            ->then(function (Connection $connection) {
+                return $connection->insert('test', [
+                    'id' => '?',
+                    'field1' => '?',
+                    'field2' => '?',
+                ], ['1', 'val11', 'val12']);
+            });
+
+        $this->expectException(TableNotFoundException::class);
+        $this->expectExceptionMessage('Table test not found');
+        await($promise, $loop);
+    }
 }

tests/MysqlConnectionTest.php

@@ -19,6 +19,7 @@
 use Drift\DBAL\Connection;
 use Drift\DBAL\Credentials;
 use Drift\DBAL\Driver\MysqlDriver;
+use Drift\DBAL\Exception\TableNotFoundException;
 use React\EventLoop\LoopInterface;
 use React\Promise\PromiseInterface;
 
@@ -77,6 +78,10 @@ protected function dropInfrastructure(Connection $connection): PromiseInterface
         return $connection
             ->queryBySQL('DROP TABLE test')
             ->then(function () use ($connection) {
+                return $connection;
+            }, function (TableNotFoundException $exception) use ($connection) {
+                // Silent pass
+
                 return $connection;
             });
     }

tests/PostgreSQLConnectionTest.php

@@ -19,6 +19,7 @@
 use Drift\DBAL\Connection;
 use Drift\DBAL\Credentials;
 use Drift\DBAL\Driver\PostgreSQLDriver;
+use Drift\DBAL\Exception\TableNotFoundException;
 use React\EventLoop\LoopInterface;
 use React\Promise\PromiseInterface;
 
@@ -75,6 +76,10 @@ protected function dropInfrastructure(Connection $connection): PromiseInterface
         return $connection
             ->queryBySQL('DROP TABLE test')
             ->then(function () use ($connection) {
+                return $connection;
+            }, function (TableNotFoundException $exception) use ($connection) {
+                // Silent pass
+
                 return $connection;
             });
     }

tests/SQLiteConnectionTest.php

@@ -19,6 +19,7 @@
 use Drift\DBAL\Connection;
 use Drift\DBAL\Credentials;
 use Drift\DBAL\Driver\SQLiteDriver;
+use Drift\DBAL\Exception\TableNotFoundException;
 use React\EventLoop\LoopInterface;
 use React\Promise\PromiseInterface;
 
@@ -73,6 +74,10 @@ protected function dropInfrastructure(Connection $connection): PromiseInterface
         return $connection
             ->queryBySQL('DROP TABLE test')
             ->then(function () use ($connection) {
+                return $connection;
+            }, function (TableNotFoundException $exception) use ($connection) {
+                // Silent pass
+
                 return $connection;
             });
     }