Merge #20166 - Fix #20152 - XML import when structure is present

williamdes · williamdes · commit 5391167eab8e · 2026-02-24T15:39:20.000+01:00
Pull-request: #20166 Fixes: #20152 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/src/Plugins/Import/ImportXml.php b/src/Plugins/Import/ImportXml.php
@@ -202,11 +202,11 @@ public function doImport(File|null $importHandle = null): array
         }
 
         /**
-         * Only build SQL from data if there is data present.
+         * Only build SQL from data if there is data present and no structure.
          * Set values to NULL if they were not present
          * to maintain Import::buildSql() call integrity
          */
-        if ($tables !== [] && $analyses === null) {
+        if (! $structPresent && $tables !== []) {
             $create = null;
         }
 
diff --git a/tests/unit/Plugins/Import/ImportXmlTest.php b/tests/unit/Plugins/Import/ImportXmlTest.php
@@ -95,22 +95,9 @@ public function testDoImport(): void
         $importXml = $this->getImportXml($dbi);
         $importXml->doImport($importHandle);
 
-        // If import successfully, PMA will show all databases and tables
-        // imported as following HTML Page
-        /*
-           The following structures have either been created or altered. Here you
-           can:
-           View a structure's contents by clicking on its name
-           Change any of its settings by clicking the corresponding "Options" link
-           Edit structure by following the "Structure" link
-
-           phpmyadmintest (Options)
-           pma_bookmarktest (Structure) (Options)
-        */
-
         //assert that all sql are executed
         self::assertSame(
-            'CREATE DATABASE IF NOT EXISTS `phpmyadmintest` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;'
+            'CREATE DATABASE IF NOT EXISTS `phpmyadmintest` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;'
             . 'USE `phpmyadmintest`;' . "\n"
             . 'CREATE TABLE IF NOT EXISTS `pma_bookmarktest` (' . "\n"
             . '  `id` int(11) NOT NULL AUTO_INCREMENT,' . "\n"
@@ -122,18 +109,11 @@ public function testDoImport(): void
             . ') ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT=\'Bookmarks\';' . "\n"
             . '            ;'
             . 'INSERT INTO `phpmyadmintest`.`pma_bookmarktest` (`id`, `dbase`, `user`, `label`, `query`) '
-            . 'VALUES (, \'\', \'\', \'\', \'\');;',
+            . 'VALUES (1, , , , );',
             Current::$sqlQuery,
         );
 
-        self::assertStringContainsString(
-            'The following structures have either been created or altered.',
-            ImportSettings::$importNotice,
-        );
-        self::assertStringContainsString('Go to database: `phpmyadmintest`', ImportSettings::$importNotice);
-        self::assertStringContainsString('Edit settings for `phpmyadmintest`', ImportSettings::$importNotice);
         self::assertStringContainsString('Go to table: `pma_bookmarktest`', ImportSettings::$importNotice);
-        self::assertStringContainsString('Edit settings for `pma_bookmarktest`', ImportSettings::$importNotice);
         self::assertTrue(ImportSettings::$finished);
     }
 
@@ -163,8 +143,9 @@ public function testDoImportDataset2(): void
         $importXml = $this->getImportXml($dbi);
         $importXml->doImport($importHandle);
 
+        //assert that all sql are executed
         self::assertSame(
-            'CREATE DATABASE IF NOT EXISTS `phpmyadmintest` DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci;'
+            'CREATE DATABASE IF NOT EXISTS `phpmyadmintest` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;'
             . 'USE `phpmyadmintest`;' . "\n"
             . 'CREATE TABLE IF NOT EXISTS `pma_bookmarktest` (' . "\n"
             . '  `id` int(11) NOT NULL AUTO_INCREMENT,' . "\n"
@@ -176,18 +157,16 @@ public function testDoImportDataset2(): void
             . ') ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT=\'Bookmarks\';' . "\n"
             . '            ;'
             . 'INSERT INTO `phpmyadmintest`.`pma_bookmarktest` (`id`, `dbase`, `user`, `label`, `query`) '
-            . 'VALUES (, \'\', \'\', \'\', \'\');;',
+            . 'VALUES (1, , , , );',
             Current::$sqlQuery,
         );
 
         self::assertStringContainsString(
             'The following structures have either been created or altered.',
             ImportSettings::$importNotice,
         );
-        self::assertStringContainsString('Go to database: `test`', ImportSettings::$importNotice);
-        self::assertStringContainsString('Edit settings for `test`', ImportSettings::$importNotice);
-        self::assertStringContainsString('Go to table: `test`', ImportSettings::$importNotice);
-        self::assertStringContainsString('Edit settings for `test`', ImportSettings::$importNotice);
+
+        self::assertStringContainsString('Go to table: `pma_bookmarktest`', ImportSettings::$importNotice);
         self::assertTrue(ImportSettings::$finished);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -202,11 +202,11 @@ public function doImport(File\|null $importHandle = null): array`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`/**`
`205`		`- * Only build SQL from data if there is data present.`
	`205`	`+ * Only build SQL from data if there is data present and no structure.`
`206`	`206`	`* Set values to NULL if they were not present`
`207`	`207`	`* to maintain Import::buildSql() call integrity`
`208`	`208`	`*/`
`209`		`- if ($tables !== [] && $analyses === null) {`
	`209`	`+ if (! $structPresent && $tables !== []) {`
`210`	`210`	`$create = null;`
`211`	`211`	`}`
`212`	`212`