From 364f9e00bac280d768dd660cca4767ac54ede227 Mon Sep 17 00:00:00 2001
From: Cristian Partica <cpartica@magento.com>
Date: Tue, 10 Jan 2017 15:20:08 -0600
Subject: [PATCH] MAGETWO-58924: SQL error wait timeout error when saving
categories
- fix static issues
---
.../Framework/DB/TemporaryTableService.php | 16 ++++++++--------
.../DB/Test/Unit/TemporaryTableServiceTest.php | 8 +++++---
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/lib/internal/Magento/Framework/DB/TemporaryTableService.php b/lib/internal/Magento/Framework/DB/TemporaryTableService.php
index a2c6f6d4651..7eabdf1af92 100644
--- a/lib/internal/Magento/Framework/DB/TemporaryTableService.php
+++ b/lib/internal/Magento/Framework/DB/TemporaryTableService.php
@@ -16,8 +16,8 @@ use Magento\Framework\DB\Select;
*/
class TemporaryTableService
{
- CONST HASH = 'HASH';
- CONST INNODB = 'INNODB';
+ const INDEX_METHOD_HASH = 'HASH';
+ const INDEX_METHOD_INNODB = 'INNODB';
/**
* @var string[]
@@ -46,8 +46,8 @@ class TemporaryTableService
*/
public function __construct(
\Magento\Framework\Math\Random $random,
- $allowedIndexMethods = [self::HASH],
- $allowedEngines = [self::INNODB]
+ $allowedIndexMethods = [],
+ $allowedEngines = []
) {
$this->random = $random;
$this->allowedIndexMethods = $allowedIndexMethods;
@@ -83,18 +83,18 @@ class TemporaryTableService
Select $select,
AdapterInterface $adapter,
array $indexes = [],
- $indexMethod = self::HASH,
- $dbEngine = self::INNODB
+ $indexMethod = self::INDEX_METHOD_HASH,
+ $dbEngine = self::INDEX_METHOD_INNODB
) {
if (!in_array($indexMethod, $this->allowedIndexMethods)) {
throw new \InvalidArgumentException(
- sprintf('indexMethod must be of type %s', implode(',', $this->allowedIndexMethods))
+ sprintf('indexMethod must be one of %s', implode(',', $this->allowedIndexMethods))
);
}
if (!in_array($dbEngine, $this->allowedEngines)) {
throw new \InvalidArgumentException(
- sprintf('dbEngine must be of type %s', implode(',', $this->allowedEngines))
+ sprintf('dbEngine must be one of %s', implode(',', $this->allowedEngines))
);
}
diff --git a/lib/internal/Magento/Framework/DB/Test/Unit/TemporaryTableServiceTest.php b/lib/internal/Magento/Framework/DB/Test/Unit/TemporaryTableServiceTest.php
index 68ccad5e385..960e5eb07e9 100644
--- a/lib/internal/Magento/Framework/DB/Test/Unit/TemporaryTableServiceTest.php
+++ b/lib/internal/Magento/Framework/DB/Test/Unit/TemporaryTableServiceTest.php
@@ -46,7 +46,9 @@ class TemporaryTableServiceTest extends \PHPUnit_Framework_TestCase
$this->temporaryTableService = (new ObjectManager($this))->getObject(
TemporaryTableService::class,
[
- 'random' => $this->randomMock
+ 'random' => $this->randomMock,
+ 'allowedIndexMethods' => ['HASH'],
+ 'allowedEngines' => ['INNODB']
]
);
}
@@ -72,8 +74,8 @@ class TemporaryTableServiceTest extends \PHPUnit_Framework_TestCase
$this->selectMock,
$this->adapterMock,
$indexes,
- TemporaryTableService::HASH . "Other",
- TemporaryTableService::INNODB . "Other"
+ TemporaryTableService::INDEX_METHOD_HASH . "Other",
+ TemporaryTableService::INDEX_METHOD_INNODB . "Other"
)
);
}
--
GitLab