mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25816 from nextcloud/iquerybuilder-join-conditions 

allow non string join conditions in query builder
This commit is contained in:
Joas Schilling 2021-03-03 11:34:56 +01:00 committed by GitHub
parent 74f36173bc 47dd8e54b5
commit 11858a3d66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/DB/QueryBuilder/QueryBuilder.php
View File

@ -48,6 +48,7 @@ use OC\DB\QueryBuilder\FunctionBuilder\SqliteFunctionBuilder;
use OC\DB\ResultAdapter; use OC\DB\ResultAdapter;
use OC\SystemConfig; use OC\SystemConfig;
use OCP\DB\IResult; use OCP\DB\IResult;
use OCP\DB\QueryBuilder\ICompositeExpression;
use OCP\DB\QueryBuilder\ILiteral; use OCP\DB\QueryBuilder\ILiteral;
use OCP\DB\QueryBuilder\IParameter; use OCP\DB\QueryBuilder\IParameter;
use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryBuilder;
@ -664,7 +665,7 @@ class QueryBuilder implements IQueryBuilder {
* @param string $fromAlias The alias that points to a from clause. * @param string $fromAlias The alias that points to a from clause.
* @param string $join The table name to join. * @param string $join The table name to join.
* @param string $alias The alias of the join table. * @param string $alias The alias of the join table.
* @param string $condition The condition for the join. * @param string|ICompositeExpression|null $condition The condition for the join.
* *
* @return $this This QueryBuilder instance. * @return $this This QueryBuilder instance.
*/ */
@ -692,7 +693,7 @@ class QueryBuilder implements IQueryBuilder {
* @param string $fromAlias The alias that points to a from clause. * @param string $fromAlias The alias that points to a from clause.
* @param string $join The table name to join. * @param string $join The table name to join.
* @param string $alias The alias of the join table. * @param string $alias The alias of the join table.
* @param string $condition The condition for the join. * @param string|ICompositeExpression|null $condition The condition for the join.
* *
* @return $this This QueryBuilder instance. * @return $this This QueryBuilder instance.
*/ */
@ -720,7 +721,7 @@ class QueryBuilder implements IQueryBuilder {
* @param string $fromAlias The alias that points to a from clause. * @param string $fromAlias The alias that points to a from clause.
* @param string $join The table name to join. * @param string $join The table name to join.
* @param string $alias The alias of the join table. * @param string $alias The alias of the join table.
* @param string $condition The condition for the join. * @param string|ICompositeExpression|null $condition The condition for the join.
* *
* @return $this This QueryBuilder instance. * @return $this This QueryBuilder instance.
*/ */
@ -748,7 +749,7 @@ class QueryBuilder implements IQueryBuilder {
* @param string $fromAlias The alias that points to a from clause. * @param string $fromAlias The alias that points to a from clause.
* @param string $join The table name to join. * @param string $join The table name to join.
* @param string $alias The alias of the join table. * @param string $alias The alias of the join table.
* @param string $condition The condition for the join. * @param string|ICompositeExpression|null $condition The condition for the join.
* *
* @return $this This QueryBuilder instance. * @return $this This QueryBuilder instance.
*/ */

8
lib/public/DB/QueryBuilder/IQueryBuilder.php
View File

@ -471,7 +471,7 @@ interface IQueryBuilder {
* @param string $fromAlias The alias that points to a from clause. * @param string $fromAlias The alias that points to a from clause.
* @param string $join The table name to join. * @param string $join The table name to join.
* @param string $alias The alias of the join table. * @param string $alias The alias of the join table.
* @param string $condition The condition for the join. * @param string|ICompositeExpression|null $condition The condition for the join.
* *
* @return $this This QueryBuilder instance. * @return $this This QueryBuilder instance.
* @since 8.2.0 * @since 8.2.0
@ -496,7 +496,7 @@ interface IQueryBuilder {
* @param string $fromAlias The alias that points to a from clause. * @param string $fromAlias The alias that points to a from clause.
* @param string $join The table name to join. * @param string $join The table name to join.
* @param string $alias The alias of the join table. * @param string $alias The alias of the join table.
* @param string $condition The condition for the join. * @param string|ICompositeExpression|null $condition The condition for the join.
* *
* @return $this This QueryBuilder instance. * @return $this This QueryBuilder instance.
* @since 8.2.0 * @since 8.2.0
@ -521,7 +521,7 @@ interface IQueryBuilder {
* @param string $fromAlias The alias that points to a from clause. * @param string $fromAlias The alias that points to a from clause.
* @param string $join The table name to join. * @param string $join The table name to join.
* @param string $alias The alias of the join table. * @param string $alias The alias of the join table.
* @param string $condition The condition for the join. * @param string|ICompositeExpression|null $condition The condition for the join.
* *
* @return $this This QueryBuilder instance. * @return $this This QueryBuilder instance.
* @since 8.2.0 * @since 8.2.0
@ -546,7 +546,7 @@ interface IQueryBuilder {
* @param string $fromAlias The alias that points to a from clause. * @param string $fromAlias The alias that points to a from clause.
* @param string $join The table name to join. * @param string $join The table name to join.
* @param string $alias The alias of the join table. * @param string $alias The alias of the join table.
* @param string $condition The condition for the join. * @param string|ICompositeExpression|null $condition The condition for the join.
* *
* @return $this This QueryBuilder instance. * @return $this This QueryBuilder instance.
* @since 8.2.0 * @since 8.2.0