Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/circles.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxence Lange <maxence@artificial-owl.com>2022-10-22 14:29:44 +0300
committerMaxence Lange <maxence@artificial-owl.com>2022-10-22 15:32:12 +0300
commitd6240a63c35b9be05ef097bdcd5c50c4a7b8e824 (patch)
treec659d774e5f93c222fa9da726ead4b62f4e819cf
parent6be7c4df14c781fb3eb81d7e7ea9a9f9b799a609 (diff)
setSqlPath()
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-rw-r--r--lib/Db/CircleRequest.php2
-rw-r--r--lib/Db/CoreQueryBuilder.php19
2 files changed, 9 insertions, 12 deletions
diff --git a/lib/Db/CircleRequest.php b/lib/Db/CircleRequest.php
index afb9f160..0610e5ff 100644
--- a/lib/Db/CircleRequest.php
+++ b/lib/Db/CircleRequest.php
@@ -226,7 +226,7 @@ class CircleRequest extends CircleRequestBuilder {
$dataProbe->add(CoreQueryBuilder::MEMBERSHIPS);
}
- $qb->setAlternateSqlPath(CoreQueryBuilder::CIRCLE, $dataProbe->getPath())
+ $qb->setSqlPath(CoreQueryBuilder::CIRCLE, $dataProbe->getPath())
->setOptions([CoreQueryBuilder::CIRCLE], $circleProbe->getAsOptions());
$qb->leftJoinOwner(CoreQueryBuilder::CIRCLE);
diff --git a/lib/Db/CoreQueryBuilder.php b/lib/Db/CoreQueryBuilder.php
index fffad9d3..a09bba62 100644
--- a/lib/Db/CoreQueryBuilder.php
+++ b/lib/Db/CoreQueryBuilder.php
@@ -234,11 +234,8 @@ class CoreQueryBuilder extends ExtendedQueryBuilder {
/** @var ConfigService */
private $configService;
-
- /** @var array */
- private $options = [];
-
- private array $alternateSqlPath = [];
+ private array $options = [];
+ private array $sqlPath = [];
/**
* CoreQueryBuilder constructor.
@@ -1746,11 +1743,11 @@ class CoreQueryBuilder extends ExtendedQueryBuilder {
* @return array
*/
public function getSqlPath(): array {
- if (empty($this->alternateSqlPath)) {
+ if (empty($this->sqlPath)) {
return self::$SQL_PATH;
}
- return $this->alternateSqlPath;
+ return $this->sqlPath;
}
@@ -1762,12 +1759,12 @@ class CoreQueryBuilder extends ExtendedQueryBuilder {
*
* @return $this
*/
- public function setAlternateSqlPath(string $key, array $path = []): self {
- if (empty($this->alternateSqlPath)) {
- $this->alternateSqlPath = self::$SQL_PATH;
+ public function setSqlPath(string $key, array $path = []): self {
+ if (empty($this->sqlPath)) {
+ $this->sqlPath = self::$SQL_PATH;
}
- $this->alternateSqlPath[$key] = $path;
+ $this->sqlPath[$key] = $path;
return $this;
}