remove ReconnectWrapper

dbal now handles it's own reconnections: https://github.com/doctrine/dbal/blob/3.0.x/UPGRADE.md#the-pingableconnection-interface-is-removed

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 49b138714a7d1ad16b61d165053771a97379323b..bf770d488144644f1a7842a23b7fd82964501a30 100644 (file)
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -992,7 +992,6 @@ return array(
     'OC\\DB\\QueryBuilder\\QueryBuilder' => $baseDir . '/lib/private/DB/QueryBuilder/QueryBuilder.php',
     'OC\\DB\\QueryBuilder\\QueryFunction' => $baseDir . '/lib/private/DB/QueryBuilder/QueryFunction.php',
     'OC\\DB\\QueryBuilder\\QuoteHelper' => $baseDir . '/lib/private/DB/QueryBuilder/QuoteHelper.php',
-    'OC\\DB\\ReconnectWrapper' => $baseDir . '/lib/private/DB/ReconnectWrapper.php',
     'OC\\DB\\ResultAdapter' => $baseDir . '/lib/private/DB/ResultAdapter.php',
     'OC\\DB\\SQLiteMigrator' => $baseDir . '/lib/private/DB/SQLiteMigrator.php',
     'OC\\DB\\SQLiteSessionInit' => $baseDir . '/lib/private/DB/SQLiteSessionInit.php',

diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 373db9144bd8fea97d667c246e7b66b036c94387..4fa5b2b282d55f176b37b54b96a067b3ad55106c 100644 (file)
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -1021,7 +1021,6 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\DB\\QueryBuilder\\QueryBuilder' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/QueryBuilder.php',
         'OC\\DB\\QueryBuilder\\QueryFunction' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/QueryFunction.php',
         'OC\\DB\\QueryBuilder\\QuoteHelper' => __DIR__ . '/../../..' . '/lib/private/DB/QueryBuilder/QuoteHelper.php',
-        'OC\\DB\\ReconnectWrapper' => __DIR__ . '/../../..' . '/lib/private/DB/ReconnectWrapper.php',
         'OC\\DB\\ResultAdapter' => __DIR__ . '/../../..' . '/lib/private/DB/ResultAdapter.php',
         'OC\\DB\\SQLiteMigrator' => __DIR__ . '/../../..' . '/lib/private/DB/SQLiteMigrator.php',
         'OC\\DB\\SQLiteSessionInit' => __DIR__ . '/../../..' . '/lib/private/DB/SQLiteSessionInit.php',

diff --git a/lib/private/DB/Connection.php b/lib/private/DB/Connection.php
index cb7af4d51e29bc0d3654fd869a0043ccb96efd56..4d9433122ce01e3a34a8739733dcbe7624145afb 100644 (file)
--- a/lib/private/DB/Connection.php
+++ b/lib/private/DB/Connection.php
@@ -53,7 +53,7 @@ use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\ILogger;
 use OCP\PreConditionNotMetException;
 
-class Connection extends ReconnectWrapper {
+class Connection extends \Doctrine\DBAL\Connection {
        /** @var string */
        protected $tablePrefix;
 
@@ -172,6 +172,9 @@ class Connection extends ReconnectWrapper {
                if (!isset($params['tablePrefix'])) {
                        throw new \Exception('tablePrefix not set');
                }
+               /**
+                * @psalm-suppress InternalMethod
+                */
                parent::__construct($params, $driver, $config, $eventManager);
                $this->adapter = new $params['adapter']($this);
                $this->tablePrefix = $params['tablePrefix'];

diff --git a/lib/private/DB/ReconnectWrapper.php b/lib/private/DB/ReconnectWrapper.php
deleted file mode 100644 (file)
index a017015..0000000
--- a/lib/private/DB/ReconnectWrapper.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2018 Robin Appelman <robin@icewind.nl>
- *
- * @author Christoph Wurst <christoph@winzerhof-wurst.at>
- * @author Robin Appelman <robin@icewind.nl>
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OC\DB;
-
-use Doctrine\Common\EventManager;
-use Doctrine\DBAL\Configuration;
-use Doctrine\DBAL\Driver;
-
-class ReconnectWrapper extends \Doctrine\DBAL\Connection {
-       public const CHECK_CONNECTION_INTERVAL = 60;
-
-       private $lastConnectionCheck = null;
-
-       public function __construct(array $params, Driver $driver, Configuration $config = null, EventManager $eventManager = null) {
-               parent::__construct($params, $driver, $config, $eventManager);
-               $this->lastConnectionCheck = time();
-       }
-
-       public function connect() {
-               $now = time();
-               $checkTime = $now - self::CHECK_CONNECTION_INTERVAL;
-
-               if ($this->lastConnectionCheck > $checkTime || $this->isTransactionActive()) {
-                       return parent::connect();
-               }
-
-               $this->lastConnectionCheck = $now;
-               if (!$this->isConnected()) {
-                       $this->close();
-               }
-               return parent::connect();
-       }
-}