From 1acecaa03133228907961cf15ea4e9451c7a9b2d Mon Sep 17 00:00:00 2001 From: Maxence Lange Date: Mon, 31 May 2021 23:34:24 -0100 Subject: [PATCH] 22.0.0-alpha.6 Signed-off-by: Maxence Lange --- Makefile | 2 +- appinfo/info.xml | 2 +- lib/Db/CoreQueryBuilder.php | 17 +++++++++-------- lib/Db/MemberRequest.php | 8 +++----- lib/Service/ShareWrapperService.php | 1 + 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index e22a93940..92c0cfe16 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ package_name=$(app_name) cert_dir=$(HOME)/.nextcloud/certificates github_account=nextcloud branch=master -version+=22.0.0-alpha.5 +version+=22.0.0-alpha.6 all: appstore diff --git a/appinfo/info.xml b/appinfo/info.xml index 956095aff..c625ed6a2 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -8,7 +8,7 @@ Those groups of users (or "circles") can then be used by any other app for sharing purpose. ]]> - 22.0.0-alpha.5 + 22.0.0-alpha.6 agpl Maxence Lange diff --git a/lib/Db/CoreQueryBuilder.php b/lib/Db/CoreQueryBuilder.php index 00cf78f91..4331fd23a 100644 --- a/lib/Db/CoreQueryBuilder.php +++ b/lib/Db/CoreQueryBuilder.php @@ -48,7 +48,7 @@ /** - * Class CoreRequestBuilder + * Class CoreQueryBuilder * * @package OCA\Circles\Db */ @@ -62,20 +62,21 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder { const CIRCLE = 'circle'; const MEMBER = 'member'; const OWNER = 'owner'; - const FEDERATED_EVENT = 'federatedEvent'; + const FEDERATED_EVENT = 'federatedevent'; const REMOTE = 'remote'; - const BASED_ON = 'basedOn'; + const BASED_ON = 'basedon'; const INITIATOR = 'initiator'; const MEMBERSHIPS = 'memberships'; - const UPSTREAM_MEMBERSHIPS = 'upstreamMemberships'; - const INHERITANCE_FROM = 'inheritanceFrom'; - const INHERITED_BY = 'inheritedBy'; + const UPSTREAM_MEMBERSHIPS = 'upstreammemberships'; + const INHERITANCE_FROM = 'inheritancefrom'; + const INHERITED_BY = 'inheritedby'; const MOUNT = 'mount'; const MOUNTPOINT = 'mountpoint'; const SHARE = 'share'; - const FILE_CACHE = 'fileCache'; + const FILE_CACHE = 'filecache'; const STORAGES = 'storages'; const OPTIONS = 'options'; + const HELPER = 'circleshelper'; public static $SQL_PATH = [ @@ -212,7 +213,7 @@ class CoreQueryBuilder extends NC22ExtendedQueryBuilder { /** - * CoreRequestBuilder constructor. + * CoreQueryBuilder constructor. */ public function __construct() { parent::__construct(); diff --git a/lib/Db/MemberRequest.php b/lib/Db/MemberRequest.php index 4b55ba0a5..70e433e3c 100644 --- a/lib/Db/MemberRequest.php +++ b/lib/Db/MemberRequest.php @@ -249,8 +249,6 @@ public function getInheritedMembers(string $singleId, bool $getData = false): ar $qb->orderBy($aliasMembership . '.inheritance_depth', 'asc') ->addGroupBy($aliasMembership . '.inheritance_depth'); -// $qb->groupBy(CoreQueryBuilder::MEMBER . '.single_id'); - return $this->getItemsFromRequest($qb); } @@ -359,9 +357,9 @@ public function getAlternateSingleId(IFederatedUser $federatedUser) { $expr = $qb->expr(); $orX = $expr->orX( - $qb->exprLimitToDBField('user_id', $federatedUser->getUserId(), false, true), - $qb->exprLimitToDBFieldInt('user_type', $federatedUser->getUserType(), false), - $qb->exprLimitToDBField('instance', $qb->getInstance($federatedUser), false, false) + $qb->exprFilter('user_id', $federatedUser->getUserId()), + $qb->exprFilter('user_type', $federatedUser->getUserType()), + $qb->exprFilter('instance', $qb->getInstance($federatedUser), '', false) ); $qb->andWhere($orX); diff --git a/lib/Service/ShareWrapperService.php b/lib/Service/ShareWrapperService.php index 919644fa3..ad38f85c6 100644 --- a/lib/Service/ShareWrapperService.php +++ b/lib/Service/ShareWrapperService.php @@ -188,6 +188,7 @@ public function getSharedWith( * @param int $offset * @param int $limit * @param bool $getData + * @param bool $completeDetails * * @return ShareWrapper[] * @throws RequestBuilderException