mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mask table and column names with backticks and add lastInsertID() workaround

This commit is contained in:
Joas Schilling 2015-01-15 10:25:54 +01:00
parent 4c233fef2a
commit 6769adcd0d
2 changed files with 113 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/repair/cleantags.php
View File

@ -40,22 +40,37 @@ class CleanTags extends BasicEmitter implements RepairStep {
* Updates the configuration after running an update * Updates the configuration after running an update
*/ */
public function run() { public function run() {
$this->deleteOrphanFileEntries();
$this->deleteOrphanTagEntries();
$this->deleteOrphanCategoryEntries();
}
// Delete tag entries for deleted files /**
* Delete tag entries for deleted files
*/
protected function deleteOrphanFileEntries() {
$this->deleteOrphanEntries( $this->deleteOrphanEntries(
'%d tags for delete files have been removed.', '%d tags for delete files have been removed.',
'*PREFIX*vcategory_to_object', 'objid', '*PREFIX*vcategory_to_object', 'objid',
'*PREFIX*filecache', 'fileid', 'fileid' '*PREFIX*filecache', 'fileid', 'path_hash'
); );
}
// Delete tag entries for deleted tags /**
* Delete tag entries for deleted tags
*/
protected function deleteOrphanTagEntries() {
$this->deleteOrphanEntries( $this->deleteOrphanEntries(
'%d tag entries for deleted tags have been removed.', '%d tag entries for deleted tags have been removed.',
'*PREFIX*vcategory_to_object', 'categoryid', '*PREFIX*vcategory_to_object', 'categoryid',
'*PREFIX*vcategory', 'id', 'uid' '*PREFIX*vcategory', 'id', 'uid'
); );
}
// Delete tags that have no entries /**
* Delete tags that have no entries
*/
protected function deleteOrphanCategoryEntries() {
$this->deleteOrphanEntries( $this->deleteOrphanEntries(
'%d tags with no entries have been removed.', '%d tags with no entries have been removed.',
'*PREFIX*vcategory', 'id', '*PREFIX*vcategory', 'id',
@ -81,14 +96,14 @@ class CleanTags extends BasicEmitter implements RepairStep {
protected function deleteOrphanEntries($repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) { protected function deleteOrphanEntries($repairInfo, $deleteTable, $deleteId, $sourceTable, $sourceId, $sourceNullColumn) {
$qb = $this->connection->createQueryBuilder(); $qb = $this->connection->createQueryBuilder();
$qb->select('d.' . $deleteId) $qb->select('d.`' . $deleteId . '`')
->from($deleteTable, 'd') ->from('`' . $deleteTable . '`', 'd')
->leftJoin('d', $sourceTable, 's', 'd.' . $deleteId . ' = s.' . $sourceId) ->leftJoin('d', '`' . $sourceTable . '`', 's', 'd.`' . $deleteId . '` = s.`' . $sourceId . '`')
->where( ->where(
'd.type = ' . $qb->expr()->literal('files') 'd.`type` = ' . $qb->expr()->literal('files')
) )
->andWhere( ->andWhere(
$qb->expr()->isNull('s.' . $sourceNullColumn) $qb->expr()->isNull('s.`' . $sourceNullColumn . '`')
); );
$result = $qb->execute(); $result = $qb->execute();
@ -100,8 +115,11 @@ class CleanTags extends BasicEmitter implements RepairStep {
if (!empty($orphanItems)) { if (!empty($orphanItems)) {
$orphanItemsBatch = array_chunk($orphanItems, 200); $orphanItemsBatch = array_chunk($orphanItems, 200);
foreach ($orphanItemsBatch as $items) { foreach ($orphanItemsBatch as $items) {
$qb->delete($deleteTable) $qb->delete('`' . $deleteTable . '`')
->where($qb->expr()->in($deleteId, ':ids')); ->where(
'`type` = ' . $qb->expr()->literal('files')
)
->andWhere($qb->expr()->in('`' . $deleteId . '`', ':ids'));
$qb->setParameter('ids', $items, \Doctrine\DBAL\Connection::PARAM_INT_ARRAY); $qb->setParameter('ids', $items, \Doctrine\DBAL\Connection::PARAM_INT_ARRAY);
$qb->execute(); $qb->execute();
} }

127
tests/lib/repair/cleantags.php
View File

@ -16,13 +16,10 @@ namespace Test\Repair;
class CleanTags extends \Test\TestCase { class CleanTags extends \Test\TestCase {
/** @var \OC\RepairStep */ /** @var \OC\RepairStep */
private $repair; protected $repair;
/** @var \Doctrine\DBAL\Connection */ /** @var \Doctrine\DBAL\Connection */
private $connection; protected $connection;
/** @var array */
protected $tagCategories;
/** @var int */ /** @var int */
protected $createdFile; protected $createdFile;
@ -32,42 +29,52 @@ class CleanTags extends \Test\TestCase {
$this->connection = \OC::$server->getDatabaseConnection(); $this->connection = \OC::$server->getDatabaseConnection();
$this->repair = new \OC\Repair\CleanTags($this->connection); $this->repair = new \OC\Repair\CleanTags($this->connection);
$this->cleanUpTables();
} }
protected function tearDown() { protected function tearDown() {
$qb = $this->connection->createQueryBuilder(); $this->cleanUpTables();
$qb->delete('*PREFIX*vcategory')
->where('uid = ' . $qb->createNamedParameter('TestRepairCleanTags'))
->execute();
$qb->delete('*PREFIX*vcategory_to_object')
->where($qb->expr()->in('categoryid', ':ids'));
$qb->setParameter('ids', $this->tagCategories, \Doctrine\DBAL\Connection::PARAM_INT_ARRAY);
$qb->execute();
$qb->delete('*PREFIX*filecache')
->where('fileid = ' . $qb->createNamedParameter($this->createdFile, \PDO::PARAM_INT))
->execute();
parent::tearDown(); parent::tearDown();
} }
protected function cleanUpTables() {
$qb = $this->connection->createQueryBuilder();
$qb->delete('`*PREFIX*vcategory`')
->execute();
$qb->delete('`*PREFIX*vcategory_to_object`')
->execute();
$qb->delete('`*PREFIX*filecache`')
->execute();
}
public function testRun() { public function testRun() {
$cat1 = $this->addTagCategory('TestRepairCleanTags', 'files'); // Retained $cat1 = $this->addTagCategory('TestRepairCleanTags', 'files'); // Retained
$cat2 = $this->addTagCategory('TestRepairCleanTags2', 'files'); // Deleted: Category is empty $cat2 = $this->addTagCategory('TestRepairCleanTags2', 'files'); // Deleted: Category will be empty
$this->addTagCategory('TestRepairCleanTags3', 'files'); // Deleted: Category is empty
$cat3 = $this->addTagCategory('TestRepairCleanTags', 'contacts'); // Retained $cat3 = $this->addTagCategory('TestRepairCleanTags', 'contacts'); // Retained
$file = $this->getFileID();
$this->addTagEntry($file, $cat2, 'files'); // Retained $this->addTagEntry($this->getFileID(), $cat2, 'files'); // Retained
$this->addTagEntry($file + 1, $cat1, 'files'); // Deleted: File is NULL $this->addTagEntry($this->getFileID() + 1, $cat1, 'files'); // Deleted: File is NULL
$this->addTagEntry(9999999, $cat3, 'contacts'); // Retained $this->addTagEntry(9999999, $cat3, 'contacts'); // Retained
$this->addTagEntry($file, $cat3 + 1, 'files'); // Deleted: Category is NULL $this->addTagEntry($this->getFileID(), $cat3 + 1, 'files'); // Deleted: Category is NULL
$this->assertEntryCount('*PREFIX*vcategory', 3, 'Assert tag categories count before repair step');
$this->assertEntryCount('*PREFIX*vcategory_to_object', 4, 'Assert tag entries count before repair step'); $this->assertEntryCount('*PREFIX*vcategory_to_object', 4, 'Assert tag entries count before repair step');
$this->repair->run(); $this->assertEntryCount('*PREFIX*vcategory', 4, 'Assert tag categories count before repair step');
$this->assertEntryCount('*PREFIX*vcategory', 2, 'Assert tag categories count after repair step');
$this->assertEntryCount('*PREFIX*vcategory_to_object', 2, 'Assert tag entries count after repair step'); \Test_Helper::invokePrivate($this->repair, 'deleteOrphanFileEntries');
$this->assertEntryCount('*PREFIX*vcategory_to_object', 3, 'Assert tag entries count after cleaning file entries');
$this->assertEntryCount('*PREFIX*vcategory', 4, 'Assert tag categories count after cleaning file entries');
\Test_Helper::invokePrivate($this->repair, 'deleteOrphanTagEntries');
$this->assertEntryCount('*PREFIX*vcategory_to_object', 2, 'Assert tag entries count after cleaning tag entries');
$this->assertEntryCount('*PREFIX*vcategory', 4, 'Assert tag categories count after cleaning tag entries');
\Test_Helper::invokePrivate($this->repair, 'deleteOrphanCategoryEntries');
$this->assertEntryCount('*PREFIX*vcategory_to_object', 2, 'Assert tag entries count after cleaning category entries');
$this->assertEntryCount('*PREFIX*vcategory', 2, 'Assert tag categories count after cleaning category entries');
} }
/** /**
@ -78,7 +85,7 @@ class CleanTags extends \Test\TestCase {
protected function assertEntryCount($tableName, $expected, $message = '') { protected function assertEntryCount($tableName, $expected, $message = '') {
$qb = $this->connection->createQueryBuilder(); $qb = $this->connection->createQueryBuilder();
$result = $qb->select('COUNT(*)') $result = $qb->select('COUNT(*)')
->from($tableName) ->from('`' . $tableName . '`')
->execute(); ->execute();
$this->assertEquals($expected, $result->fetchColumn(), $message); $this->assertEquals($expected, $result->fetchColumn(), $message);
@ -93,17 +100,15 @@ class CleanTags extends \Test\TestCase {
*/ */
protected function addTagCategory($category, $type) { protected function addTagCategory($category, $type) {
$qb = $this->connection->createQueryBuilder(); $qb = $this->connection->createQueryBuilder();
$qb->insert('*PREFIX*vcategory') $qb->insert('`*PREFIX*vcategory`')
->values([ ->values([
'uid' => $qb->createNamedParameter('TestRepairCleanTags'), '`uid`' => $qb->createNamedParameter('TestRepairCleanTags'),
'category' => $qb->createNamedParameter($category), '`category`' => $qb->createNamedParameter($category),
'type' => $qb->createNamedParameter($type), '`type`' => $qb->createNamedParameter($type),
]) ])
->execute(); ->execute();
$id = (int) $this->connection->lastInsertId(); return (int) $this->getLastInsertID('`*PREFIX*vcategory`', '`id`');
$this->tagCategories[] = $id;
return $id;
} }
/** /**
@ -114,30 +119,66 @@ class CleanTags extends \Test\TestCase {
*/ */
protected function addTagEntry($objectId, $category, $type) { protected function addTagEntry($objectId, $category, $type) {
$qb = $this->connection->createQueryBuilder(); $qb = $this->connection->createQueryBuilder();
$qb->insert('*PREFIX*vcategory_to_object') $qb->insert('`*PREFIX*vcategory_to_object`')
->values([ ->values([
'objid' => $qb->createNamedParameter($objectId, \PDO::PARAM_INT), '`objid`' => $qb->createNamedParameter($objectId, \PDO::PARAM_INT),
'categoryid' => $qb->createNamedParameter($category, \PDO::PARAM_INT), '`categoryid`' => $qb->createNamedParameter($category, \PDO::PARAM_INT),
'type' => $qb->createNamedParameter($type), '`type`' => $qb->createNamedParameter($type),
]) ])
->execute(); ->execute();
} }
/** /**
* Gets the last fileid from the file cache * Gets the last fileid from the file cache
*
* @return int * @return int
*/ */
protected function getFileID() { protected function getFileID() {
if ($this->createdFile) {
return $this->createdFile;
}
$qb = $this->connection->createQueryBuilder(); $qb = $this->connection->createQueryBuilder();
// We create a new file entry and delete it after the test again // We create a new file entry and delete it after the test again
$qb->insert('*PREFIX*filecache') $fileName = $this->getUniqueID('TestRepairCleanTags', 12);
$qb->insert('`*PREFIX*filecache`')
->values([ ->values([
'path' => $qb->createNamedParameter('TestRepairCleanTags'), '`path`' => $qb->createNamedParameter($fileName),
'`path_hash`' => $qb->createNamedParameter(md5($fileName)),
]) ])
->execute(); ->execute();
$this->createdFile = (int) $this->connection->lastInsertId(); $fileName = $this->getUniqueID('TestRepairCleanTags', 12);
$qb->insert('`*PREFIX*filecache`')
->values([
'`path`' => $qb->createNamedParameter($fileName),
'`path_hash`' => $qb->createNamedParameter(md5($fileName)),
])
->execute();
$this->createdFile = (int) $this->getLastInsertID('`*PREFIX*filecache`', '`fileid`');
return $this->createdFile; return $this->createdFile;
} }
/**
* @param $tableName
* @param $idName
* @return int
*/
protected function getLastInsertID($tableName, $idName) {
$id = $this->connection->lastInsertId();
if ($id) {
return $id;
}
// FIXME !!!! ORACLE WORKAROUND DO NOT COPY
// FIXME INSTEAD HELP FIXING DOCTRINE
// FIXME https://github.com/owncloud/core/issues/13303
// FIXME ALSO FIX https://github.com/owncloud/core/commit/2dd85ec984c12d3be401518f22c90d2327bec07a
$qb = $this->connection->createQueryBuilder();
$result = $qb->select("MAX($idName)")
->from($tableName)
->execute();
return (int) $result->fetchColumn();
}
} }