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

Make TableMover non-static

Browse Source 
Signed-off-by: Kamil Tekiela <tekiela246@gmail.com>
This commit is contained in:
Kamil Tekiela 2024-03-23 14:11:03 +01:00
parent 14afc6c815
commit b2fbc55ff2
11 changed files with 107 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services.php
View File

@ -48,6 +48,7 @@ use PhpMyAdmin\SqlQueryForm;
use PhpMyAdmin\Table\ColumnsDefinition;
use PhpMyAdmin\Table\Indexes;
use PhpMyAdmin\Table\Search;
use PhpMyAdmin\Table\TableMover;
use PhpMyAdmin\Template;
use PhpMyAdmin\Theme\ThemeManager;
use PhpMyAdmin\Tracking\Tracking;
@ -135,7 +136,7 @@ return [
],
'operations' => [
'class' => Operations::class,
'arguments' => ['$dbi' => '@dbi', '$relation' => '@relation'],
'arguments' => ['$dbi' => '@dbi', '$relation' => '@relation', '$tableMover' => '@table_mover'],
],
'partitioning_maintenance' => [
'class' => Maintenance::class,
@ -226,5 +227,6 @@ return [
PhpMyAdmin\ResponseRenderer::class => 'response',
'bookmarkRepository' => ['class' => BookmarkRepository::class, 'arguments' => ['@dbi', '@relation']],
'console' => ['class' => Console::class, 'arguments' => [ '@relation', '@template', '@bookmarkRepository']],
'table_mover' => ['class' => TableMover::class, 'arguments' => ['@dbi', '@relation']],
],
];

6
app/services_controllers.php
View File

@ -263,11 +263,15 @@ return [
'$operations' => '@operations',
'$structureController' => '@' . Database\StructureController::class,
'$userPrivilegesFactory' => '@' . UserPrivilegesFactory::class,
'$tableMover' => '@table_mover',
],
],
Database\Structure\CopyTableWithPrefixController::class => [
'class' => Database\Structure\CopyTableWithPrefixController::class,
'arguments' => ['$structureController' => '@' . Database\StructureController::class],
'arguments' => [
'$structureController' => '@' . Database\StructureController::class,
'$tableMover' => '@table_mover',
],
],
Database\Structure\DropFormController::class => [
'class' => Database\Structure\DropFormController::class,

14
phpstan-baseline.neon
View File

@ -14245,18 +14245,23 @@ parameters:
count: 2
path: src/Table/TableMover.php
-
message: "#^Parameter \\#1 \\$constraintsSql of method PhpMyAdmin\\\\Table\\\\TableMover\\:\\:getConstraintsSqlWithoutNames\\(\\) expects string, mixed given\\.$#"
count: 1
path: src/Table/TableMover.php
-
message: "#^Parameter \\#1 \\$query of method PhpMyAdmin\\\\DatabaseInterface\\:\\:query\\(\\) expects string, mixed given\\.$#"
count: 1
path: src/Table/TableMover.php
-
message: "#^Parameter \\#1 \\$sql of static method PhpMyAdmin\\\\Table\\\\TableMover\\:\\:createIndexes\\(\\) expects string, mixed given\\.$#"
message: "#^Parameter \\#1 \\$sql of method PhpMyAdmin\\\\Table\\\\TableMover\\:\\:createIndexes\\(\\) expects string, mixed given\\.$#"
count: 1
path: src/Table/TableMover.php
-
message: "#^Parameter \\#1 \\$sql of static method PhpMyAdmin\\\\Table\\\\TableMover\\:\\:executeAlterAutoIncrement\\(\\) expects string, mixed given\\.$#"
message: "#^Parameter \\#1 \\$sql of method PhpMyAdmin\\\\Table\\\\TableMover\\:\\:executeAlterAutoIncrement\\(\\) expects string, mixed given\\.$#"
count: 1
path: src/Table/TableMover.php
@ -14265,11 +14270,6 @@ parameters:
count: 6
path: src/Table/TableMover.php
-
message: "#^Parameter \\#2 \\$constraintsSql of static method PhpMyAdmin\\\\Table\\\\TableMover\\:\\:getConstraintsSqlWithoutNames\\(\\) expects string, mixed given\\.$#"
count: 1
path: src/Table/TableMover.php
-
message: "#^Call to function in_array\\(\\) requires parameter \\#3 to be set\\.$#"
count: 1

4
psalm-baseline.xml
View File

@ -11419,10 +11419,6 @@
</UnsupportedPropertyReferenceUsage>
</file>
<file src="src/Table/TableMover.php">
<DeprecatedMethod>
<code><![CDATA[DatabaseInterface::getInstance()]]></code>
<code><![CDATA[DatabaseInterface::getInstance()]]></code>
</DeprecatedMethod>
<DocblockTypeContradiction>
<code><![CDATA[empty($parser->statements[0])]]></code>
</DocblockTypeContradiction>

3
src/Controllers/Database/Structure/CopyTableController.php
View File

@ -22,6 +22,7 @@ final class CopyTableController implements InvocableController
private readonly Operations $operations,
private readonly StructureController $structureController,
private readonly UserPrivilegesFactory $userPrivilegesFactory,
private readonly TableMover $tableMover,
) {
}
@ -35,7 +36,7 @@ final class CopyTableController implements InvocableController
$userPrivileges = $this->userPrivilegesFactory->getPrivileges();
foreach ($selected as $selectedValue) {
TableMover::moveCopy(
$this->tableMover->moveCopy(
Current::$database,
$selectedValue,
$targetDb,

8
src/Controllers/Database/Structure/CopyTableWithPrefixController.php
View File

@ -19,8 +19,10 @@ use function mb_substr;
final class CopyTableWithPrefixController implements InvocableController
{
public function __construct(private readonly StructureController $structureController)
{
public function __construct(
private readonly StructureController $structureController,
private readonly TableMover $tableMover,
) {
}
public function __invoke(ServerRequest $request): Response|null
@ -35,7 +37,7 @@ final class CopyTableWithPrefixController implements InvocableController
foreach ($selected as $selectedValue) {
$newTableName = $toPrefix . mb_substr($selectedValue, mb_strlen((string) $fromPrefix));
TableMover::moveCopy(
$this->tableMover->moveCopy(
Current::$database,
$selectedValue,
Current::$database,

15
src/Operations.php
View File

@ -34,8 +34,11 @@ use function urldecode;
*/
class Operations
{
public function __construct(private DatabaseInterface $dbi, private Relation $relation)
{
public function __construct(
private readonly DatabaseInterface $dbi,
private readonly Relation $relation,
private readonly TableMover $tableMover,
) {
}
/**
@ -197,7 +200,7 @@ class Operations
$moveScope = MoveScope::tryFrom($copyMode) ?? MoveScope::StructureAndData;
if (
! TableMover::moveCopy(
! $this->tableMover->moveCopy(
$db,
$table,
$newDatabaseName->getName(),
@ -271,7 +274,7 @@ class Operations
{
// Add DROP IF EXIST to CREATE VIEW query, to remove stand-in VIEW that was created earlier.
foreach ($views as $view) {
$copyingSucceeded = TableMover::moveCopy(
$copyingSucceeded = $this->tableMover->moveCopy(
$db,
$view,
$newDatabaseName->getName(),
@ -461,7 +464,7 @@ class Operations
$getFields = ['user', 'label', 'query'];
$whereFields = ['dbase' => $db];
$newFields = ['dbase' => $newDatabaseName->getName()];
TableMover::duplicateInfo('bookmarkwork', 'bookmark', $getFields, $whereFields, $newFields);
$this->tableMover->duplicateInfo('bookmarkwork', 'bookmark', $getFields, $whereFields, $newFields);
}
/**
@ -890,7 +893,7 @@ class Operations
}
} else {
$move = isset($_POST['submit_move']);
TableMover::moveCopy(
$this->tableMover->moveCopy(
$db,
$table,
$targetDb,

138
src/Table/TableMover.php
View File

@ -27,15 +27,11 @@ use function sprintf;
class TableMover
{
/**
* Copies or renames table
*
* @param string $sourceDb source database
* @param string $sourceTable source table
* @param string $targetDb target database
* @param string $targetTable target table
*/
public static function moveCopy(
public function __construct(private readonly DatabaseInterface $dbi, private readonly Relation $relation)
{
}
public function moveCopy(
string $sourceDb,
string $sourceTable,
string $targetDb,
@ -45,12 +41,10 @@ class TableMover
bool $addDropIfExists,
): bool {
$GLOBALS['errorUrl'] ??= null;
$dbi = DatabaseInterface::getInstance();
$relation = new Relation($dbi);
// Try moving the tables directly, using native `RENAME` statement.
if ($what === MoveScope::Move) {
$tbl = new Table($sourceTable, $sourceDb, $dbi);
$tbl = new Table($sourceTable, $sourceDb, $this->dbi);
if ($tbl->rename($targetTable, $targetDb)) {
$GLOBALS['message'] = $tbl->getLastMessage();
@ -58,7 +52,7 @@ class TableMover
}
}
$missingDatabaseMessage = self::checkWhetherDatabasesExist($dbi, $sourceDb, $targetDb);
$missingDatabaseMessage = $this->checkWhetherDatabasesExist($sourceDb, $targetDb);
if ($missingDatabaseMessage !== null) {
$GLOBALS['message'] = $missingDatabaseMessage;
@ -70,7 +64,7 @@ class TableMover
// Selecting the database could avoid some problems with replicated
// databases, when moving table from replicated one to not replicated one.
$dbi->selectDb($targetDb);
$this->dbi->selectDb($targetDb);
/**
* The full name of source table, quoted.
@ -102,7 +96,7 @@ class TableMover
$GLOBALS['sql_auto_increment'] = $_POST['sql_auto_increment'];
}
$isView = (new Table($sourceTable, $sourceDb, $dbi))->isView();
$isView = (new Table($sourceTable, $sourceDb, $this->dbi))->isView();
/**
* The old structure of the table.
*/
@ -121,14 +115,14 @@ class TableMover
// Find server's SQL mode so the builder can generate correct
// queries.
// One of the options that alters the behaviour is `ANSI_QUOTES`.
Context::setMode((string) $dbi->fetchValue('SELECT @@sql_mode'));
Context::setMode((string) $this->dbi->fetchValue('SELECT @@sql_mode'));
// -----------------------------------------------------------------
// Phase 1: Dropping existent element of the same name (if exists
// and required).
if ($addDropIfExists) {
self::executeDropIfExists($targetTable, $targetDb, $dbi, $destination);
$this->executeDropIfExists($targetTable, $targetDb, $destination);
// If an existing table gets deleted, maintain any entries for
// the PMA_* tables.
@ -138,14 +132,14 @@ class TableMover
// -----------------------------------------------------------------
// Phase 2: Generating the new query of this structure.
self::createNewStructure($sqlStructure, $destination, $what, $dbi, $targetDb);
$this->createNewStructure($sqlStructure, $destination, $what, $targetDb);
// -----------------------------------------------------------------
// Phase 3: Adding constraints.
// All constraint names are removed because they must be unique.
if ($what === MoveScope::Move && ! empty($GLOBALS['sql_constraints_query'])) {
$GLOBALS['sql_constraints_query'] = self::getConstraintsSqlWithoutNames(
$GLOBALS['sql_constraints_query'] = $this->getConstraintsSqlWithoutNames(
$GLOBALS['sql_constraints_query'],
$destination,
);
@ -157,7 +151,7 @@ class TableMover
// the constraints can only be created after all tables have been created.
// Thus, we must keep the global so that the caller can execute these queries.
if ($mode === MoveMode::SingleTable) {
$dbi->query($GLOBALS['sql_constraints_query']);
$this->dbi->query($GLOBALS['sql_constraints_query']);
unset($GLOBALS['sql_constraints_query']);
}
}
@ -167,27 +161,27 @@ class TableMover
// View phase 3.
if (! empty($GLOBALS['sql_indexes'])) {
self::createIndexes($GLOBALS['sql_indexes'], $destination, $dbi);
$this->createIndexes($GLOBALS['sql_indexes'], $destination);
}
// -----------------------------------------------------------------
// Phase 5: Adding AUTO_INCREMENT.
if (! empty($GLOBALS['sql_auto_increments'])) {
self::executeAlterAutoIncrement($GLOBALS['sql_auto_increments'], $destination, $dbi);
$this->executeAlterAutoIncrement($GLOBALS['sql_auto_increments'], $destination);
}
} else {
$GLOBALS['sql_query'] = '';
}
$table = new Table($targetTable, $targetDb, $dbi);
$table = new Table($targetTable, $targetDb, $this->dbi);
// Copy the data unless this is a VIEW
if ($what !== MoveScope::StructureOnly && ! $table->isView()) {
$sqlSetMode = "SET SQL_MODE='NO_AUTO_VALUE_ON_ZERO'";
$dbi->query($sqlSetMode);
$this->dbi->query($sqlSetMode);
$GLOBALS['sql_query'] .= "\n\n" . $sqlSetMode . ';';
$oldTable = new Table($sourceTable, $sourceDb, $dbi);
$oldTable = new Table($sourceTable, $sourceDb, $this->dbi);
$nonGeneratedCols = $oldTable->getNonGeneratedColumns();
if ($nonGeneratedCols !== []) {
$sqlInsertData = 'INSERT INTO ' . $target . '('
@ -195,27 +189,27 @@ class TableMover
. ') SELECT ' . implode(', ', $nonGeneratedCols)
. ' FROM ' . $source;
$dbi->query($sqlInsertData);
$this->dbi->query($sqlInsertData);
$GLOBALS['sql_query'] .= "\n\n" . $sqlInsertData . ';';
}
}
$relationParameters = $relation->getRelationParameters();
$relationParameters = $this->relation->getRelationParameters();
// Drops old table if the user has requested to move it
if ($what === MoveScope::Move) {
// This could avoid some problems with replicated databases, when
// moving table from replicated one to not replicated one
$dbi->selectDb($sourceDb);
$this->dbi->selectDb($sourceDb);
$sourceTableObj = new Table($sourceTable, $sourceDb, $dbi);
$sourceTableObj = new Table($sourceTable, $sourceDb, $this->dbi);
$sqlDropQuery = $sourceTableObj->isView() ? 'DROP VIEW' : 'DROP TABLE';
$sqlDropQuery .= ' ' . $source;
$dbi->query($sqlDropQuery);
$this->dbi->query($sqlDropQuery);
// Rename table in configuration storage
$relation->renameTable($sourceDb, $targetDb, $sourceTable, $targetTable);
$this->relation->renameTable($sourceDb, $targetDb, $sourceTable, $targetTable);
$GLOBALS['sql_query'] .= "\n\n" . $sqlDropQuery . ';';
@ -230,7 +224,7 @@ class TableMover
if ($relationParameters->columnCommentsFeature !== null) {
// Get all comments and MIME-Types for current table
$commentsCopyRs = $dbi->queryAsControlUser(
$commentsCopyRs = $this->dbi->queryAsControlUser(
'SELECT column_name, comment'
. ($relationParameters->browserTransformationFeature !== null
? ', mimetype, transformation, transformation_options'
@ -240,9 +234,9 @@ class TableMover
. '.'
. Util::backquote($relationParameters->columnCommentsFeature->columnInfo)
. ' WHERE '
. ' db_name = ' . $dbi->quoteString($sourceDb, ConnectionType::ControlUser)
. ' db_name = ' . $this->dbi->quoteString($sourceDb, ConnectionType::ControlUser)
. ' AND '
. ' table_name = ' . $dbi->quoteString($sourceTable, ConnectionType::ControlUser),
. ' table_name = ' . $this->dbi->quoteString($sourceTable, ConnectionType::ControlUser),
);
// Write every comment as new copied entry. [MIME]
@ -254,19 +248,21 @@ class TableMover
. ($relationParameters->browserTransformationFeature !== null
? ', mimetype, transformation, transformation_options'
: '')
. ') VALUES(' . $dbi->quoteString($targetDb, ConnectionType::ControlUser)
. ',' . $dbi->quoteString($targetTable, ConnectionType::ControlUser) . ','
. $dbi->quoteString($commentsCopyRow['column_name'], ConnectionType::ControlUser)
. ') VALUES(' . $this->dbi->quoteString($targetDb, ConnectionType::ControlUser)
. ',' . $this->dbi->quoteString($targetTable, ConnectionType::ControlUser) . ','
. $this->dbi->quoteString($commentsCopyRow['column_name'], ConnectionType::ControlUser)
. ','
. $dbi->quoteString($commentsCopyRow['comment'], ConnectionType::ControlUser)
. $this->dbi->quoteString($commentsCopyRow['comment'], ConnectionType::ControlUser)
. ($relationParameters->browserTransformationFeature !== null
? ',' . $dbi->quoteString($commentsCopyRow['mimetype'], ConnectionType::ControlUser)
. ',' . $dbi->quoteString($commentsCopyRow['transformation'], ConnectionType::ControlUser)
. ','
. $dbi->quoteString($commentsCopyRow['transformation_options'], ConnectionType::ControlUser)
? ',' . $this->dbi->quoteString($commentsCopyRow['mimetype'], ConnectionType::ControlUser)
. ',' . $this->dbi->quoteString($commentsCopyRow['transformation'], ConnectionType::ControlUser)
. ',' . $this->dbi->quoteString(
$commentsCopyRow['transformation_options'],
ConnectionType::ControlUser,
)
: '')
. ')';
$dbi->queryAsControlUser($newCommentQuery);
$this->dbi->queryAsControlUser($newCommentQuery);
}
unset($commentsCopyRs);
@ -278,18 +274,18 @@ class TableMover
$getFields = ['display_field'];
$whereFields = ['db_name' => $sourceDb, 'table_name' => $sourceTable];
$newFields = ['db_name' => $targetDb, 'table_name' => $targetTable];
self::duplicateInfo('displaywork', 'table_info', $getFields, $whereFields, $newFields);
$this->duplicateInfo('displaywork', 'table_info', $getFields, $whereFields, $newFields);
/** @todo revise this code when we support cross-db relations */
$getFields = ['master_field', 'foreign_table', 'foreign_field'];
$whereFields = ['master_db' => $sourceDb, 'master_table' => $sourceTable];
$newFields = ['master_db' => $targetDb, 'foreign_db' => $targetDb, 'master_table' => $targetTable];
self::duplicateInfo('relwork', 'relation', $getFields, $whereFields, $newFields);
$this->duplicateInfo('relwork', 'relation', $getFields, $whereFields, $newFields);
$getFields = ['foreign_field', 'master_table', 'master_field'];
$whereFields = ['foreign_db' => $sourceDb, 'foreign_table' => $sourceTable];
$newFields = ['master_db' => $targetDb, 'foreign_db' => $targetDb, 'foreign_table' => $targetTable];
self::duplicateInfo('relwork', 'relation', $getFields, $whereFields, $newFields);
$this->duplicateInfo('relwork', 'relation', $getFields, $whereFields, $newFields);
return true;
}
@ -305,16 +301,14 @@ class TableMover
* @param mixed[] $newFields Which fields will be used as new VALUES. These are the important keys which differ
* from the old entry (array('FIELDNAME' => 'NEW FIELDVALUE'))
*/
public static function duplicateInfo(
public function duplicateInfo(
string $work,
string $table,
array $getFields,
array $whereFields,
array $newFields,
): int|bool {
$dbi = DatabaseInterface::getInstance();
$relation = new Relation($dbi);
$relationParameters = $relation->getRelationParameters();
$relationParameters = $this->relation->getRelationParameters();
$relationParams = $relationParameters->toArray();
$lastId = -1;
@ -332,14 +326,14 @@ class TableMover
$whereParts = [];
foreach ($whereFields as $where => $value) {
$whereParts[] = Util::backquote((string) $where) . ' = '
. $dbi->quoteString((string) $value, ConnectionType::ControlUser);
. $this->dbi->quoteString((string) $value, ConnectionType::ControlUser);
}
$newParts = [];
$newValueParts = [];
foreach ($newFields as $where => $value) {
$newParts[] = Util::backquote((string) $where);
$newValueParts[] = $dbi->quoteString((string) $value, ConnectionType::ControlUser);
$newValueParts[] = $this->dbi->quoteString((string) $value, ConnectionType::ControlUser);
}
$tableCopyQuery = '
@ -350,7 +344,7 @@ class TableMover
// must use DatabaseInterface::QUERY_BUFFERED here, since we execute
// another query inside the loop
$tableCopyRs = $dbi->queryAsControlUser($tableCopyQuery);
$tableCopyRs = $this->dbi->queryAsControlUser($tableCopyQuery);
foreach ($tableCopyRs as $tableCopyRow) {
$valueParts = [];
@ -359,7 +353,7 @@ class TableMover
continue;
}
$valueParts[] = $dbi->quoteString($val, ConnectionType::ControlUser);
$valueParts[] = $this->dbi->quoteString($val, ConnectionType::ControlUser);
}
$newTableQuery = 'INSERT IGNORE INTO '
@ -370,14 +364,14 @@ class TableMover
. implode(', ', $valueParts) . ', '
. implode(', ', $newValueParts) . ')';
$dbi->queryAsControlUser($newTableQuery);
$lastId = $dbi->insertId();
$this->dbi->queryAsControlUser($newTableQuery);
$lastId = $this->dbi->insertId();
}
return $lastId;
}
private static function getConstraintsSqlWithoutNames(string $constraintsSql, Expression $destination): string
private function getConstraintsSqlWithoutNames(string $constraintsSql, Expression $destination): string
{
$parser = new Parser($constraintsSql);
@ -405,12 +399,9 @@ class TableMover
return $statement->build() . ';';
}
private static function checkWhetherDatabasesExist(
DatabaseInterface $dbi,
string $sourceDb,
string $targetDb,
): Message|null {
$databaseList = $dbi->getDatabaseList();
private function checkWhetherDatabasesExist(string $sourceDb, string $targetDb): Message|null
{
$databaseList = $this->dbi->getDatabaseList();
if (! $databaseList->exists($sourceDb)) {
return Message::rawError(
@ -433,11 +424,10 @@ class TableMover
return null;
}
private static function createNewStructure(
private function createNewStructure(
string $sqlStructure,
Expression $destination,
MoveScope $what,
DatabaseInterface $dbi,
string $targetDb,
): void {
$parser = new Parser($sqlStructure);
@ -457,18 +447,18 @@ class TableMover
// This is to avoid some issues when renaming databases with views
// See: https://github.com/phpmyadmin/phpmyadmin/issues/16422
if ($what === MoveScope::Move) {
$dbi->selectDb($targetDb);
$this->dbi->selectDb($targetDb);
}
$dbi->query($sqlStructure);
$this->dbi->query($sqlStructure);
$GLOBALS['sql_query'] .= "\n" . $sqlStructure;
}
private static function executeDropIfExists(string $targetTable, string $targetDb, DatabaseInterface $dbi, Expression $destination): void
private function executeDropIfExists(string $targetTable, string $targetDb, Expression $destination): void
{
$statement = new DropStatement();
$tbl = new Table($targetTable, $targetDb, $dbi);
$tbl = new Table($targetTable, $targetDb, $this->dbi);
$statement->options = new OptionsArray(
[$tbl->isView() ? 'VIEW' : 'TABLE', 'IF EXISTS'],
@ -478,11 +468,11 @@ class TableMover
$dropQuery = $statement->build() . ';';
$dbi->query($dropQuery);
$this->dbi->query($dropQuery);
$GLOBALS['sql_query'] .= "\n" . $dropQuery;
}
private static function createIndexes(string $sql, Expression $destination, DatabaseInterface $dbi): void
private function createIndexes(string $sql, Expression $destination): void
{
$parser = new Parser($sql);
@ -508,7 +498,7 @@ class TableMover
$sqlIndex = $statement->build() . ';';
$dbi->query($sqlIndex);
$this->dbi->query($sqlIndex);
$sqlIndexes .= $sqlIndex;
}
@ -516,7 +506,7 @@ class TableMover
$GLOBALS['sql_query'] .= "\n" . $sqlIndexes;
}
private static function executeAlterAutoIncrement(string $sql, Expression $destination, DatabaseInterface $dbi): void
private function executeAlterAutoIncrement(string $sql, Expression $destination): void
{
$parser = new Parser($sql);
@ -533,7 +523,7 @@ class TableMover
$query = $statement->build() . ';';
$dbi->query($query);
$this->dbi->query($query);
$GLOBALS['sql_query'] .= "\n" . $query;
}
}

3
tests/unit/Controllers/Operations/TableControllerTest.php
View File

@ -14,6 +14,7 @@ use PhpMyAdmin\DbTableExists;
use PhpMyAdmin\Http\Factory\ServerRequestFactory;
use PhpMyAdmin\Operations;
use PhpMyAdmin\StorageEngine;
use PhpMyAdmin\Table\TableMover;
use PhpMyAdmin\Template;
use PhpMyAdmin\Tests\AbstractTestCase;
use PhpMyAdmin\Tests\Stubs\DbiDummy;
@ -124,7 +125,7 @@ class TableControllerTest extends AbstractTestCase
$relation = new Relation($this->dbi);
$controller = new TableController(
$responseRenderer,
new Operations($this->dbi, $relation),
new Operations($this->dbi, $relation, new TableMover($this->dbi, $relation)),
new UserPrivilegesFactory($this->dbi),
$relation,
$this->dbi,

4
tests/unit/OperationsTest.php
View File

@ -8,6 +8,7 @@ use PhpMyAdmin\ConfigStorage\Relation;
use PhpMyAdmin\Current;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Operations;
use PhpMyAdmin\Table\TableMover;
use PhpMyAdmin\Tests\Stubs\DbiDummy;
use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\DataProvider;
@ -31,7 +32,8 @@ class OperationsTest extends AbstractTestCase
$this->dbi = $this->createDatabaseInterface($this->dummyDbi);
DatabaseInterface::$instance = $this->dbi;
$this->object = new Operations($this->dbi, new Relation($this->dbi));
$relation = new Relation($this->dbi);
$this->object = new Operations($this->dbi, $relation, new TableMover($this->dbi, $relation));
}
/** @param mixed[] $extraChoice */

19
tests/unit/Table/TableTest.php
View File

@ -901,7 +901,8 @@ class TableTest extends AbstractTestCase
]);
(new ReflectionProperty(Relation::class, 'cache'))->setValue(null, $relationParameters);
$ret = TableMover::duplicateInfo('relwork', 'relation', $getFields, $whereFields, $newFields);
$object = new TableMover($this->mockedDbi, new Relation($this->mockedDbi));
$ret = $object->duplicateInfo('relwork', 'relation', $getFields, $whereFields, $newFields);
self::assertSame(-1, $ret);
}
@ -1322,7 +1323,9 @@ class TableTest extends AbstractTestCase
$this->mockedDbi->expects(self::any())->method('getTable')
->willReturnMap($getTableMap);
$return = TableMover::moveCopy(
$object = new TableMover($this->mockedDbi, new Relation($this->mockedDbi));
$return = $object->moveCopy(
$sourceDb,
$sourceTable,
$targetDb,
@ -1341,7 +1344,7 @@ class TableTest extends AbstractTestCase
$sqlQuery = 'DROP VIEW `PMA`.`PMA_BookMark`';
self::assertStringContainsString($sqlQuery, $GLOBALS['sql_query']);
$return = TableMover::moveCopy(
$return = $object->moveCopy(
$sourceDb,
$sourceTable,
$targetDb,
@ -1391,15 +1394,7 @@ class TableTest extends AbstractTestCase
]);
$GLOBALS['sql_query'] = '';
$return = TableMover::moveCopy(
'aa',
'ad',
'bb',
'ad',
MoveScope::Move,
MoveMode::WholeDatabase,
true,
);
$return = $object->moveCopy('aa', 'ad', 'bb', 'ad', MoveScope::Move, MoveMode::WholeDatabase, true);
self::assertTrue($return);
self::assertStringContainsString('DROP TABLE IF EXISTS `bb`.`ad`;', $GLOBALS['sql_query']);
self::assertStringContainsString(