From 571f59be46af898181eb4dbbd53dc1b1d4956de8 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Mon, 26 Jul 2021 16:54:45 +0200
Subject: [PATCH] UserDomainMigration: Always use `utf8` as connection charset
---
.../Migrate/Config/UserDomainMigration.php | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/modules/migrate/library/Migrate/Config/UserDomainMigration.php b/modules/migrate/library/Migrate/Config/UserDomainMigration.php
index d56722b4e..5edc93722 100644
--- a/modules/migrate/library/Migrate/Config/UserDomainMigration.php
+++ b/modules/migrate/library/Migrate/Config/UserDomainMigration.php
@@ -206,8 +206,11 @@ class UserDomainMigration
break;
case 'db':
+ $resourceConfig = ResourceFactory::getResourceConfig($config->get('global', 'config_resource'));
+ $resourceConfig->charset = 'utf8';
+
/** @var DbConnection $conn */
- $conn = ResourceFactory::create($config->get('global', 'config_resource'));
+ $conn = ResourceFactory::createResource($resourceConfig);
$query = $conn
->select()
@@ -288,8 +291,11 @@ class UserDomainMigration
continue;
}
+ $resourceConfig = ResourceFactory::getResourceConfig($config->resource);
+ $resourceConfig->charset = 'utf8';
+
/** @var DbConnection $conn */
- $conn = ResourceFactory::create($config->resource);
+ $conn = ResourceFactory::createResource($resourceConfig);
$query = $conn
->select()
@@ -336,8 +342,11 @@ class UserDomainMigration
continue;
}
+ $resourceConfig = ResourceFactory::getResourceConfig($config->resource);
+ $resourceConfig->charset = 'utf8';
+
/** @var DbConnection $conn */
- $conn = ResourceFactory::create($config->resource);
+ $conn = ResourceFactory::createResource($resourceConfig);
$query = $conn
->select()