nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2024-09-20 06:46:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'issue-581-fix-postgres-sharing'

Browse source 
Signed-off-by: binsky <timo@binsky.org>
This commit is contained in:
binsky 2023-06-25 18:03:28 +02:00
parent b4f6ec07ed 3cfb3bdf10
commit 04c2d277d6
No known key found for this signature in database
GPG key ID: B438F7FA2E3AC98F
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Db/ShareRequestMapper.php
View file

@ -74,15 +74,14 @@ class ShareRequestMapper extends QBMapper {
* @return Entity[] * @return Entity[]
* @throws Exception * @throws Exception
*/ */
public function getRequestsByItemGuidGroupedByUser(string $item_guid) { public function getRequestsByItemGuid(string $item_guid) {
if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql') { if (strtolower($this->db->getDatabasePlatform()->getName()) === 'mysql') {
$this->db->executeQuery("SET sql_mode = '';"); $this->db->executeQuery("SET sql_mode = '';");
} }
$qb = $this->db->getQueryBuilder(); $qb = $this->db->getQueryBuilder();
$qb->select('*') $qb->select('*')
->from(self::TABLE_NAME) ->from(self::TABLE_NAME)
->where($qb->expr()->eq('item_guid', $qb->createNamedParameter($item_guid, IQueryBuilder::PARAM_STR))) ->where($qb->expr()->eq('item_guid', $qb->createNamedParameter($item_guid, IQueryBuilder::PARAM_STR)));
->groupBy('target_user_id');
return $this->findEntities($qb); return $this->findEntities($qb);
} }

2
lib/Service/ShareService.php
View file

@ -290,7 +290,7 @@ class ShareService {
* @throws Exception * @throws Exception
*/ */
public function getCredentialPendingAclList(string $item_guid) { public function getCredentialPendingAclList(string $item_guid) {
return $this->shareRequest->getRequestsByItemGuidGroupedByUser($item_guid); return $this->shareRequest->getRequestsByItemGuid($item_guid);
} }
/** /**

4
tests/unit/lib/Db/ShareRequestMapperTest.php
View file

@ -112,7 +112,7 @@ class ShareRequestMapperTest extends DatabaseHelperTest {
} }
/** /**
* @covers ::getRequestsByItemGuidGroupedByUser * @covers ::getRequestsByItemGuid
*/ */
public function testGetRequestsByItemGuidGroupedByUser() { public function testGetRequestsByItemGuidGroupedByUser() {
$dataset = $this->findInDataset( $dataset = $this->findInDataset(
@ -121,7 +121,7 @@ class ShareRequestMapperTest extends DatabaseHelperTest {
$this->dataset->getRow(0)['item_guid'] $this->dataset->getRow(0)['item_guid']
); );
$result = $this->mapper->getRequestsByItemGuidGroupedByUser($dataset[0]['item_guid']); $result = $this->mapper->getRequestsByItemGuid($dataset[0]['item_guid']);
$this->assertCount(count($dataset), $result); $this->assertCount(count($dataset), $result);