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

Merge pull request #18188 from MoonE/qa-fix-gis-insert-form

Browse Source 
Fix inserting gis-data via insert/edit form
This commit is contained in:
Maurício Meneghini Fauth 2023-04-08 15:09:44 -03:00 committed by GitHub
commit d0997e0377
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/classes/InsertEdit.php
View File

@ -1605,7 +1605,11 @@ class InsertEdit
in_array($multiEditFuncs[$key], $gisFromTextFunctions)
|| in_array($multiEditFuncs[$key], $gisFromWkbFunctions)
) {
return $multiEditFuncs[$key] . "('" . $this->dbi->escapeString($currentValue) . "')";
preg_match('/^(\'?)(.*?)\1(?:,(\d+))?$/', $currentValue, $matches);
$escapedParams = "'" . $this->dbi->escapeString($matches[2])
. (isset($matches[3]) ? "'," . $matches[3] : "'");
return $multiEditFuncs[$key] . '(' . $escapedParams . ')';
}
if (

30
test/classes/InsertEditTest.php
View File

@ -2464,6 +2464,36 @@ class InsertEditTest extends AbstractTestCase
'0'
);
$this->assertTrue(password_verify("a'c", mb_substr($result, 1, -1)));
// case 7 / 8 / 9 / 10
$gisParams = [
['ST_GeomFromText'],
[],
['ST_GeomFromText'],
"'POINT(3 4)',4326",
[],
[],
[],
'0',
];
// case 7
$result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(...$gisParams);
$this->assertEquals('ST_GeomFromText(\'POINT(3 4)\',4326)', $result);
// case 8
$gisParams[3] = "POINT(3 4),4326";
$result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(...$gisParams);
$this->assertEquals('ST_GeomFromText(\'POINT(3 4)\',4326)', $result);
// case 9
$gisParams[3] = "'POINT(3 4)'";
$result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(...$gisParams);
$this->assertEquals('ST_GeomFromText(\'POINT(3 4)\')', $result);
// case 10
$gisParams[3] = "POINT(3 4)";
$result = $this->insertEdit->getCurrentValueAsAnArrayForMultipleEdit(...$gisParams);
$this->assertEquals('ST_GeomFromText(\'POINT(3 4)\')', $result);
}
/**