瀏覽代碼

Made addGroupBy varadic

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
tags/v14.0.0beta1
Roeland Jago Douma 6 年之前
父節點
當前提交
c6eba3c925
沒有連結到貢獻者的電子郵件帳戶。
共有 2 個檔案被更改,包括 7 行新增5 行删除
  1. 5
    3
      lib/private/DB/QueryBuilder/QueryBuilder.php
  2. 2
    2
      lib/public/DB/QueryBuilder/IQueryBuilder.php

+ 5
- 3
lib/private/DB/QueryBuilder/QueryBuilder.php 查看文件

@@ -835,12 +835,14 @@ class QueryBuilder implements IQueryBuilder {
* ->addGroupBy('u.createdAt')
* </code>
*
* @param mixed $groupBy The grouping expression.
* @param mixed ...$groupBy The grouping expression.
*
* @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
*/
public function addGroupBy($groupBy) {
$groupBys = is_array($groupBy) ? $groupBy : func_get_args();
public function addGroupBy(...$groupBys) {
if (count($groupBys) === 1 && is_array($groupBys[0])) {
$$groupBys = $groupBys[0];
}

call_user_func_array(
[$this->queryBuilder, 'addGroupBy'],

+ 2
- 2
lib/public/DB/QueryBuilder/IQueryBuilder.php 查看文件

@@ -627,12 +627,12 @@ interface IQueryBuilder {
* ->addGroupBy('u.createdAt')
* </code>
*
* @param mixed $groupBy The grouping expression.
* @param mixed ...$groupBy The grouping expression.
*
* @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
* @since 8.2.0
*/
public function addGroupBy($groupBy);
public function addGroupBy(...$groupBy);

/**
* Sets a value for a column in an insert query.

Loading…
取消
儲存