MAGETWO-54492: [GitHub] data-migration-tool converts utf8 characters …

…to `?` #96
magento · Sep 13, 2016 · ce958b4 · ce958b4
1 parent e4abd7c
commit ce958b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/etc/config.xsd b/etc/config.xsd
@@ -99,8 +99,8 @@
             <xs:element name="progress_bar_format" type="xs:string" maxOccurs="1"/>
             <xs:element name="upgrade_customer_password_hash" type="xs:string" maxOccurs="1"/>
             <xs:element name="crypt_key" type="xs:string" maxOccurs="1"/>
-            <xs:element name="edition_migrate" type="xs:string" maxOccurs="1"/>
-            <xs:element name="init_statements_source" type="xs:string" maxOccurs="1"/>
+            <xs:element name="edition_migrate" type="xs:string" minOccurs="0" maxOccurs="1"/>
+            <xs:element name="init_statements_source" type="xs:string" minOccurs="0" maxOccurs="1"/>
             <xs:element name="init_statements_destination" type="xs:string" maxOccurs="1"/>
             <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
         </xs:choice>

diff --git a/src/Migration/ResourceModel/Destination.php b/src/Migration/ResourceModel/Destination.php
@@ -67,8 +67,9 @@ protected function getResourceConfig()
         $config['database']['password'] = !empty($destination[$destinationType]['password'])
             ? $destination[$destinationType]['password']
             : '';
-        $initStatements = $this->configReader->getOption('init_statements_destination');
-        $config['database']['initStatements'] = $initStatements;
+        $config['database']['initStatements'] = !empty($this->configReader->getOption('init_statements_destination'))
+            ? $this->configReader->getOption('init_statements_destination')
+            : '';
         $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
@@ -44,8 +44,9 @@ protected function getResourceConfig()
             ? $source[$sourceType]['password']
             : '';
         $editionMigrate = $this->configReader->getOption('edition_migrate');
-        $initStatements = $this->configReader->getOption('init_statements_source');
-        $config['database']['initStatements'] = $initStatements;
+        $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];
         }