Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

N°7968 - ⚡️ Add faster way to rename column on the same table #676

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions setup/moduleinstaller.class.inc.php
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,17 @@ public static function MoveColumnInDB($sOrigTable, $sOrigColumn, $sDstTable, $sD
return;
}

// Simple rename
if ($sOrigTable === $sDstTable && !$bDstTableFieldExists)
{
$sFieldSpec = CMDBSource::GetFieldSpec($sOrigTable, $sOrigColumn);
$sQueryRename = /** @lang MariaDB */ "ALTER TABLE `{$sOrigTable}` CHANGE `{$sOrigColumn}` `{$sDstColumn}` {$sFieldSpec};";
CMDBSource::Query($sQueryRename);

CMDBSource::CacheReset($sOrigTable);
return;
}

// Create the destination field if necessary
if($bDstTableFieldExists === false){
$sSpec = CMDBSource::GetFieldSpec($sOrigTable, $sOrigColumn);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -240,4 +240,48 @@ public function testMoveColumnInDB_MoveMultipleTable(): void
$this->assertEquals('from table 1', $sFromTable1Data, "Data was not moved as expected");
$this->assertEquals('from table 2', $sFromTable2Data, "Data was not moved as expected");
}

/**
* Test that moving columns from/to the same table works
*
* @covers \ModuleInstallerAPI::MoveColumnInDB
*
* @return void
* @throws \ArchivedObjectException
* @throws \CoreException
* @throws \MySQLException
* @throws \MySQLHasGoneAwayException
* @throws \MySQLQueryHasNoResultException
*/
public function testMoveColumnInDB_SameTable(): void
{
// Info from the original table
$sOrigClass = "Person";
$sOrigAttCode = "first_name";
[$sOrigTable, $sOrigColName] = $this->GetInfoFromTable($sOrigClass, $sOrigAttCode);

// Info for the destination column
$sDstNonExistingColName = "non_existing_column";

// Save value from original table as a reference
$oPerson = MetaModel::GetObject($sOrigClass, 1);
$sOrigValue = $oPerson->Get($sOrigAttCode);

// Try to move data
ModuleInstallerAPI::MoveColumnInDB($sOrigTable, $sOrigColName, $sOrigTable, $sDstNonExistingColName);

// Check if data was actually moved
// - Either way, the column should exist
$sDstValue = CMDBSource::QueryToScalar(
<<<SQL
SELECT `{$sDstNonExistingColName}` FROM `{$sOrigTable}` WHERE `id` = 1
LIMIT 1
SQL
);

// Put data back in the original table
ModuleInstallerAPI::MoveColumnInDB($sOrigTable, $sDstNonExistingColName, $sOrigTable, $sOrigColName);

$this->assertEquals($sOrigValue, $sDstValue, "Data was not moved as expected");
Hipska marked this conversation as resolved.
Show resolved Hide resolved
}
}