Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

enable multiple table/fields comparaison when using queryHelper #1089

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

enable multiple table/fields comparaison when using queryHelper #1089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions lib/CirclesQueryHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,25 +86,23 @@ public function getQueryBuilder(): IQueryBuilder {


/**
* @param string $alias
* @param string $field
* @param array $fields
* @param bool $fullDetails
*
* @return ICompositeExpression
* @throws RequestBuilderException
* @throws FederatedUserNotFoundException
* @throws RequestBuilderException
*/
public function limitToSession(
string $alias,
string $field,
array $fields,
bool $fullDetails = false
): ICompositeExpression {
$session = $this->federatedUserService->getCurrentUser();
if (is_null($session)) {
throw new FederatedUserNotFoundException('session not initiated');
}

$this->queryBuilder->setDefaultSelectAlias($alias);
// $this->queryBuilder->setDefaultSelectAlias($alias);
$this->queryBuilder->setOptions(
[CoreQueryBuilder::HELPER],
[
Expand All @@ -116,8 +114,8 @@ public function limitToSession(
return $this->queryBuilder->limitToInitiator(
CoreQueryBuilder::HELPER,
$session,
$field,
$alias
'',
$fields
);
}

Expand All @@ -127,17 +125,18 @@ public function limitToSession(
* @param string $field
* @param IFederatedUser $federatedUser
* @param bool $fullDetails
* @param array $extraFields
*
* @return ICompositeExpression
* @throws RequestBuilderException
*/
public function limitToInheritedMembers(
string $alias,
string $field,
string $alias,
IFederatedUser $federatedUser,
bool $fullDetails = false
bool $fullDetails = false,
array $extraFields = []
): ICompositeExpression {
$this->queryBuilder->setDefaultSelectAlias($alias);
$this->queryBuilder->setOptions(
[CoreQueryBuilder::HELPER],
[
Expand All @@ -150,7 +149,8 @@ public function limitToInheritedMembers(
CoreQueryBuilder::HELPER,
$federatedUser,
$field,
$alias
$alias,
$extraFields
);
}

Expand Down
102 changes: 65 additions & 37 deletions lib/Db/CoreQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,29 +56,33 @@ class CoreQueryBuilder extends ExtendedQueryBuilder {
use TArrayTools;


public const SINGLE = 'cs';
public const CIRCLE = 'cc';
public const MEMBER = 'mm';
public const OWNER = 'wn';
public const FEDERATED_EVENT = 'ev';
public const REMOTE = 'rm';
public const BASED_ON = 'on';
public const INITIATOR = 'in';
public const DIRECT_INITIATOR = 'di';
public const MEMBERSHIPS = 'ms';
public const CONFIG = 'cf';
public const UPSTREAM_MEMBERSHIPS = 'up';
public const INHERITANCE_FROM = 'ih';
public const INHERITED_BY = 'by';
public const INVITED_BY = 'nv';
public const MOUNT = 'mo';
public const MOUNTPOINT = 'mp';
public const SHARE = 'sh';
public const FILE_CACHE = 'fc';
public const STORAGES = 'st';
public const TOKEN = 'tk';
public const OPTIONS = 'pt';
public const HELPER = 'hp';
public const SINGLE = 'ca';
public const CIRCLE = 'cb';
public const MEMBER = 'cc';
public const OWNER = 'cd';
public const FEDERATED_EVENT = 'ce';
public const REMOTE = 'cf';
public const BASED_ON = 'cg';
public const INITIATOR = 'ch';
public const DIRECT_INITIATOR = 'ci';
public const MEMBERSHIPS = 'cj';
public const CONFIG = 'ck';
public const UPSTREAM_MEMBERSHIPS = 'cl';
public const INHERITANCE_FROM = 'cm';
public const INHERITED_BY = 'cn';
public const INVITED_BY = 'co';
public const MOUNT = 'cp';
public const MOUNTPOINT = 'cq';
public const SHARE = 'cr';
public const FILE_CACHE = 'cs';
public const STORAGES = 'ct';
public const TOKEN = 'cu';
public const OPTIONS = 'cv';
public const HELPER = 'cw';
public const SYNC_ITEM = 'cx';
public const SYNC_SHARE = 'cy';
public const SYNC_LOCK = 'cz';
public const DEBUG = 'c0';


public static $SQL_PATH = [
Expand Down Expand Up @@ -1106,7 +1110,8 @@ public function leftJoinShareToken(string $alias, string $field = ''): void {
* @param string $alias
* @param IFederatedUser $user
* @param string $field
* @param string $helperAlias
* @param string $helperAlias - must only be filled when called from CirclesQueryHelper
* @param array $helperMoreFields - must only be filled when called from CirclesQueryHelper
*
* @return ICompositeExpression
* @throws RequestBuilderException
Expand All @@ -1115,9 +1120,10 @@ public function limitToInitiator(
string $alias,
IFederatedUser $user,
string $field = '',
string $helperAlias = ''
string $helperAlias = '',
array $helperMoreFields = []
): ICompositeExpression {
$this->leftJoinInitiator($alias, $user, $field, $helperAlias);
$this->leftJoinInitiator($alias, $user, $field, $helperAlias, $helperMoreFields);
$where = $this->limitInitiatorVisibility($alias);

$aliasInitiator = $this->generateAlias($alias, self::INITIATOR, $options);
Expand Down Expand Up @@ -1156,42 +1162,56 @@ public function leftJoinCircleConfig(string $alias): void {
*
* @param string $alias
* @param IFederatedUser $initiator
* @param string $field
* @param string $helperAlias
* @param string $coreField
* @param string $helperAlias - must only be filled when called from CirclesQueryHelper
* @param array $helperMoreFields - must only be filled when called from CirclesQueryHelper
*
* @throws RequestBuilderException
*/
public function leftJoinInitiator(
string $alias,
IFederatedUser $initiator,
string $field = '',
string $helperAlias = ''
string $helperAlias = '',
array $helperMoreFields = []
): void {
if ($this->getType() !== QueryBuilder::SELECT) {
return;
}

if (!empty($helperMoreFields)) {
$helperMoreFields[] = $helperAlias . '.' . $field;
}

$expr = $this->expr();
$field = ($field === '') ? 'unique_id' : $field;
$helperAlias = ($helperAlias !== '') ? $helperAlias : $alias;

$aliasMembership = $this->generateAlias($alias, self::MEMBERSHIPS, $options);

$orXMembershipFields = $expr->orX();
foreach ($helperMoreFields as $f) {
$orXMembershipFields->add($expr->eq($aliasMembership . '.circle_id', $f));
}

$this->leftJoin(
$helperAlias,
CoreRequestBuilder::TABLE_MEMBERSHIP,
$aliasMembership,
$expr->andX(
$this->exprLimit('single_id', $initiator->getSingleId(), $aliasMembership),
$expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field)
(empty($helperMoreFields)) ?
$expr->eq($aliasMembership . '.circle_id', $helperAlias . '.' . $field) :
$orXMembershipFields
)
);


$listMembershipCircleAlias = [$aliasMembership];
if ($this->getBool('initiatorDirectMember', $options, false)) {
try {
$aliasDirectInitiator = $this->generateAlias($alias, self::DIRECT_INITIATOR, $options);
$listMembershipCircleAlias[] = $aliasDirectInitiator;
$aliasDirect = $this->generateAlias($alias, self::DIRECT_INITIATOR, $options);
$listMembershipCircleAlias[] = $aliasDirect;
} catch (RequestBuilderException $e) {
// meaning that this path does not require DIRECT_INITIATOR; can be safely ignored
}
Expand Down Expand Up @@ -1229,15 +1249,23 @@ function (string $alias) use ($orXMembershipCircle, $aliasMembershipCircle) {
// bypass memberships
if ($this->getBool('initiatorDirectMember', $options, false)) {
try {
$aliasDirectInitiator = $this->generateAlias($alias, self::DIRECT_INITIATOR, $options);
$this->generateMemberSelectAlias($aliasDirectInitiator)
$aliasDirect = $this->generateAlias($alias, self::DIRECT_INITIATOR, $options);

$orXDirectFields = $expr->orX();
foreach ($helperMoreFields as $f) {
$orXDirectFields->add($expr->eq($aliasMembership . '.circle_id', $f));
}

$this->generateMemberSelectAlias($aliasDirect)
->leftJoin(
$helperAlias,
CoreRequestBuilder::TABLE_MEMBER,
$aliasDirectInitiator,
$aliasDirect,
$expr->andX(
$this->exprLimit('single_id', $initiator->getSingleId(), $aliasDirectInitiator),
$expr->eq($aliasDirectInitiator . '.circle_id', $helperAlias . '.' . $field)
$this->exprLimit('single_id', $initiator->getSingleId(), $aliasDirect),
(empty($helperMoreFields)) ?
$expr->eq($aliasDirect . '.circle_id', $helperAlias . '.' . $field) :
$orXDirectFields
)
);
} catch (RequestBuilderException $e) {
Expand Down