Merge pull request #3744 from magento-thunder/MAGETWO-97326

Fixed issues:
 - MAGETWO-97326: [Backport 2.1.x] Mysql reconnect does not work

Author: arhiopterecs

dev/tests/integration/testsuite/Magento/Framework/DB/Adapter/Pdo/MysqlTest.php

@@ -3,32 +3,26 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
-// @codingStandardsIgnoreFile
-
-/**
- * Test for an PDO MySQL adapter
- */
 namespace Magento\Framework\DB\Adapter\Pdo;
 
 use Magento\Framework\App\ResourceConnection;
-use Zend_Db_Statement_Exception;
+use Magento\TestFramework\Helper\Bootstrap;
 
 class MysqlTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Database adapter instance
-     *
-     * @var \Magento\Framework\DB\Adapter\Pdo\Mysql
+     * @var ResourceConnection
      */
-    protected $_connection = null;
+    private $resourceConnection;
 
-    public function setUp()
+    protected function setUp()
     {
         set_error_handler(null);
+        $this->resourceConnection = Bootstrap::getObjectManager()
+            ->get(ResourceConnection::class);
     }
 
-    public function tearDown()
+    protected function tearDown()
     {
         restore_error_handler();
     }
@@ -40,30 +34,20 @@ public function tearDown()
      */
     public function testWaitTimeout()
     {
-        if (!$this->_getConnection() instanceof \Magento\Framework\DB\Adapter\Pdo\Mysql) {
+        if (!$this->getDbAdapter() instanceof \Magento\Framework\DB\Adapter\Pdo\Mysql) {
             $this->markTestSkipped('This test is for \Magento\Framework\DB\Adapter\Pdo\Mysql');
         }
         try {
-            $defaultWaitTimeout = $this->_getWaitTimeout();
             $minWaitTimeout = 1;
-            $this->_setWaitTimeout($minWaitTimeout);
-            $this->assertEquals($minWaitTimeout, $this->_getWaitTimeout(), 'Wait timeout was not changed');
+            $this->setWaitTimeout($minWaitTimeout);
+            $this->assertEquals($minWaitTimeout, $this->getWaitTimeout(), 'Wait timeout was not changed');
 
             // Sleep for time greater than wait_timeout and try to perform query
             sleep($minWaitTimeout + 1);
-            $result = $this->_executeQuery('SELECT 1');
-            $this->assertInstanceOf('Magento\Framework\DB\Statement\Pdo\Mysql', $result);
-            // Restore wait_timeout
-            $this->_setWaitTimeout($defaultWaitTimeout);
-            $this->assertEquals(
-                $defaultWaitTimeout,
-                $this->_getWaitTimeout(),
-                'Default wait timeout was not restored'
-            );
-        } catch (\Exception $e) {
-            // Reset connection on failure to restore global variables
-            $this->_getConnection()->closeConnection();
-            throw $e;
+            $result = $this->executeQuery('SELECT 1');
+            $this->assertInstanceOf(\Magento\Framework\DB\Statement\Pdo\Mysql::class, $result);
+        } finally {
+            $this->getDbAdapter()->closeConnection();
         }
     }
 
@@ -72,9 +56,9 @@ public function testWaitTimeout()
      *
      * @return int
      */
-    protected function _getWaitTimeout()
+    private function getWaitTimeout()
     {
-        $result = $this->_executeQuery('SELECT @@session.wait_timeout');
+        $result = $this->executeQuery('SELECT @@session.wait_timeout');
         return (int)$result->fetchColumn();
     }
 
@@ -83,54 +67,67 @@ protected function _getWaitTimeout()
      *
      * @param int $waitTimeout
      */
-    protected function _setWaitTimeout($waitTimeout)
+    private function setWaitTimeout($waitTimeout)
     {
-        $this->_executeQuery("SET @@session.wait_timeout = {$waitTimeout}");
+        $this->executeQuery("SET @@session.wait_timeout = {$waitTimeout}");
     }
 
     /**
      * Execute SQL query and return result statement instance
      *
-     * @param string $sql
-     * @return \Zend_Db_Statement_Interface
-     * @throws \Exception
+     * @param $sql
+     * @return void|\Zend_Db_Statement_Pdo
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Zend_Db_Adapter_Exception
      */
-    protected function _executeQuery($sql)
+    private function executeQuery($sql)
     {
-        /**
-         * Suppress PDO warnings to work around the bug
-         * @link https://bugs.php.net/bug.php?id=63812
-         */
-        $phpErrorReporting = error_reporting();
-        /** @var $pdoConnection \PDO */
-        $pdoConnection = $this->_getConnection()->getConnection();
-        $pdoWarningsEnabled = $pdoConnection->getAttribute(\PDO::ATTR_ERRMODE) & \PDO::ERRMODE_WARNING;
-        if (!$pdoWarningsEnabled) {
-            error_reporting($phpErrorReporting & ~E_WARNING);
-        }
-        try {
-            $result = $this->_getConnection()->query($sql);
-            error_reporting($phpErrorReporting);
-        } catch (\Exception $e) {
-            error_reporting($phpErrorReporting);
-            throw $e;
-        }
-        return $result;
+        return $this->getDbAdapter()->query($sql);
     }
 
     /**
      * Retrieve database adapter instance
      *
      * @return \Magento\Framework\DB\Adapter\Pdo\Mysql
      */
-    protected function _getConnection()
+    private function getDbAdapter()
     {
-        if (is_null($this->_connection)) {
-            /** @var $coreResource \Magento\Framework\App\ResourceConnection */
-            $coreResource = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
-                ->get('Magento\Framework\App\ResourceConnection');
-            $this->_connection = $coreResource->getConnection();
-        }
-        return $this->_connection;
+        return $this->resourceConnection->getConnection();
+    }
+
+    public function testGetCreateTable()
+    {
+        $tableName = $this->resourceConnection->getTableName('core_config_data');
+        $this->assertEquals(
+            $this->getDbAdapter()->getCreateTable($tableName),
+            $this->getDbAdapter()->getCreateTable($tableName)
+        );
+    }
+
+    public function testGetForeignKeys()
+    {
+        $tableName = $this->resourceConnection->getTableName('core_config_data');
+        $this->assertEquals(
+            $this->getDbAdapter()->getForeignKeys($tableName),
+            $this->getDbAdapter()->getForeignKeys($tableName)
+        );
+    }
+
+    public function testGetIndexList()
+    {
+        $tableName = $this->resourceConnection->getTableName('core_config_data');
+        $this->assertEquals(
+            $this->getDbAdapter()->getIndexList($tableName),
+            $this->getDbAdapter()->getIndexList($tableName)
+        );
+    }
+
+    public function testDescribeTable()
+    {
+        $tableName = $this->resourceConnection->getTableName('core_config_data');
+        $this->assertEquals(
+            $this->getDbAdapter()->describeTable($tableName),
+            $this->getDbAdapter()->describeTable($tableName)
+        );
     }
 }

lib/internal/Magento/Framework/DB/Statement/Pdo/Mysql.php

@@ -3,23 +3,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+namespace Magento\Framework\DB\Statement\Pdo;
 
-// @codingStandardsIgnoreFile
+use Magento\Framework\DB\Statement\Parameter;
 
 /**
  * Mysql DB Statement
  *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Framework\DB\Statement\Pdo;
-
-use Magento\Framework\DB\Statement\Parameter;
-
 class Mysql extends \Zend_Db_Statement_Pdo
 {
+
     /**
-     * Executes statement with binding values to it.
-     * Allows transferring specific options to DB driver.
+     * Executes statement with binding values to it. Allows transferring specific options to DB driver.
      *
      * @param array $params Array of values to bind to parameter placeholders.
      * @return bool
@@ -63,11 +60,9 @@ public function _executeWithBinding(array $params)
             $statement->bindParam($paramName, $bindValues[$name], $dataType, $length, $driverOptions);
         }
 
-        try {
+        return $this->tryExecute(function () use ($statement) {
             return $statement->execute();
-        } catch (\PDOException $e) {
-            throw new \Zend_Db_Statement_Exception($e->getMessage(), (int)$e->getCode(), $e);
-        }
+        });
     }
 
     /**
@@ -92,7 +87,29 @@ public function _execute(array $params = null)
         if ($specialExecute) {
             return $this->_executeWithBinding($params);
         } else {
-            return parent::_execute($params);
+            return $this->tryExecute(function () use ($params) {
+                return $params !== null ? $this->_stmt->execute($params) : $this->_stmt->execute();
+            });
+        }
+    }
+
+    /**
+     * Executes query and avoid warnings.
+     *
+     * @param callable $callback
+     * @return bool
+     * @throws \Zend_Db_Statement_Exception
+     */
+    private function tryExecute($callback)
+    {
+        $previousLevel = error_reporting(\E_ERROR); // disable warnings for PDO bugs #63812, #74401
+        try {
+            return $callback();
+        } catch (\PDOException $e) {
+            $message = sprintf('%s, query was: %s', $e->getMessage(), $this->_stmt->queryString);
+            throw new \Zend_Db_Statement_Exception($message, (int)$e->getCode(), $e);
+        } finally {
+            error_reporting($previousLevel);
         }
     }
 }