Skip to content

fix double byte characters broken bug. #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
HirokazuNishi wants to merge 1 commit into from
Closed

fix double byte characters broken bug. #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.6.0.0/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.6.0.0/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.6.1.0/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.6.1.0/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.6.2.0/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.6.2.0/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.7.0.0/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.7.0.0/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.7.0.1/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.7.0.1/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.7.0.2/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.7.0.2/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.8.0.0/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.8.0.0/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.8.1.0/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.8.1.0/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.9.0.0/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.9.0.0/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.9.0.1/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.9.0.1/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.9.1.0/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.9.1.0/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.9.1.1/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.9.1.1/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.9.2.0/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.9.2.0/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.9.2.1/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.9.2.1/map.xml.dist</map_file>
Expand Down
4 changes: 2 additions & 2 deletions etc/ce-to-ce/1.9.2.2/config.xml.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@
</step>
</steps>
<source>
<database host="localhost" name="magento1" user="root"/>
<database host="localhost" name="magento1" user="root" initStatements="SET NAMES utf8;" />
</source>
<destination>
<database host="localhost" name="magento2" user="root"/>
<database host="localhost" name="magento2" user="root" initStatements="SET NAMES utf8;" />
</destination>
<options>
<map_file>etc/ce-to-ce/1.9.2.2/map.xml.dist</map_file>
Expand Down
1 change: 1 addition & 0 deletions etc/config.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
<xs:attribute name="host" type="xs:string" use="required"/>
<xs:attribute name="user" type="xs:string" use="required"/>
<xs:attribute name="password" type="xs:string" use="optional"/>
<xs:attribute name="initStatements" type="xs:string" use="required"/>
</xs:complexType>

<xs:simpleType name="resourceType">
Expand Down
1 change: 1 addition & 0 deletions src/Migration/ResourceModel/Destination.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ protected function getResourceConfig()
$config['password'] = !empty($destination[$destinationType]['password'])
? $destination[$destinationType]['password']
: '';
$config['initStatements'] = $destination[$destinationType]['initStatements'];
return $config;
}

Expand Down
1 change: 1 addition & 0 deletions src/Migration/ResourceModel/Source.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ protected function getResourceConfig()
$config['password'] = !empty($source[$sourceType]['password'])
? $source[$sourceType]['password']
: '';
$config['initStatements'] = $source[$sourceType]['initStatements'];
return $config;
}

Expand Down