Merge remote-tracking branch 'falcon/MAGETWO-70061' into falcons-pr-bugfixes

Author: oshmyheliuk

lib/internal/Magento/Framework/DB/Ddl/Sequence.php

@@ -10,26 +10,6 @@
  */
 class Sequence
 {
-    /**
-     *  Default table engine for sequences tables.
-     */
-    const DEFAULT_ENGINE = 'INNODB';
-
-    /**
-     * Database table engine for creating sequence table.
-     *
-     * @var string
-     */
-    private $dbEngine;
-
-    /**
-     * @param null $dbEngine The database table engine
-     */
-    public function __construct($dbEngine = null)
-    {
-        $this->dbEngine = $dbEngine ?: self::DEFAULT_ENGINE;
-    }
-
     /**
      * Return SQL for create sequence
      *
@@ -48,9 +28,9 @@ public function getCreateSequenceDdl(
         $format = "CREATE TABLE %s (
                      sequence_value %s %s NOT NULL AUTO_INCREMENT,
                      PRIMARY KEY (sequence_value)
-            ) AUTO_INCREMENT = %d ENGINE = %s";
+            ) AUTO_INCREMENT = %d ENGINE = INNODB";
 
-        return sprintf($format, $name, $columnType, $unsigned ? 'UNSIGNED' : '', $startNumber, $this->dbEngine);
+        return sprintf($format, $name, $columnType, $unsigned ? 'UNSIGNED' : '', $startNumber);
     }
 
     /**

lib/internal/Magento/Framework/DB/Test/Unit/Ddl/SequenceTest.php

@@ -12,14 +12,13 @@ class SequenceTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @param array $params
-     * @param string $engine
      * @param string $expectedQuery
      * @dataProvider createSequenceDdlDataProvider
      */
-    public function testGetCreateSequenceDdl(array $params, $engine, $expectedQuery)
+    public function testGetCreateSequenceDdl(array $params, $expectedQuery)
     {
-        $model = new Sequence($engine);
-        $actualQuery = call_user_func_array([$model, 'getCreateSequenceDdl'], $params);
+        $model = new Sequence();
+        $actualQuery = $model->getCreateSequenceDdl(...array_values($params));
 
         $cleanString = function ($string) {
             return trim(preg_replace('/\s+/', ' ', $string));
@@ -46,7 +45,6 @@ public function createSequenceDdlDataProvider()
                 [
                     'name' => 'someName'
                 ],
-                null,
                 'CREATE TABLE someName (
                      sequence_value integer UNSIGNED NOT NULL AUTO_INCREMENT,
                      PRIMARY KEY (sequence_value)
@@ -59,11 +57,10 @@ public function createSequenceDdlDataProvider()
                     'columnType' => Table::TYPE_BIGINT,
                     'unsigned' => false
                 ],
-                'someEngine',
                 'CREATE TABLE someName (
                      sequence_value bigint NOT NULL AUTO_INCREMENT,
                      PRIMARY KEY (sequence_value)
-                ) AUTO_INCREMENT = 123 ENGINE = someEngine'
+                ) AUTO_INCREMENT = 123 ENGINE = INNODB'
             ]
         ];
     }