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

Merge #19135 - Fix #18566 - Error when importing exported view with USE INDEX hint

Browse Source 
Pull-request: #19135
Fixes #18566

Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2024-04-28 10:35:10 +02:00
commit a07507d4e8
No known key found for this signature in database
GPG Key ID: 90A0EF1B8251A889
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/classes/Plugins/Export/ExportSql.php
View File

@ -67,6 +67,9 @@ class ExportSql extends ExportPlugin
*/
private $sentCharset = false;
/** @var string */
private $sqlViews = '';
protected function init(): void
{
// Avoids undefined variables, use NULL so isset() returns false
@ -982,6 +985,12 @@ class ExportSql extends ExportPlugin
unset($GLOBALS['sql_auto_increments']);
}
//add views to the sql dump file
if ($this->sqlViews !== '') {
$result = $this->export->outputHandler($this->sqlViews);
$this->sqlViews = '';
}
//add constraints to the sql dump file
if (isset($GLOBALS['sql_constraints'])) {
$result = $this->export->outputHandler($GLOBALS['sql_constraints']);
@ -2177,6 +2186,13 @@ class ExportSql extends ExportPlugin
$dump .= $this->getTableDefForView($db, $table, $crlf, true, $aliases);
}
if (empty($GLOBALS['sql_views_as_tables'])) {
// Save views, to be inserted after indexes
// in case the view uses USE INDEX syntax
$this->sqlViews .= $dump;
$dump = '';
}
break;
case 'stand_in':
$dump .= $this->exportComment(

13
test/classes/Plugins/Export/ExportSqlTest.php
View File

@ -22,6 +22,7 @@ use PhpMyAdmin\Table;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\DummyResult;
use ReflectionMethod;
use ReflectionProperty;
use stdClass;
use function array_shift;
@ -1083,11 +1084,15 @@ class ExportSqlTest extends AbstractTestCase
)
);
$result = ob_get_clean();
$sqlViewsProp = new ReflectionProperty(ExportSql::class, 'sqlViews');
$sqlViewsProp->setAccessible(true);
$sqlViews = $sqlViewsProp->getValue($this->object);
$this->assertIsString($result);
$this->assertStringContainsString('-- Structure for view test_table', $result);
$this->assertStringContainsString('DROP TABLE IF EXISTS `test_table`;', $result);
$this->assertStringContainsString('CREATE TABLE `test_table`', $result);
$this->assertEquals('', $result);
$this->assertIsString($sqlViews);
$this->assertStringContainsString('-- Structure for view test_table', $sqlViews);
$this->assertStringContainsString('DROP TABLE IF EXISTS `test_table`;', $sqlViews);
$this->assertStringContainsString('CREATE TABLE `test_table`', $sqlViews);
// case 4
$GLOBALS['sql_views_as_tables'] = true;