MAGETWO-59303: SQL error on migration when init statement is empty

magento · Oct 5, 2016 · 5a25661 · 5a25661
1 parent 8fb13de
commit 5a25661
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/Migration/ResourceModel/Destination.php b/src/Migration/ResourceModel/Destination.php
@@ -67,9 +67,10 @@ protected function getResourceConfig()
         $config['database']['password'] = !empty($destination[$destinationType]['password'])
             ? $destination[$destinationType]['password']
             : '';
-        $config['database']['initStatements'] = !empty($this->configReader->getOption('init_statements_destination'))
-            ? $this->configReader->getOption('init_statements_destination')
-            : '';
+        $initStatements = $this->configReader->getOption('init_statements_destination');
+        if (!empty($initStatements)) {
+            $config['database']['initStatements'] = $initStatements;
+        }
         $editionMigrate = $this->configReader->getOption('edition_migrate');
         if (in_array($editionMigrate, [Config::EDITION_MIGRATE_CE_TO_EE, Config::EDITION_MIGRATE_EE_TO_EE])) {
             $config['init_select_parts'] = ['disable_staging_preview' => true];

diff --git a/src/Migration/ResourceModel/Source.php b/src/Migration/ResourceModel/Source.php
@@ -43,10 +43,11 @@ protected function getResourceConfig()
         $config['database']['password'] = !empty($source[$sourceType]['password'])
             ? $source[$sourceType]['password']
             : '';
+        $initStatements = $this->configReader->getOption('init_statements_source');
+        if (!empty($initStatements)) {
+            $config['database']['initStatements'] = $initStatements;
+        }
         $editionMigrate = $this->configReader->getOption('edition_migrate');
-        $config['database']['initStatements'] = !empty($this->configReader->getOption('init_statements_source'))
-            ? $this->configReader->getOption('init_statements_source')
-            : '';
         if (in_array($editionMigrate, [Config::EDITION_MIGRATE_CE_TO_EE, Config::EDITION_MIGRATE_EE_TO_EE])) {
             $config['init_select_parts'] = ['disable_staging_preview' => true];
         }