gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19063 from kamil-tekiela/Refactor-import-11

Browse Source 
Replace remaining $_POST in ImportCsv
This commit is contained in:
Maurício Meneghini Fauth 2024-03-18 15:07:13 -03:00 committed by GitHub
commit 1c7c48b3b6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Plugins/Import/ImportCsv.php
View File

@ -54,6 +54,8 @@ class ImportCsv extends AbstractImportCsv
*/
private bool $analyze = false;
private bool $replace = false;
private bool $ignore = false;
private string $terminated = '';
private string $enclosed = '';
private string $escaped = '';
@ -163,6 +165,8 @@ class ImportCsv extends AbstractImportCsv
public function setImportOptions(ServerRequest $request): void
{
$this->replace = $request->getParsedBodyParam('csv_replace') !== null;
$this->ignore = $request->getParsedBodyParam('csv_ignore') !== null;
$this->terminated = (string) $request->getParsedBodyParam('csv_terminated');
$this->enclosed = (string) $request->getParsedBodyParam('csv_enclosed');
$this->escaped = (string) $request->getParsedBodyParam('csv_escaped');
@ -183,9 +187,6 @@ class ImportCsv extends AbstractImportCsv
$GLOBALS['message'] ??= null;
$GLOBALS['errorUrl'] ??= null;
// $csv_replace and $csv_ignore should have been here,
// but we use directly from $_POST
$replacements = ['\\n' => "\n", '\\t' => "\t", '\\r' => "\r"];
$this->terminated = strtr($this->terminated, $replacements);
$this->enclosed = strtr($this->enclosed, $replacements);
@ -523,7 +524,7 @@ class ImportCsv extends AbstractImportCsv
}
$sql .= ')';
if (isset($_POST['csv_replace'])) {
if ($this->replace) {
$sql .= ' ON DUPLICATE KEY UPDATE ';
foreach ($fields as $field) {
$fieldName = Util::backquote($field);
@ -738,7 +739,7 @@ class ImportCsv extends AbstractImportCsv
$fields = [];
if (! $this->analyze && $db !== null && $table !== null) {
$sqlTemplate = 'INSERT';
if (isset($_POST['csv_ignore'])) {
if ($this->ignore) {
$sqlTemplate .= ' IGNORE';
}