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

Refactor getTableDefStandIn

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2024-12-23 17:35:14 +00:00
parent f6a0e931c9
commit 0d62dc1870
4 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
phpstan-baseline.neon
View File

@ -12249,12 +12249,6 @@ parameters:
count: 1
path: src/Plugins/Export/ExportSql.php
-
message: '#^Binary operation "\." between non\-falsy\-string and mixed results in an error\.$#'
identifier: binaryOp.invalid
count: 1
path: src/Plugins/Export/ExportSql.php
-
message: '''
#^Call to deprecated method getInstance\(\) of class PhpMyAdmin\\Config\:
@ -12279,12 +12273,6 @@ parameters:
count: 2
path: src/Plugins/Export/ExportSql.php
-
message: '#^Cannot access offset ''Type'' on mixed\.$#'
identifier: offsetAccess.nonOffsetAccessible
count: 1
path: src/Plugins/Export/ExportSql.php
-
message: '#^Cannot access offset ''alias'' on mixed\.$#'
identifier: offsetAccess.nonOffsetAccessible
@ -12306,7 +12294,7 @@ parameters:
-
message: '#^Cannot access offset \(int\|string\) on mixed\.$#'
identifier: offsetAccess.nonOffsetAccessible
count: 2
count: 1
path: src/Plugins/Export/ExportSql.php
-
@ -12318,7 +12306,7 @@ parameters:
-
message: '#^Cannot access offset string on mixed\.$#'
identifier: offsetAccess.nonOffsetAccessible
count: 10
count: 11
path: src/Plugins/Export/ExportSql.php
-

8
psalm-baseline.xml
View File

@ -4284,6 +4284,9 @@
<PossiblyUndefinedArrayOffset>
<code><![CDATA[$_SERVER['SCRIPT_NAME']]]></code>
</PossiblyUndefinedArrayOffset>
<PossiblyUnusedMethod>
<code><![CDATA[getColumnsFull]]></code>
</PossiblyUnusedMethod>
<PossiblyUnusedReturnValue>
<code><![CDATA[bool]]></code>
</PossiblyUnusedReturnValue>
@ -7097,7 +7100,6 @@
<code><![CDATA[$aliases[$oldDatabase]['tables'][$oldTable]]]></code>
<code><![CDATA[$aliases[$oldDatabase]['tables'][$oldTable]['columns']]]></code>
<code><![CDATA[$columnAliases[$column['name']]]]></code>
<code><![CDATA[$definition['Type']]]></code>
</MixedArrayAccess>
<MixedArrayTypeCoercion>
<code><![CDATA[$row[$j]]]></code>
@ -7107,7 +7109,6 @@
<code><![CDATA[$colAlias]]></code>
<code><![CDATA[$colAs]]></code>
<code><![CDATA[$columnAliases]]></code>
<code><![CDATA[$definition]]></code>
<code><![CDATA[$field->name]]></code>
<code><![CDATA[$field->references->table->table]]></code>
<code><![CDATA[$newDatabase]]></code>
@ -7118,9 +7119,6 @@
<code><![CDATA[$statement->name->table]]></code>
<code><![CDATA[$statement->table->table]]></code>
</MixedAssignment>
<MixedOperand>
<code><![CDATA[$definition['Type']]]></code>
</MixedOperand>
<MixedPropertyTypeCoercion>
<code><![CDATA[$field->key->columns]]></code>
<code><![CDATA[$field->references->columns]]></code>

8
src/Plugins/Export/ExportSql.php
View File

@ -1260,14 +1260,14 @@ class ExportSql extends ExportPlugin
$createQuery .= Util::backquote($viewAlias) . ' (' . "\n";
$tmp = [];
$columns = DatabaseInterface::getInstance()->getColumnsFull($db, $view);
foreach ($columns as $columnName => $definition) {
$colAlias = $columnName;
$columns = DatabaseInterface::getInstance()->getColumns($db, $view);
foreach ($columns as $column) {
$colAlias = $column->field;
if (! empty($aliases[$db]['tables'][$view]['columns'][$colAlias])) {
$colAlias = $aliases[$db]['tables'][$view]['columns'][$colAlias];
}
$tmp[] = Util::backquote($colAlias) . ' ' . $definition['Type'] . "\n";
$tmp[] = Util::backquote($colAlias) . ' ' . $column->type . "\n";
}
return $createQuery . implode(',', $tmp) . ');' . "\n";

5
tests/unit/Plugins/Export/ExportSqlTest.php
View File

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace PhpMyAdmin\Tests\Plugins\Export;
use PhpMyAdmin\Column;
use PhpMyAdmin\ColumnFull;
use PhpMyAdmin\Config;
use PhpMyAdmin\ConfigStorage\Relation;
@ -650,9 +651,9 @@ class ExportSqlTest extends AbstractTestCase
->getMock();
$dbi->expects(self::once())
->method('getColumnsFull')
->method('getColumns')
->with('db', 'view')
->willReturn(['cname' => ['Type' => 'int']]);
->willReturn([new Column('cname', 'int', false, '', null, '')]);
DatabaseInterface::$instance = $dbi;