Merge pull request #22398 from owncloud/fix-card-properties
Queries on the cards table by uri require the addressbook as well
This commit is contained in:
commit
1cb3583a9a
|
@ -178,7 +178,7 @@ class AddressBookImpl implements IAddressBook {
|
|||
protected function createUid() {
|
||||
do {
|
||||
$uid = $this->getUid();
|
||||
$contact = $this->backend->getContact($uid . '.vcf');
|
||||
$contact = $this->backend->getContact($this->getKey(), $uid . '.vcf');
|
||||
} while (!empty($contact));
|
||||
|
||||
return $uid;
|
||||
|
|
|
@ -548,7 +548,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
|
|||
*/
|
||||
function deleteCard($addressBookId, $cardUri) {
|
||||
try {
|
||||
$cardId = $this->getCardId($cardUri);
|
||||
$cardId = $this->getCardId($addressBookId, $cardUri);
|
||||
} catch (\InvalidArgumentException $e) {
|
||||
$cardId = null;
|
||||
}
|
||||
|
@ -807,15 +807,16 @@ class CardDavBackend implements BackendInterface, SyncSupport {
|
|||
/**
|
||||
* return contact with the given URI
|
||||
*
|
||||
* @param int $addressBookId
|
||||
* @param string $uri
|
||||
* @returns array
|
||||
*/
|
||||
public function getContact($uri) {
|
||||
public function getContact($addressBookId, $uri) {
|
||||
$result = [];
|
||||
$query = $this->db->getQueryBuilder();
|
||||
$query->select('*')->from($this->dbCardsTable)
|
||||
->where($query->expr()->eq('uri', $query->createParameter('uri')))
|
||||
->setParameter('uri', $uri);
|
||||
->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
|
||||
->where($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
|
||||
$queryResult = $query->execute();
|
||||
$contact = $queryResult->fetch();
|
||||
$queryResult->closeCursor();
|
||||
|
@ -851,7 +852,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
|
|||
* @param string $vCardSerialized
|
||||
*/
|
||||
protected function updateProperties($addressBookId, $cardUri, $vCardSerialized) {
|
||||
$cardId = $this->getCardId($cardUri);
|
||||
$cardId = $this->getCardId($addressBookId, $cardUri);
|
||||
$vCard = $this->readCard($vCardSerialized);
|
||||
|
||||
$this->purgeProperties($addressBookId, $cardId);
|
||||
|
@ -913,13 +914,15 @@ class CardDavBackend implements BackendInterface, SyncSupport {
|
|||
/**
|
||||
* get ID from a given contact
|
||||
*
|
||||
* @param int $addressBookId
|
||||
* @param string $uri
|
||||
* @return int
|
||||
*/
|
||||
protected function getCardId($uri) {
|
||||
protected function getCardId($addressBookId, $uri) {
|
||||
$query = $this->db->getQueryBuilder();
|
||||
$query->select('id')->from($this->dbCardsTable)
|
||||
->where($query->expr()->eq('uri', $query->createNamedParameter($uri)));
|
||||
->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
|
||||
->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
|
||||
|
||||
$result = $query->execute();
|
||||
$cardIds = $result->fetch();
|
||||
|
|
|
@ -261,7 +261,7 @@ class AddressBookImplTest extends TestCase {
|
|||
// simulate that 'uid0' already exists, so the second uid will be returned
|
||||
$this->backend->expects($this->exactly(2))->method('getContact')
|
||||
->willReturnCallback(
|
||||
function($uid) {
|
||||
function($id, $uid) {
|
||||
return ($uid === 'uid0.vcf');
|
||||
}
|
||||
);
|
||||
|
|
|
@ -44,7 +44,7 @@ class CardDavBackendTest extends TestCase {
|
|||
/** @var CardDavBackend */
|
||||
private $backend;
|
||||
|
||||
/** @var Principal | \PHPUnit_Framework_MockObject_MockObject */
|
||||
/** @var Principal | \PHPUnit_Framework_MockObject_MockObject */
|
||||
private $principal;
|
||||
|
||||
/** @var IDBConnection */
|
||||
|
@ -268,7 +268,7 @@ class CardDavBackendTest extends TestCase {
|
|||
// create a new address book
|
||||
$this->backend->expects($this->once())
|
||||
->method('getCardId')
|
||||
->with($uri)
|
||||
->with($bookId, $uri)
|
||||
->willThrowException(new \InvalidArgumentException());
|
||||
$this->backend->expects($this->exactly(2))
|
||||
->method('addChange')
|
||||
|
@ -445,14 +445,14 @@ class CardDavBackendTest extends TestCase {
|
|||
$id = $query->getLastInsertId();
|
||||
|
||||
$this->assertSame($id,
|
||||
$this->invokePrivate($this->backend, 'getCardId', ['uri']));
|
||||
$this->invokePrivate($this->backend, 'getCardId', [1, 'uri']));
|
||||
}
|
||||
|
||||
/**
|
||||
* @expectedException InvalidArgumentException
|
||||
*/
|
||||
public function testGetCardIdFailed() {
|
||||
$this->invokePrivate($this->backend, 'getCardId', ['uri']);
|
||||
$this->invokePrivate($this->backend, 'getCardId', [1, 'uri']);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -596,7 +596,7 @@ class CardDavBackendTest extends TestCase {
|
|||
$query->execute();
|
||||
}
|
||||
|
||||
$result = $this->backend->getContact('uri0');
|
||||
$result = $this->backend->getContact(0, 'uri0');
|
||||
$this->assertSame(7, count($result));
|
||||
$this->assertSame(0, (int)$result['addressbookid']);
|
||||
$this->assertSame('uri0', $result['uri']);
|
||||
|
@ -606,7 +606,7 @@ class CardDavBackendTest extends TestCase {
|
|||
}
|
||||
|
||||
public function testGetContactFail() {
|
||||
$this->assertEmpty($this->backend->getContact('uri'));
|
||||
$this->assertEmpty($this->backend->getContact(0, 'uri'));
|
||||
}
|
||||
|
||||
public function testCollectCardProperties() {
|
||||
|
|
Loading…
Reference in New Issue