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

Merge pull request #23437 from owncloud/save-query-when-the-list-is-empty 

Save the query when we get tags for no objects
This commit is contained in:
Thomas Müller 2016-03-22 17:12:24 +01:00
parent ffe57a55d9 dcca20a48a
commit 6aa28037c7
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/systemtag/systemtagobjectmapper.php
View File

@ -64,6 +64,8 @@ class SystemTagObjectMapper implements ISystemTagObjectMapper {
public function getTagIdsForObjects($objIds, $objectType) { public function getTagIdsForObjects($objIds, $objectType) {
if (!is_array($objIds)) { if (!is_array($objIds)) {
$objIds = [$objIds]; $objIds = [$objIds];
} else if (empty($objIds)) {
return [];
} }
$query = $this->connection->getQueryBuilder(); $query = $this->connection->getQueryBuilder();

11
tests/lib/systemtag/systemtagobjectmappertest.php
View File

@ -119,7 +119,7 @@ class SystemTagObjectMapperTest extends TestCase {
$query->delete(SystemTagManager::TAG_TABLE)->execute(); $query->delete(SystemTagManager::TAG_TABLE)->execute();
} }
public function testGetTagsForObjects() { public function testGetTagIdsForObjects() {
$tagIdMapping = $this->tagMapper->getTagIdsForObjects( $tagIdMapping = $this->tagMapper->getTagIdsForObjects(
['1', '2', '3', '4'], ['1', '2', '3', '4'],
'testtype' 'testtype'
@ -133,6 +133,15 @@ class SystemTagObjectMapperTest extends TestCase {
], $tagIdMapping); ], $tagIdMapping);
} }
public function testGetTagIdsForNoObjects() {
$tagIdMapping = $this->tagMapper->getTagIdsForObjects(
[],
'testtype'
);
$this->assertEquals([], $tagIdMapping);
}
public function testGetObjectsForTags() { public function testGetObjectsForTags() {
$objectIds = $this->tagMapper->getObjectIdsForTags( $objectIds = $this->tagMapper->getObjectIdsForTags(
[$this->tag1->getId(), $this->tag2->getId(), $this->tag3->getId()], [$this->tag1->getId(), $this->tag2->getId(), $this->tag3->getId()],