Merge pull request #19808 from DarshBhavnani/fix/table-name-import-csv-mismatch

fix tablename doesn't match with csv filename when importing it

Fixes #19371
This commit is contained in:
Maurício Meneghini Fauth 2025-08-25 22:19:31 -03:00 committed by GitHub
commit 4a67601d5c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -723,18 +723,21 @@ class ImportCsv extends AbstractImportCsv
}
// check to see if {filename} as table exist
$nameArray = preg_grep('/' . $importFileName . '/isU', $result);
$nameArray = preg_grep('/^' . $importFileName . '$/isU', $result);
// if no use filename as table name
if ($nameArray === false || count($nameArray) === 0) {
return $importFileName;
}
// check if {filename}_ as table exist
$nameArray = preg_grep('/' . $importFileName . '_/isU', $result);
$nameArray = preg_grep('/^' . $importFileName . '_$/isU', $result);
if ($nameArray === false) {
return $importFileName;
}
// Filter for table names starting with the {filename}_ prefix
$nameArray = preg_grep('/^' . $importFileName . '_/isU', $result);
return $importFileName . '_' . (count($nameArray) + 1);
}