open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #22573 from owncloud/issue-22568-allow-string-object-ids

Browse Source 
Make sure we can store strings as per the interface
remotes/origin/activity-api-v2
Thomas Müller 10 years ago
parent 4124d909b6 24c7f38a00
commit 2ec1c738d0
4 changed files with 43 additions and 44 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      db_structure.xml
  2. 4
      lib/private/systemtag/systemtagobjectmapper.php
  3. 74
      tests/lib/systemtag/systemtagobjectmappertest.php
  4. 2
      version.php

7
db_structure.xml
Unescape View File

@ -1249,11 +1249,10 @@
<!-- object id (ex: file id for files)-->
<field>
<name>objectid</name>
<type>integer</type>
<default>0</default>
<type>text</type>
<default></default>
<notnull>true</notnull>
<unsigned>true</unsigned>
<length>4</length>
<length>64</length>
</field>
<!-- object type (ex: "files")-->

4
lib/private/systemtag/systemtagobjectmapper.php
Unescape View File

@ -103,7 +103,7 @@ class SystemTagObjectMapper implements ISystemTagObjectMapper {
$this->assertTagsExist($tagIds);
$query = $this->connection->getQueryBuilder();
$query->select($query->createFunction('DISTINCT(`objectid`)'))
$query->selectDistinct('objectid')
->from(self::RELATION_TABLE)
->where($query->expr()->in('systemtagid', $query->createNamedParameter($tagIds, IQueryBuilder::PARAM_INT_ARRAY)))
->andWhere($query->expr()->eq('objecttype', $query->createNamedParameter($objectType)));
@ -219,7 +219,7 @@ class SystemTagObjectMapper implements ISystemTagObjectMapper {
->where($query->expr()->in('objectid', $query->createParameter('objectids')))
->andWhere($query->expr()->eq('objecttype', $query->createParameter('objecttype')))
->andWhere($query->expr()->eq('systemtagid', $query->createParameter('tagid')))
->setParameter('objectids', $objIds, IQueryBuilder::PARAM_INT_ARRAY)
->setParameter('objectids', $objIds, IQueryBuilder::PARAM_STR_ARRAY)
->setParameter('tagid', $tagId)
->setParameter('objecttype', $objectType);

74
tests/lib/systemtag/systemtagobjectmappertest.php
Unescape View File

@ -102,10 +102,10 @@ class SystemTagObjectMapperTest extends TestCase {
return $result;
}));
$this->tagMapper->assignTags(1, 'testtype', $this->tag1->getId());
$this->tagMapper->assignTags(1, 'testtype', $this->tag2->getId());
$this->tagMapper->assignTags(2, 'testtype', $this->tag1->getId());
$this->tagMapper->assignTags(3, 'anothertype', $this->tag1->getId());
$this->tagMapper->assignTags('1', 'testtype', $this->tag1->getId());
$this->tagMapper->assignTags('1', 'testtype', $this->tag2->getId());
$this->tagMapper->assignTags('2', 'testtype', $this->tag1->getId());
$this->tagMapper->assignTags('3', 'anothertype', $this->tag1->getId());
}
public function tearDown() {
@ -121,15 +121,15 @@ class SystemTagObjectMapperTest extends TestCase {
public function testGetTagsForObjects() {
$tagIdMapping = $this->tagMapper->getTagIdsForObjects(
[1, 2, 3, 4],
['1', '2', '3', '4'],
'testtype'
);
$this->assertEquals([
1 => [$this->tag1->getId(), $this->tag2->getId()],
2 => [$this->tag1->getId()],
3 => [],
4 => [],
'1' => [$this->tag1->getId(), $this->tag2->getId()],
'2' => [$this->tag1->getId()],
'3' => [],
'4' => [],
], $tagIdMapping);
}
@ -140,8 +140,8 @@ class SystemTagObjectMapperTest extends TestCase {
);
$this->assertEquals([
1,
2,
'1',
'2',
], $objectIds);
}
@ -192,29 +192,29 @@ class SystemTagObjectMapperTest extends TestCase {
}
public function testAssignUnassignTags() {
$this->tagMapper->unassignTags(1, 'testtype', [$this->tag1->getId()]);
$this->tagMapper->unassignTags('1', 'testtype', [$this->tag1->getId()]);
$tagIdMapping = $this->tagMapper->getTagIdsForObjects(1, 'testtype');
$tagIdMapping = $this->tagMapper->getTagIdsForObjects('1', 'testtype');
$this->assertEquals([
1 => [$this->tag2->getId()],
], $tagIdMapping);
$this->tagMapper->assignTags(1, 'testtype', [$this->tag1->getId()]);
$this->tagMapper->assignTags(1, 'testtype', $this->tag3->getId());
$this->tagMapper->assignTags('1', 'testtype', [$this->tag1->getId()]);
$this->tagMapper->assignTags('1', 'testtype', $this->tag3->getId());
$tagIdMapping = $this->tagMapper->getTagIdsForObjects(1, 'testtype');
$tagIdMapping = $this->tagMapper->getTagIdsForObjects('1', 'testtype');
$this->assertEquals([
1 => [$this->tag1->getId(), $this->tag2->getId(), $this->tag3->getId()],
'1' => [$this->tag1->getId(), $this->tag2->getId(), $this->tag3->getId()],
], $tagIdMapping);
}
public function testReAssignUnassignTags() {
// reassign tag1
$this->tagMapper->assignTags(1, 'testtype', [$this->tag1->getId()]);
$this->tagMapper->assignTags('1', 'testtype', [$this->tag1->getId()]);
// tag 3 was never assigned
$this->tagMapper->unassignTags(1, 'testtype', [$this->tag3->getId()]);
$this->tagMapper->unassignTags('1', 'testtype', [$this->tag3->getId()]);
$this->assertTrue(true, 'No error when reassigning/unassigning');
}
@ -223,13 +223,13 @@ class SystemTagObjectMapperTest extends TestCase {
* @expectedException \OCP\SystemTag\TagNotFoundException
*/
public function testAssignNonExistingTags() {
$this->tagMapper->assignTags(1, 'testtype', [100]);
$this->tagMapper->assignTags('1', 'testtype', [100]);
}
public function testAssignNonExistingTagInArray() {
$caught = false;
try {
$this->tagMapper->assignTags(1, 'testtype', [100, $this->tag3->getId()]);
$this->tagMapper->assignTags('1', 'testtype', [100, $this->tag3->getId()]);
} catch (TagNotFoundException $e) {
$caught = true;
}
@ -237,12 +237,12 @@ class SystemTagObjectMapperTest extends TestCase {
$this->assertTrue($caught, 'Exception thrown');
$tagIdMapping = $this->tagMapper->getTagIdsForObjects(
[1],
['1'],
'testtype'
);
$this->assertEquals([
1 => [$this->tag1->getId(), $this->tag2->getId()],
'1' => [$this->tag1->getId(), $this->tag2->getId()],
], $tagIdMapping, 'None of the tags got assigned');
}
@ -250,13 +250,13 @@ class SystemTagObjectMapperTest extends TestCase {
* @expectedException \OCP\SystemTag\TagNotFoundException
*/
public function testUnassignNonExistingTags() {
$this->tagMapper->unassignTags(1, 'testtype', [100]);
$this->tagMapper->unassignTags('1', 'testtype', [100]);
}
public function testUnassignNonExistingTagsInArray() {
$caught = false;
try {
$this->tagMapper->unassignTags(1, 'testtype', [100, $this->tag1->getId()]);
$this->tagMapper->unassignTags('1', 'testtype', [100, $this->tag1->getId()]);
} catch (TagNotFoundException $e) {
$caught = true;
}
@ -269,14 +269,14 @@ class SystemTagObjectMapperTest extends TestCase {
);
$this->assertEquals([
1 => [$this->tag1->getId(), $this->tag2->getId()],
'1' => [$this->tag1->getId(), $this->tag2->getId()],
], $tagIdMapping, 'None of the tags got unassigned');
}
public function testHaveTagAllMatches() {
$this->assertTrue(
$this->tagMapper->haveTag(
[1],
['1'],
'testtype',
$this->tag1->getId(),
true
@ -286,7 +286,7 @@ class SystemTagObjectMapperTest extends TestCase {
$this->assertTrue(
$this->tagMapper->haveTag(
[1, 2],
['1', '2'],
'testtype',
$this->tag1->getId(),
true
@ -296,7 +296,7 @@ class SystemTagObjectMapperTest extends TestCase {
$this->assertFalse(
$this->tagMapper->haveTag(
[1, 2],
['1', '2'],
'testtype',
$this->tag2->getId(),
true
@ -306,7 +306,7 @@ class SystemTagObjectMapperTest extends TestCase {
$this->assertFalse(
$this->tagMapper->haveTag(
[2],
['2'],
'testtype',
$this->tag2->getId(),
true
@ -316,7 +316,7 @@ class SystemTagObjectMapperTest extends TestCase {
$this->assertFalse(
$this->tagMapper->haveTag(
[3],
['3'],
'testtype',
$this->tag2->getId(),
true
@ -328,7 +328,7 @@ class SystemTagObjectMapperTest extends TestCase {
public function testHaveTagAtLeastOneMatch() {
$this->assertTrue(
$this->tagMapper->haveTag(
[1],
['1'],
'testtype',
$this->tag1->getId(),
false
@ -338,7 +338,7 @@ class SystemTagObjectMapperTest extends TestCase {
$this->assertTrue(
$this->tagMapper->haveTag(
[1, 2],
['1', '2'],
'testtype',
$this->tag1->getId(),
false
@ -348,7 +348,7 @@ class SystemTagObjectMapperTest extends TestCase {
$this->assertTrue(
$this->tagMapper->haveTag(
[1, 2],
['1', '2'],
'testtype',
$this->tag2->getId(),
false
@ -358,7 +358,7 @@ class SystemTagObjectMapperTest extends TestCase {
$this->assertFalse(
$this->tagMapper->haveTag(
[2],
['2'],
'testtype',
$this->tag2->getId(),
false
@ -368,7 +368,7 @@ class SystemTagObjectMapperTest extends TestCase {
$this->assertFalse(
$this->tagMapper->haveTag(
[3],
['3'],
'testtype',
$this->tag2->getId(),
false
@ -382,7 +382,7 @@ class SystemTagObjectMapperTest extends TestCase {
*/
public function testHaveTagNonExisting() {
$this->tagMapper->haveTag(
[1],
['1'],
'testtype',
100
);

2
version.php
Unescape View File

@ -25,7 +25,7 @@
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
$OC_Version = array(9, 0, 0, 12);
$OC_Version = array(9, 0, 0, 13);
// The human readable string
$OC_VersionString = '9.0.0 beta 2';

Write Preview
Loading…
Cancel
Save