query cache, reconnects

spiral-modules · Mar 29, 2019 · 17bdcfa · 17bdcfa
1 parent 40d2d04
commit 17bdcfa
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 26 deletions.
diff --git a/src/Driver/Driver.php b/src/Driver/Driver.php
@@ -40,6 +40,13 @@ abstract class Driver implements DriverInterface, LoggerAwareInterface
     // DateTime format to be used to perform automatic conversion of DateTime objects.
     protected const DATETIME = 'Y-m-d H:i:s';
 
+    // Driver specific PDO options
+    protected const DEFAULT_PDO_OPTIONS = [
+        PDO::ATTR_CASE             => PDO::CASE_NATURAL,
+        PDO::ATTR_ERRMODE          => PDO::ERRMODE_EXCEPTION,
+        PDO::ATTR_EMULATE_PREPARES => false
+    ];
+
     /**
      * Connection configuration described in DBAL config file. Any driver can be used as data source
      * for multiple databases as table prefix and quotation defined on Database instance level.
@@ -64,11 +71,7 @@ abstract class Driver implements DriverInterface, LoggerAwareInterface
         'password'   => '',
 
         // pdo options
-        'options'    => [
-            PDO::ATTR_CASE             => PDO::CASE_NATURAL,
-            PDO::ATTR_ERRMODE          => PDO::ERRMODE_EXCEPTION,
-            PDO::ATTR_EMULATE_PREPARES => false
-        ],
+        'options'    => [],
     ];
 
     /** @var PDO|null */
@@ -94,7 +97,7 @@ abstract class Driver implements DriverInterface, LoggerAwareInterface
      */
     public function __construct(array $options)
     {
-        $options['options'] = $this->options['options'] + ($options['options'] ?? []);
+        $options['options'] = ($options['options'] ?? []) + static::DEFAULT_PDO_OPTIONS;
         $this->options = $options + $this->options;
 
         if (!empty($this->options['profiling'])) {

diff --git a/src/Driver/MySQL/MySQLDriver.php b/src/Driver/MySQL/MySQLDriver.php
@@ -20,14 +20,10 @@
  */
 class MySQLDriver extends Driver
 {
-    protected const TYPE               = DatabaseInterface::MYSQL;
-    protected const TABLE_SCHEMA_CLASS = MySQLTable::class;
-    protected const QUERY_COMPILER     = MySQLCompiler::class;
-
-    /**
-     * {@inheritdoc}
-     */
-    protected $pdoOptions = [
+    protected const TYPE                = DatabaseInterface::MYSQL;
+    protected const TABLE_SCHEMA_CLASS  = MySQLTable::class;
+    protected const QUERY_COMPILER      = MySQLCompiler::class;
+    protected const DEFAULT_PDO_OPTIONS = [
         PDO::ATTR_CASE               => PDO::CASE_NATURAL,
         PDO::ATTR_ERRMODE            => PDO::ERRMODE_EXCEPTION,
         PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES "UTF8"',

diff --git a/src/Driver/SQLServer/SQLServerDriver.php b/src/Driver/SQLServer/SQLServerDriver.php
@@ -20,15 +20,11 @@
 
 class SQLServerDriver extends Driver
 {
-    protected const TYPE               = DatabaseInterface::SQL_SERVER;
-    protected const TABLE_SCHEMA_CLASS = SQLServerTable::class;
-    protected const QUERY_COMPILER     = SQLServerCompiler::class;
-    protected const DATETIME           = 'Y-m-d\TH:i:s.000';
-
-    /**
-     * @var array
-     */
-    protected $pdoOptions = [
+    protected const TYPE                = DatabaseInterface::SQL_SERVER;
+    protected const TABLE_SCHEMA_CLASS  = SQLServerTable::class;
+    protected const QUERY_COMPILER      = SQLServerCompiler::class;
+    protected const DATETIME            = 'Y-m-d\TH:i:s.000';
+    protected const DEFAULT_PDO_OPTIONS = [
         PDO::ATTR_CASE              => PDO::CASE_NATURAL,
         PDO::ATTR_ERRMODE           => PDO::ERRMODE_EXCEPTION,
         PDO::ATTR_STRINGIFY_FETCHES => false
@@ -136,7 +132,7 @@ protected function bindParameters(Statement $statement, array $parameters): Stat
      *
      * @link http://en.wikipedia.org/wiki/Savepoint
      *
-     * @param int $level   Savepoint name/id, must not contain spaces and be valid database
+     * @param int $level Savepoint name/id, must not contain spaces and be valid database
      *                     identifier.
      */
     protected function savepointCreate(int $level)
@@ -150,7 +146,7 @@ protected function savepointCreate(int $level)
      *
      * @link http://en.wikipedia.org/wiki/Savepoint
      *
-     * @param int $level   Savepoint name/id, must not contain spaces and be valid database
+     * @param int $level Savepoint name/id, must not contain spaces and be valid database
      *                     identifier.
      */
     protected function savepointRelease(int $level)
@@ -164,7 +160,7 @@ protected function savepointRelease(int $level)
      *
      * @link http://en.wikipedia.org/wiki/Savepoint
      *
-     * @param int $level   Savepoint name/id, must not contain spaces and be valid database
+     * @param int $level Savepoint name/id, must not contain spaces and be valid database
      *                     identifier.
      */
     protected function savepointRollback(int $level)

diff --git a/tests/Database/QueryCacheTest.php b/tests/Database/QueryCacheTest.php
@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);
+/**
+ * Spiral Framework.
+ *
+ * @license   MIT
+ * @author    Anton Titov (Wolfy-J)
+ */
+
+namespace Spiral\Database\Tests;
+
+abstract class QueryCacheTest extends BaseTest
+{
+
+}