phpmyadmin
diff --git a/‎src/Plugins/Import/ImportLdi.php‎
Lines changed: 14 additions & 3 deletions b/‎src/Plugins/Import/ImportLdi.php‎
Lines changed: 14 additions & 3 deletions
diff --git a/‎tests/unit/Plugins/Import/ImportLdiTest.php‎
Lines changed: 13 additions & 4 deletions b/‎tests/unit/Plugins/Import/ImportLdiTest.php‎
Lines changed: 13 additions & 4 deletions
@@ -43,7 +43,6 @@ class ImportLdi extends AbstractImportCsv
         'iso-8859-8' => 'hebrew',
         'iso-8859-9' => 'latin5',
         'iso-8859-13' => 'latin7',
-        'utf-8' => 'utf8mb4',
         'koi8-r' => 'koi8r',
         'windows-1250' => 'cp1250',
         'windows-1251' => 'cp1251',
@@ -163,12 +162,20 @@ public function doImport(File|null $importHandle = null): array
 
         $sql .= ' INTO TABLE ' . Util::backquote(Current::$table);
 
+        // UTF-8 charset imports don't get routed here since it is presumed ImportSettings::$charsetConversion is falsy
         if (ImportSettings::$charsetConversion) {
             $charset = $this->getDBCharset(ImportSettings::$charsetOfFile);
 
-            if ($charset !== null) {
-                $sql .= ' CHARACTER SET ' . $charset;
+            if ($charset === null) {
+                Current::$message = Message::error(
+                    __('The selected character set is not supported by the database system.'),
+                );
+                Import::$hasError = true;
+
+                return [];
             }
+
+            $sql .= ' CHARACTER SET ' . $charset;
         }
 
         if ($this->terminated !== '') {
@@ -248,6 +255,10 @@ private function setLdiLocalOptionConfig(): void
         $this->config->settings['Import']['ldi_local_option'] = true;
     }
 
+    /**
+     * Returns the database charset name for a file charset, or null if
+     * the charset is not supported by LOAD DATA.
+     */
     private function getDBCharset(string $charset): string|null
     {
         if ($charset === 'utf-16' && $this->dbi->isMariaDB()) {
 
@@ -232,7 +232,6 @@ public static function charsetMappingProvider(): array
             'ISO-8859-8' => ['iso-8859-8', 'hebrew'],
             'ISO-8859-9' => ['iso-8859-9', 'latin5'],
             'ISO-8859-13' => ['iso-8859-13', 'latin7'],
-            'UTF-8' => ['utf-8', 'utf8mb4'],
             'KOI8-R' => ['koi8-r', 'koi8r'],
             'Windows-1250' => ['windows-1250', 'cp1250'],
             'Windows-1251' => ['windows-1251', 'cp1251'],
@@ -241,8 +240,12 @@ public static function charsetMappingProvider(): array
             'Windows-1257' => ['windows-1257', 'cp1257'],
             'TIS-620' => ['tis-620', 'tis620'],
             'Shift_JIS' => ['SHIFT_JIS', 'sjis'],
+            'SJIS' => ['SJIS', 'sjis'],
+            'SJIS-win' => ['SJIS-win', 'cp932'],
             'Big5' => ['big5', 'big5'],
             'GB2312' => ['gb2312', 'gb2312'],
+            'euc-jp' => ['euc-jp', 'ujis'],
+            'ks_c_5601-1987' => ['ks_c_5601-1987', 'euckr'],
         ];
     }
 
@@ -275,15 +278,21 @@ public function testDoImportWithUtf16OnMySql(): void
         $dbi = $this->createMock(DatabaseInterface::class);
         $dbi->method('quoteString')
             ->willReturnCallback(static fn (string $string): string => "'" . $string . "'");
-
         $dbi->method('isMariaDB')->willReturn(false);
 
         $importHandle = new File(ImportSettings::$importFile);
         $importHandle->open();
 
-        $this->getImportLdi($dbi)->doImport($importHandle);
+        $importLdi = $this->getImportLdi($dbi);
+        $result = $importLdi->doImport($importHandle);
 
-        self::assertStringNotContainsString('CHARACTER SET utf16', Current::$sqlQuery);
+        self::assertSame([], $result);
+        self::assertTrue(Import::$hasError);
+        self::assertInstanceOf(Message::class, Current::$message);
+        self::assertStringContainsString(
+            __('The selected character set is not supported by the database system.'),
+            Current::$message->__toString(),
+        );
     }
 
     public function testDoImportWithUnsupportedCharsetDoesNotAddCharacterSet(): void