nextcloud / server

lib/public/DB/QueryBuilder/IFunctionBuilder.php

Indentation +30 added lines, -30 removed lines

@@ -27,36 +27,36 @@
  * @since 12.0.0
  */
 interface IFunctionBuilder {
-	/**
-	 * Calculates the MD5 hash of a given input
-	 *
-	 * @param mixed $input The input to be hashed
-	 *
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function md5($input);
+    /**
+     * Calculates the MD5 hash of a given input
+     *
+     * @param mixed $input The input to be hashed
+     *
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function md5($input);
 
-	/**
-	 * Combines two input strings
-	 *
-	 * @param mixed $x The first input string
-	 * @param mixed $y The seccond input string
-	 *
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function concat($x, $y);
+    /**
+     * Combines two input strings
+     *
+     * @param mixed $x The first input string
+     * @param mixed $y The seccond input string
+     *
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function concat($x, $y);
 
-	/**
-	 * Takes a substring from the input string
-	 *
-	 * @param mixed $input The input string
-	 * @param mixed $start The start of the substring, note that counting starts at 1
-	 * @param mixed $length The length of the substring
-	 *
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function substring($input, $start, $length = null);
+    /**
+     * Takes a substring from the input string
+     *
+     * @param mixed $input The input string
+     * @param mixed $start The start of the substring, note that counting starts at 1
+     * @param mixed $length The length of the substring
+     *
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function substring($input, $start, $length = null);
 }

lib/public/DB/QueryBuilder/IQueryBuilder.php

Indentation +867 added lines, -867 removed lines

@@ -31,871 +31,871 @@
  */
 interface IQueryBuilder {
 
-	/**
-	 * @since 9.0.0
-	 */
-	const PARAM_NULL = \PDO::PARAM_NULL;
-	/**
-	 * @since 9.0.0
-	 */
-	const PARAM_BOOL = \PDO::PARAM_BOOL;
-	/**
-	 * @since 9.0.0
-	 */
-	const PARAM_INT = \PDO::PARAM_INT;
-	/**
-	 * @since 9.0.0
-	 */
-	const PARAM_STR = \PDO::PARAM_STR;
-	/**
-	 * @since 9.0.0
-	 */
-	const PARAM_LOB = \PDO::PARAM_LOB;
-	/**
-	 * @since 9.0.0
-	 */
-	const PARAM_DATE = 'datetime';
-
-	/**
-	 * @since 9.0.0
-	 */
-	const PARAM_INT_ARRAY = Connection::PARAM_INT_ARRAY;
-	/**
-	 * @since 9.0.0
-	 */
-	const PARAM_STR_ARRAY = Connection::PARAM_STR_ARRAY;
-
-
-	/**
-	 * Enable/disable automatic prefixing of table names with the oc_ prefix
-	 *
-	 * @param bool $enabled If set to true table names will be prefixed with the
-	 * owncloud database prefix automatically.
-	 * @since 8.2.0
-	 */
-	public function automaticTablePrefix($enabled);
-
-	/**
-	 * Gets an ExpressionBuilder used for object-oriented construction of query expressions.
-	 * This producer method is intended for convenient inline usage. Example:
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where($qb->expr()->eq('u.id', 1));
-	 * </code>
-	 *
-	 * For more complex expression construction, consider storing the expression
-	 * builder object in a local variable.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IExpressionBuilder
-	 * @since 8.2.0
-	 */
-	public function expr();
-
-	/**
-	 * Gets an FunctionBuilder used for object-oriented construction of query functions.
-	 * This producer method is intended for convenient inline usage. Example:
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where($qb->fun()->md5('u.id'));
-	 * </code>
-	 *
-	 * For more complex function construction, consider storing the function
-	 * builder object in a local variable.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IFunctionBuilder
-	 * @since 12.0.0
-	 */
-	public function fun();
-
-	/**
-	 * Gets the type of the currently built query.
-	 *
-	 * @return integer
-	 * @since 8.2.0
-	 */
-	public function getType();
-
-	/**
-	 * Gets the associated DBAL Connection for this query builder.
-	 *
-	 * @return \OCP\IDBConnection
-	 * @since 8.2.0
-	 */
-	public function getConnection();
-
-	/**
-	 * Gets the state of this query builder instance.
-	 *
-	 * @return integer Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN.
-	 * @since 8.2.0
-	 */
-	public function getState();
-
-	/**
-	 * Executes this query using the bound parameters and their types.
-	 *
-	 * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeUpdate}
-	 * for insert, update and delete statements.
-	 *
-	 * @return \Doctrine\DBAL\Driver\Statement|int
-	 * @since 8.2.0
-	 */
-	public function execute();
-
-	/**
-	 * Gets the complete SQL string formed by the current specifications of this QueryBuilder.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('User', 'u')
-	 *     echo $qb->getSQL(); // SELECT u FROM User u
-	 * </code>
-	 *
-	 * @return string The SQL query string.
-	 * @since 8.2.0
-	 */
-	public function getSQL();
-
-	/**
-	 * Sets a query parameter for the query being constructed.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = :user_id')
-	 *         ->setParameter(':user_id', 1);
-	 * </code>
-	 *
-	 * @param string|integer $key The parameter position or name.
-	 * @param mixed $value The parameter value.
-	 * @param string|null $type One of the IQueryBuilder::PARAM_* constants.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function setParameter($key, $value, $type = null);
-
-	/**
-	 * Sets a collection of query parameters for the query being constructed.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = :user_id1 OR u.id = :user_id2')
-	 *         ->setParameters(array(
-	 *             ':user_id1' => 1,
-	 *             ':user_id2' => 2
-	 *         ));
-	 * </code>
-	 *
-	 * @param array $params The query parameters to set.
-	 * @param array $types The query parameters types to set.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function setParameters(array $params, array $types = array());
-
-	/**
-	 * Gets all defined query parameters for the query being constructed indexed by parameter index or name.
-	 *
-	 * @return array The currently defined query parameters indexed by parameter index or name.
-	 * @since 8.2.0
-	 */
-	public function getParameters();
-
-	/**
-	 * Gets a (previously set) query parameter of the query being constructed.
-	 *
-	 * @param mixed $key The key (index or name) of the bound parameter.
-	 *
-	 * @return mixed The value of the bound parameter.
-	 * @since 8.2.0
-	 */
-	public function getParameter($key);
-
-	/**
-	 * Gets all defined query parameter types for the query being constructed indexed by parameter index or name.
-	 *
-	 * @return array The currently defined query parameter types indexed by parameter index or name.
-	 * @since 8.2.0
-	 */
-	public function getParameterTypes();
-
-	/**
-	 * Gets a (previously set) query parameter type of the query being constructed.
-	 *
-	 * @param mixed $key The key (index or name) of the bound parameter type.
-	 *
-	 * @return mixed The value of the bound parameter type.
-	 * @since 8.2.0
-	 */
-	public function getParameterType($key);
-
-	/**
-	 * Sets the position of the first result to retrieve (the "offset").
-	 *
-	 * @param integer $firstResult The first result to return.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function setFirstResult($firstResult);
-
-	/**
-	 * Gets the position of the first result the query object was set to retrieve (the "offset").
-	 * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder.
-	 *
-	 * @return integer The position of the first result.
-	 * @since 8.2.0
-	 */
-	public function getFirstResult();
-
-	/**
-	 * Sets the maximum number of results to retrieve (the "limit").
-	 *
-	 * @param integer $maxResults The maximum number of results to retrieve.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function setMaxResults($maxResults);
-
-	/**
-	 * Gets the maximum number of results the query object was set to retrieve (the "limit").
-	 * Returns NULL if {@link setMaxResults} was not applied to this query builder.
-	 *
-	 * @return integer The maximum number of results.
-	 * @since 8.2.0
-	 */
-	public function getMaxResults();
-
-	/**
-	 * Specifies an item that is to be returned in the query result.
-	 * Replaces any previously specified selections, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id', 'p.id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expressions.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function select($select = null);
-
-	/**
-	 * Specifies an item that is to be returned with a different name in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->selectAlias('u.id', 'user_id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expressions.
-	 * @param string $alias The column alias used in the constructed query.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.1
-	 */
-	public function selectAlias($select, $alias);
-
-	/**
-	 * Specifies an item that is to be returned uniquely in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->selectDistinct('type')
-	 *         ->from('users');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expressions.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 9.0.0
-	 */
-	public function selectDistinct($select);
-
-	/**
-	 * Adds an item that is to be returned in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id')
-	 *         ->addSelect('p.id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expression.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function addSelect($select = null);
-
-	/**
-	 * Turns the query being built into a bulk delete query that ranges over
-	 * a certain table.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->delete('users', 'u')
-	 *         ->where('u.id = :user_id');
-	 *         ->setParameter(':user_id', 1);
-	 * </code>
-	 *
-	 * @param string $delete The table whose rows are subject to the deletion.
-	 * @param string $alias The table alias used in the constructed query.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function delete($delete = null, $alias = null);
-
-	/**
-	 * Turns the query being built into a bulk update query that ranges over
-	 * a certain table
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where('u.id = ?');
-	 * </code>
-	 *
-	 * @param string $update The table whose rows are subject to the update.
-	 * @param string $alias The table alias used in the constructed query.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function update($update = null, $alias = null);
-
-	/**
-	 * Turns the query being built into an insert query that inserts into
-	 * a certain table
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?',
-	 *                 'password' => '?'
-	 *             )
-	 *         );
-	 * </code>
-	 *
-	 * @param string $insert The table into which the rows should be inserted.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function insert($insert = null);
-
-	/**
-	 * Creates and adds a query root corresponding to the table identified by the
-	 * given alias, forming a cartesian product with any existing query roots.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id')
-	 *         ->from('users', 'u')
-	 * </code>
-	 *
-	 * @param string $from The table.
-	 * @param string|null $alias The alias of the table.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function from($from, $alias = null);
-
-	/**
-	 * Creates and adds a join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->join('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string $condition The condition for the join.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function join($fromAlias, $join, $alias, $condition = null);
-
-	/**
-	 * Creates and adds a join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->innerJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string $condition The condition for the join.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function innerJoin($fromAlias, $join, $alias, $condition = null);
-
-	/**
-	 * Creates and adds a left join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string $condition The condition for the join.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function leftJoin($fromAlias, $join, $alias, $condition = null);
-
-	/**
-	 * Creates and adds a right join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->rightJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string $condition The condition for the join.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function rightJoin($fromAlias, $join, $alias, $condition = null);
-
-	/**
-	 * Sets a new value for a column in a bulk update query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where('u.id = ?');
-	 * </code>
-	 *
-	 * @param string $key The column to set.
-	 * @param string $value The value, expression, placeholder, etc.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function set($key, $value);
-
-	/**
-	 * Specifies one or more restrictions to the query result.
-	 * Replaces any previously specified restrictions, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = ?');
-	 *
-	 *     // You can optionally programatically build and/or expressions
-	 *     $qb = $conn->getQueryBuilder();
-	 *
-	 *     $or = $qb->expr()->orx();
-	 *     $or->add($qb->expr()->eq('u.id', 1));
-	 *     $or->add($qb->expr()->eq('u.id', 2));
-	 *
-	 *     $qb->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where($or);
-	 * </code>
-	 *
-	 * @param mixed $predicates The restriction predicates.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function where($predicates);
-
-	/**
-	 * Adds one or more restrictions to the query results, forming a logical
-	 * conjunction with any previously specified restrictions.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.username LIKE ?')
-	 *         ->andWhere('u.is_active = 1');
-	 * </code>
-	 *
-	 * @param mixed $where The query restrictions.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 *
-	 * @see where()
-	 * @since 8.2.0
-	 */
-	public function andWhere($where);
-
-	/**
-	 * Adds one or more restrictions to the query results, forming a logical
-	 * disjunction with any previously specified restrictions.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = 1')
-	 *         ->orWhere('u.id = 2');
-	 * </code>
-	 *
-	 * @param mixed $where The WHERE statement.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 *
-	 * @see where()
-	 * @since 8.2.0
-	 */
-	public function orWhere($where);
-
-	/**
-	 * Specifies a grouping over the results of the query.
-	 * Replaces any previously specified groupings, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->groupBy('u.id');
-	 * </code>
-	 *
-	 * @param mixed $groupBy The grouping expression.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function groupBy($groupBy);
-
-	/**
-	 * Adds a grouping expression to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->groupBy('u.lastLogin');
-	 *         ->addGroupBy('u.createdAt')
-	 * </code>
-	 *
-	 * @param mixed $groupBy The grouping expression.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function addGroupBy($groupBy);
-
-	/**
-	 * Sets a value for a column in an insert query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?'
-	 *             )
-	 *         )
-	 *         ->setValue('password', '?');
-	 * </code>
-	 *
-	 * @param string $column The column into which the value should be inserted.
-	 * @param string $value The value that should be inserted into the column.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function setValue($column, $value);
-
-	/**
-	 * Specifies values for an insert query indexed by column names.
-	 * Replaces any previous values, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?',
-	 *                 'password' => '?'
-	 *             )
-	 *         );
-	 * </code>
-	 *
-	 * @param array $values The values to specify for the insert query indexed by column names.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function values(array $values);
-
-	/**
-	 * Specifies a restriction over the groups of the query.
-	 * Replaces any previous having restrictions, if any.
-	 *
-	 * @param mixed $having The restriction over the groups.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function having($having);
-
-	/**
-	 * Adds a restriction over the groups of the query, forming a logical
-	 * conjunction with any existing having restrictions.
-	 *
-	 * @param mixed $having The restriction to append.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function andHaving($having);
-
-	/**
-	 * Adds a restriction over the groups of the query, forming a logical
-	 * disjunction with any existing having restrictions.
-	 *
-	 * @param mixed $having The restriction to add.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function orHaving($having);
-
-	/**
-	 * Specifies an ordering for the query results.
-	 * Replaces any previously specified orderings, if any.
-	 *
-	 * @param string $sort The ordering expression.
-	 * @param string $order The ordering direction.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function orderBy($sort, $order = null);
-
-	/**
-	 * Adds an ordering to the query results.
-	 *
-	 * @param string $sort The ordering expression.
-	 * @param string $order The ordering direction.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function addOrderBy($sort, $order = null);
-
-	/**
-	 * Gets a query part by its name.
-	 *
-	 * @param string $queryPartName
-	 *
-	 * @return mixed
-	 * @since 8.2.0
-	 */
-	public function getQueryPart($queryPartName);
-
-	/**
-	 * Gets all query parts.
-	 *
-	 * @return array
-	 * @since 8.2.0
-	 */
-	public function getQueryParts();
-
-	/**
-	 * Resets SQL parts.
-	 *
-	 * @param array|null $queryPartNames
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function resetQueryParts($queryPartNames = null);
-
-	/**
-	 * Resets a single SQL part.
-	 *
-	 * @param string $queryPartName
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 * @since 8.2.0
-	 */
-	public function resetQueryPart($queryPartName);
-
-	/**
-	 * Creates a new named parameter and bind the value $value to it.
-	 *
-	 * This method provides a shortcut for PDOStatement::bindValue
-	 * when using prepared statements.
-	 *
-	 * The parameter $value specifies the value that you want to bind. If
-	 * $placeholder is not provided bindValue() will automatically create a
-	 * placeholder for you. An automatic placeholder will be of the name
-	 * ':dcValue1', ':dcValue2' etc.
-	 *
-	 * For more information see {@link http://php.net/pdostatement-bindparam}
-	 *
-	 * Example:
-	 * <code>
-	 * $value = 2;
-	 * $q->eq( 'id', $q->bindValue( $value ) );
-	 * $stmt = $q->executeQuery(); // executed with 'id = 2'
-	 * </code>
-	 *
-	 * @license New BSD License
-	 * @link http://www.zetacomponents.org
-	 *
-	 * @param mixed $value
-	 * @param mixed $type
-	 * @param string $placeHolder The name to bind with. The string must start with a colon ':'.
-	 *
-	 * @return IParameter
-	 * @since 8.2.0
-	 */
-	public function createNamedParameter($value, $type = self::PARAM_STR, $placeHolder = null);
-
-	/**
-	 * Creates a new positional parameter and bind the given value to it.
-	 *
-	 * Attention: If you are using positional parameters with the query builder you have
-	 * to be very careful to bind all parameters in the order they appear in the SQL
-	 * statement , otherwise they get bound in the wrong order which can lead to serious
-	 * bugs in your code.
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select('u.*')
-	 *     ->from('users', 'u')
-	 *     ->where('u.username = ' . $qb->createPositionalParameter('Foo', IQueryBuilder::PARAM_STR))
-	 *     ->orWhere('u.username = ' . $qb->createPositionalParameter('Bar', IQueryBuilder::PARAM_STR))
-	 * </code>
-	 *
-	 * @param mixed $value
-	 * @param integer $type
-	 *
-	 * @return IParameter
-	 * @since 8.2.0
-	 */
-	public function createPositionalParameter($value, $type = self::PARAM_STR);
-
-	/**
-	 * Creates a new parameter
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select('u.*')
-	 *     ->from('users', 'u')
-	 *     ->where('u.username = ' . $qb->createParameter('name'))
-	 *     ->setParameter('name', 'Bar', IQueryBuilder::PARAM_STR))
-	 * </code>
-	 *
-	 * @param string $name
-	 *
-	 * @return IParameter
-	 * @since 8.2.0
-	 */
-	public function createParameter($name);
-
-	/**
-	 * Creates a new function
-	 *
-	 * Attention: Column names inside the call have to be quoted before hand
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select($qb->createFunction('COUNT(*)'))
-	 *     ->from('users', 'u')
-	 *  echo $qb->getSQL(); // SELECT COUNT(*) FROM `users` u
-	 * </code>
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select($qb->createFunction('COUNT(`column`)'))
-	 *     ->from('users', 'u')
-	 *  echo $qb->getSQL(); // SELECT COUNT(`column`) FROM `users` u
-	 * </code>
-	 *
-	 * @param string $call
-	 *
-	 * @return IQueryFunction
-	 * @since 8.2.0
-	 */
-	public function createFunction($call);
-
-	/**
-	 * Used to get the id of the last inserted element
-	 * @return int
-	 * @throws \BadMethodCallException When being called before an insert query has been run.
-	 * @since 9.0.0
-	 */
-	public function getLastInsertId();
-
-	/**
-	 * Returns the table name quoted and with database prefix as needed by the implementation
-	 *
-	 * @param string $table
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getTableName($table);
-
-	/**
-	 * Returns the column name quoted and with table alias prefix as needed by the implementation
-	 *
-	 * @param string $column
-	 * @param string $tableAlias
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function getColumnName($column, $tableAlias = '');
+    /**
+     * @since 9.0.0
+     */
+    const PARAM_NULL = \PDO::PARAM_NULL;
+    /**
+     * @since 9.0.0
+     */
+    const PARAM_BOOL = \PDO::PARAM_BOOL;
+    /**
+     * @since 9.0.0
+     */
+    const PARAM_INT = \PDO::PARAM_INT;
+    /**
+     * @since 9.0.0
+     */
+    const PARAM_STR = \PDO::PARAM_STR;
+    /**
+     * @since 9.0.0
+     */
+    const PARAM_LOB = \PDO::PARAM_LOB;
+    /**
+     * @since 9.0.0
+     */
+    const PARAM_DATE = 'datetime';
+
+    /**
+     * @since 9.0.0
+     */
+    const PARAM_INT_ARRAY = Connection::PARAM_INT_ARRAY;
+    /**
+     * @since 9.0.0
+     */
+    const PARAM_STR_ARRAY = Connection::PARAM_STR_ARRAY;
+
+
+    /**
+     * Enable/disable automatic prefixing of table names with the oc_ prefix
+     *
+     * @param bool $enabled If set to true table names will be prefixed with the
+     * owncloud database prefix automatically.
+     * @since 8.2.0
+     */
+    public function automaticTablePrefix($enabled);
+
+    /**
+     * Gets an ExpressionBuilder used for object-oriented construction of query expressions.
+     * This producer method is intended for convenient inline usage. Example:
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where($qb->expr()->eq('u.id', 1));
+     * </code>
+     *
+     * For more complex expression construction, consider storing the expression
+     * builder object in a local variable.
+     *
+     * @return \OCP\DB\QueryBuilder\IExpressionBuilder
+     * @since 8.2.0
+     */
+    public function expr();
+
+    /**
+     * Gets an FunctionBuilder used for object-oriented construction of query functions.
+     * This producer method is intended for convenient inline usage. Example:
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where($qb->fun()->md5('u.id'));
+     * </code>
+     *
+     * For more complex function construction, consider storing the function
+     * builder object in a local variable.
+     *
+     * @return \OCP\DB\QueryBuilder\IFunctionBuilder
+     * @since 12.0.0
+     */
+    public function fun();
+
+    /**
+     * Gets the type of the currently built query.
+     *
+     * @return integer
+     * @since 8.2.0
+     */
+    public function getType();
+
+    /**
+     * Gets the associated DBAL Connection for this query builder.
+     *
+     * @return \OCP\IDBConnection
+     * @since 8.2.0
+     */
+    public function getConnection();
+
+    /**
+     * Gets the state of this query builder instance.
+     *
+     * @return integer Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN.
+     * @since 8.2.0
+     */
+    public function getState();
+
+    /**
+     * Executes this query using the bound parameters and their types.
+     *
+     * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeUpdate}
+     * for insert, update and delete statements.
+     *
+     * @return \Doctrine\DBAL\Driver\Statement|int
+     * @since 8.2.0
+     */
+    public function execute();
+
+    /**
+     * Gets the complete SQL string formed by the current specifications of this QueryBuilder.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('User', 'u')
+     *     echo $qb->getSQL(); // SELECT u FROM User u
+     * </code>
+     *
+     * @return string The SQL query string.
+     * @since 8.2.0
+     */
+    public function getSQL();
+
+    /**
+     * Sets a query parameter for the query being constructed.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.id = :user_id')
+     *         ->setParameter(':user_id', 1);
+     * </code>
+     *
+     * @param string|integer $key The parameter position or name.
+     * @param mixed $value The parameter value.
+     * @param string|null $type One of the IQueryBuilder::PARAM_* constants.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function setParameter($key, $value, $type = null);
+
+    /**
+     * Sets a collection of query parameters for the query being constructed.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.id = :user_id1 OR u.id = :user_id2')
+     *         ->setParameters(array(
+     *             ':user_id1' => 1,
+     *             ':user_id2' => 2
+     *         ));
+     * </code>
+     *
+     * @param array $params The query parameters to set.
+     * @param array $types The query parameters types to set.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function setParameters(array $params, array $types = array());
+
+    /**
+     * Gets all defined query parameters for the query being constructed indexed by parameter index or name.
+     *
+     * @return array The currently defined query parameters indexed by parameter index or name.
+     * @since 8.2.0
+     */
+    public function getParameters();
+
+    /**
+     * Gets a (previously set) query parameter of the query being constructed.
+     *
+     * @param mixed $key The key (index or name) of the bound parameter.
+     *
+     * @return mixed The value of the bound parameter.
+     * @since 8.2.0
+     */
+    public function getParameter($key);
+
+    /**
+     * Gets all defined query parameter types for the query being constructed indexed by parameter index or name.
+     *
+     * @return array The currently defined query parameter types indexed by parameter index or name.
+     * @since 8.2.0
+     */
+    public function getParameterTypes();
+
+    /**
+     * Gets a (previously set) query parameter type of the query being constructed.
+     *
+     * @param mixed $key The key (index or name) of the bound parameter type.
+     *
+     * @return mixed The value of the bound parameter type.
+     * @since 8.2.0
+     */
+    public function getParameterType($key);
+
+    /**
+     * Sets the position of the first result to retrieve (the "offset").
+     *
+     * @param integer $firstResult The first result to return.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function setFirstResult($firstResult);
+
+    /**
+     * Gets the position of the first result the query object was set to retrieve (the "offset").
+     * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder.
+     *
+     * @return integer The position of the first result.
+     * @since 8.2.0
+     */
+    public function getFirstResult();
+
+    /**
+     * Sets the maximum number of results to retrieve (the "limit").
+     *
+     * @param integer $maxResults The maximum number of results to retrieve.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function setMaxResults($maxResults);
+
+    /**
+     * Gets the maximum number of results the query object was set to retrieve (the "limit").
+     * Returns NULL if {@link setMaxResults} was not applied to this query builder.
+     *
+     * @return integer The maximum number of results.
+     * @since 8.2.0
+     */
+    public function getMaxResults();
+
+    /**
+     * Specifies an item that is to be returned in the query result.
+     * Replaces any previously specified selections, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id', 'p.id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed $select The selection expressions.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function select($select = null);
+
+    /**
+     * Specifies an item that is to be returned with a different name in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->selectAlias('u.id', 'user_id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed $select The selection expressions.
+     * @param string $alias The column alias used in the constructed query.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.1
+     */
+    public function selectAlias($select, $alias);
+
+    /**
+     * Specifies an item that is to be returned uniquely in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->selectDistinct('type')
+     *         ->from('users');
+     * </code>
+     *
+     * @param mixed $select The selection expressions.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 9.0.0
+     */
+    public function selectDistinct($select);
+
+    /**
+     * Adds an item that is to be returned in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id')
+     *         ->addSelect('p.id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed $select The selection expression.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function addSelect($select = null);
+
+    /**
+     * Turns the query being built into a bulk delete query that ranges over
+     * a certain table.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->delete('users', 'u')
+     *         ->where('u.id = :user_id');
+     *         ->setParameter(':user_id', 1);
+     * </code>
+     *
+     * @param string $delete The table whose rows are subject to the deletion.
+     * @param string $alias The table alias used in the constructed query.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function delete($delete = null, $alias = null);
+
+    /**
+     * Turns the query being built into a bulk update query that ranges over
+     * a certain table
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where('u.id = ?');
+     * </code>
+     *
+     * @param string $update The table whose rows are subject to the update.
+     * @param string $alias The table alias used in the constructed query.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function update($update = null, $alias = null);
+
+    /**
+     * Turns the query being built into an insert query that inserts into
+     * a certain table
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?',
+     *                 'password' => '?'
+     *             )
+     *         );
+     * </code>
+     *
+     * @param string $insert The table into which the rows should be inserted.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function insert($insert = null);
+
+    /**
+     * Creates and adds a query root corresponding to the table identified by the
+     * given alias, forming a cartesian product with any existing query roots.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id')
+     *         ->from('users', 'u')
+     * </code>
+     *
+     * @param string $from The table.
+     * @param string|null $alias The alias of the table.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function from($from, $alias = null);
+
+    /**
+     * Creates and adds a join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->join('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string $condition The condition for the join.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function join($fromAlias, $join, $alias, $condition = null);
+
+    /**
+     * Creates and adds a join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->innerJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string $condition The condition for the join.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function innerJoin($fromAlias, $join, $alias, $condition = null);
+
+    /**
+     * Creates and adds a left join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string $condition The condition for the join.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function leftJoin($fromAlias, $join, $alias, $condition = null);
+
+    /**
+     * Creates and adds a right join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->rightJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string $condition The condition for the join.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function rightJoin($fromAlias, $join, $alias, $condition = null);
+
+    /**
+     * Sets a new value for a column in a bulk update query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where('u.id = ?');
+     * </code>
+     *
+     * @param string $key The column to set.
+     * @param string $value The value, expression, placeholder, etc.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function set($key, $value);
+
+    /**
+     * Specifies one or more restrictions to the query result.
+     * Replaces any previously specified restrictions, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->where('u.id = ?');
+     *
+     *     // You can optionally programatically build and/or expressions
+     *     $qb = $conn->getQueryBuilder();
+     *
+     *     $or = $qb->expr()->orx();
+     *     $or->add($qb->expr()->eq('u.id', 1));
+     *     $or->add($qb->expr()->eq('u.id', 2));
+     *
+     *     $qb->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where($or);
+     * </code>
+     *
+     * @param mixed $predicates The restriction predicates.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function where($predicates);
+
+    /**
+     * Adds one or more restrictions to the query results, forming a logical
+     * conjunction with any previously specified restrictions.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.username LIKE ?')
+     *         ->andWhere('u.is_active = 1');
+     * </code>
+     *
+     * @param mixed $where The query restrictions.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     *
+     * @see where()
+     * @since 8.2.0
+     */
+    public function andWhere($where);
+
+    /**
+     * Adds one or more restrictions to the query results, forming a logical
+     * disjunction with any previously specified restrictions.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->where('u.id = 1')
+     *         ->orWhere('u.id = 2');
+     * </code>
+     *
+     * @param mixed $where The WHERE statement.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     *
+     * @see where()
+     * @since 8.2.0
+     */
+    public function orWhere($where);
+
+    /**
+     * Specifies a grouping over the results of the query.
+     * Replaces any previously specified groupings, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->groupBy('u.id');
+     * </code>
+     *
+     * @param mixed $groupBy The grouping expression.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function groupBy($groupBy);
+
+    /**
+     * Adds a grouping expression to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->groupBy('u.lastLogin');
+     *         ->addGroupBy('u.createdAt')
+     * </code>
+     *
+     * @param mixed $groupBy The grouping expression.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function addGroupBy($groupBy);
+
+    /**
+     * Sets a value for a column in an insert query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?'
+     *             )
+     *         )
+     *         ->setValue('password', '?');
+     * </code>
+     *
+     * @param string $column The column into which the value should be inserted.
+     * @param string $value The value that should be inserted into the column.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function setValue($column, $value);
+
+    /**
+     * Specifies values for an insert query indexed by column names.
+     * Replaces any previous values, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?',
+     *                 'password' => '?'
+     *             )
+     *         );
+     * </code>
+     *
+     * @param array $values The values to specify for the insert query indexed by column names.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function values(array $values);
+
+    /**
+     * Specifies a restriction over the groups of the query.
+     * Replaces any previous having restrictions, if any.
+     *
+     * @param mixed $having The restriction over the groups.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function having($having);
+
+    /**
+     * Adds a restriction over the groups of the query, forming a logical
+     * conjunction with any existing having restrictions.
+     *
+     * @param mixed $having The restriction to append.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function andHaving($having);
+
+    /**
+     * Adds a restriction over the groups of the query, forming a logical
+     * disjunction with any existing having restrictions.
+     *
+     * @param mixed $having The restriction to add.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function orHaving($having);
+
+    /**
+     * Specifies an ordering for the query results.
+     * Replaces any previously specified orderings, if any.
+     *
+     * @param string $sort The ordering expression.
+     * @param string $order The ordering direction.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function orderBy($sort, $order = null);
+
+    /**
+     * Adds an ordering to the query results.
+     *
+     * @param string $sort The ordering expression.
+     * @param string $order The ordering direction.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function addOrderBy($sort, $order = null);
+
+    /**
+     * Gets a query part by its name.
+     *
+     * @param string $queryPartName
+     *
+     * @return mixed
+     * @since 8.2.0
+     */
+    public function getQueryPart($queryPartName);
+
+    /**
+     * Gets all query parts.
+     *
+     * @return array
+     * @since 8.2.0
+     */
+    public function getQueryParts();
+
+    /**
+     * Resets SQL parts.
+     *
+     * @param array|null $queryPartNames
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function resetQueryParts($queryPartNames = null);
+
+    /**
+     * Resets a single SQL part.
+     *
+     * @param string $queryPartName
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     * @since 8.2.0
+     */
+    public function resetQueryPart($queryPartName);
+
+    /**
+     * Creates a new named parameter and bind the value $value to it.
+     *
+     * This method provides a shortcut for PDOStatement::bindValue
+     * when using prepared statements.
+     *
+     * The parameter $value specifies the value that you want to bind. If
+     * $placeholder is not provided bindValue() will automatically create a
+     * placeholder for you. An automatic placeholder will be of the name
+     * ':dcValue1', ':dcValue2' etc.
+     *
+     * For more information see {@link http://php.net/pdostatement-bindparam}
+     *
+     * Example:
+     * <code>
+     * $value = 2;
+     * $q->eq( 'id', $q->bindValue( $value ) );
+     * $stmt = $q->executeQuery(); // executed with 'id = 2'
+     * </code>
+     *
+     * @license New BSD License
+     * @link http://www.zetacomponents.org
+     *
+     * @param mixed $value
+     * @param mixed $type
+     * @param string $placeHolder The name to bind with. The string must start with a colon ':'.
+     *
+     * @return IParameter
+     * @since 8.2.0
+     */
+    public function createNamedParameter($value, $type = self::PARAM_STR, $placeHolder = null);
+
+    /**
+     * Creates a new positional parameter and bind the given value to it.
+     *
+     * Attention: If you are using positional parameters with the query builder you have
+     * to be very careful to bind all parameters in the order they appear in the SQL
+     * statement , otherwise they get bound in the wrong order which can lead to serious
+     * bugs in your code.
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select('u.*')
+     *     ->from('users', 'u')
+     *     ->where('u.username = ' . $qb->createPositionalParameter('Foo', IQueryBuilder::PARAM_STR))
+     *     ->orWhere('u.username = ' . $qb->createPositionalParameter('Bar', IQueryBuilder::PARAM_STR))
+     * </code>
+     *
+     * @param mixed $value
+     * @param integer $type
+     *
+     * @return IParameter
+     * @since 8.2.0
+     */
+    public function createPositionalParameter($value, $type = self::PARAM_STR);
+
+    /**
+     * Creates a new parameter
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select('u.*')
+     *     ->from('users', 'u')
+     *     ->where('u.username = ' . $qb->createParameter('name'))
+     *     ->setParameter('name', 'Bar', IQueryBuilder::PARAM_STR))
+     * </code>
+     *
+     * @param string $name
+     *
+     * @return IParameter
+     * @since 8.2.0
+     */
+    public function createParameter($name);
+
+    /**
+     * Creates a new function
+     *
+     * Attention: Column names inside the call have to be quoted before hand
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select($qb->createFunction('COUNT(*)'))
+     *     ->from('users', 'u')
+     *  echo $qb->getSQL(); // SELECT COUNT(*) FROM `users` u
+     * </code>
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select($qb->createFunction('COUNT(`column`)'))
+     *     ->from('users', 'u')
+     *  echo $qb->getSQL(); // SELECT COUNT(`column`) FROM `users` u
+     * </code>
+     *
+     * @param string $call
+     *
+     * @return IQueryFunction
+     * @since 8.2.0
+     */
+    public function createFunction($call);
+
+    /**
+     * Used to get the id of the last inserted element
+     * @return int
+     * @throws \BadMethodCallException When being called before an insert query has been run.
+     * @since 9.0.0
+     */
+    public function getLastInsertId();
+
+    /**
+     * Returns the table name quoted and with database prefix as needed by the implementation
+     *
+     * @param string $table
+     * @return string
+     * @since 9.0.0
+     */
+    public function getTableName($table);
+
+    /**
+     * Returns the column name quoted and with table alias prefix as needed by the implementation
+     *
+     * @param string $column
+     * @param string $tableAlias
+     * @return string
+     * @since 9.0.0
+     */
+    public function getColumnName($column, $tableAlias = '');
 }

lib/private/DB/AdapterOCI8.php

Indentation +18 added lines, -18 removed lines

@@ -27,24 +27,24 @@
 namespace OC\DB;
 
 class AdapterOCI8 extends Adapter {
-	public function lastInsertId($table) {
-		if (is_null($table)) {
-			throw new \InvalidArgumentException('Oracle requires a table name to be passed into lastInsertId()');
-		}
-		if ($table !== null) {
-			$suffix = '_SEQ';
-			$table = '"' . $table . $suffix . '"';
-		}
-		return $this->conn->realLastInsertId($table);
-	}
+    public function lastInsertId($table) {
+        if (is_null($table)) {
+            throw new \InvalidArgumentException('Oracle requires a table name to be passed into lastInsertId()');
+        }
+        if ($table !== null) {
+            $suffix = '_SEQ';
+            $table = '"' . $table . $suffix . '"';
+        }
+        return $this->conn->realLastInsertId($table);
+    }
 
-	const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400";
+    const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400";
 
-	public function fixupStatement($statement) {
-		$statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement);
-		$statement = str_replace('`', '"', $statement);
-		$statement = str_ireplace('NOW()', 'CURRENT_TIMESTAMP', $statement);
-		$statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
-		return $statement;
-	}
+    public function fixupStatement($statement) {
+        $statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement);
+        $statement = str_replace('`', '"', $statement);
+        $statement = str_ireplace('NOW()', 'CURRENT_TIMESTAMP', $statement);
+        $statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
+        return $statement;
+    }
 }

lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php

Indentation +135 added lines, -135 removed lines

@@ -33,139 +33,139 @@
 
 class OCIExpressionBuilder extends ExpressionBuilder {
 
-	/**
-	 * @param mixed $column
-	 * @param mixed|null $type
-	 * @return array|IQueryFunction|string
-	 */
-	protected function prepareColumn($column, $type) {
-		if ($type === IQueryBuilder::PARAM_STR && !is_array($column) && !($column instanceof IParameter) && !($column instanceof ILiteral)) {
-			$column = $this->castColumn($column, $type);
-		} else {
-			$column = $this->helper->quoteColumnNames($column);
-		}
-		return $column;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function comparison($x, $operator, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->comparison($x, $operator, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function eq($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->eq($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function neq($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->neq($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function lt($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->lt($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function lte($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->lte($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function gt($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->gt($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function gte($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->gte($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function in($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->in($x, $y);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function notIn($x, $y, $type = null) {
-		$x = $this->prepareColumn($x, $type);
-		$y = $this->prepareColumn($y, $type);
-
-		return $this->expressionBuilder->notIn($x, $y);
-	}
-
-	/**
-	 * Returns a IQueryFunction that casts the column to the given type
-	 *
-	 * @param string $column
-	 * @param mixed $type One of IQueryBuilder::PARAM_*
-	 * @return IQueryFunction
-	 */
-	public function castColumn($column, $type) {
-		if ($type === IQueryBuilder::PARAM_STR) {
-			$column = $this->helper->quoteColumnName($column);
-			return new QueryFunction('to_char(' . $column . ')');
-		}
-
-		return parent::castColumn($column, $type);
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function like($x, $y, $type = null) {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function iLike($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return new QueryFunction('REGEXP_LIKE('.$x.', \'^\' || REPLACE('.$y.', \'%\', \'.*\') || \'$\', \'i\')');
-	}
+    /**
+     * @param mixed $column
+     * @param mixed|null $type
+     * @return array|IQueryFunction|string
+     */
+    protected function prepareColumn($column, $type) {
+        if ($type === IQueryBuilder::PARAM_STR && !is_array($column) && !($column instanceof IParameter) && !($column instanceof ILiteral)) {
+            $column = $this->castColumn($column, $type);
+        } else {
+            $column = $this->helper->quoteColumnNames($column);
+        }
+        return $column;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function comparison($x, $operator, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->comparison($x, $operator, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function eq($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->eq($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function neq($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->neq($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function lt($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->lt($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function lte($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->lte($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function gt($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->gt($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function gte($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->gte($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function in($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->in($x, $y);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function notIn($x, $y, $type = null) {
+        $x = $this->prepareColumn($x, $type);
+        $y = $this->prepareColumn($y, $type);
+
+        return $this->expressionBuilder->notIn($x, $y);
+    }
+
+    /**
+     * Returns a IQueryFunction that casts the column to the given type
+     *
+     * @param string $column
+     * @param mixed $type One of IQueryBuilder::PARAM_*
+     * @return IQueryFunction
+     */
+    public function castColumn($column, $type) {
+        if ($type === IQueryBuilder::PARAM_STR) {
+            $column = $this->helper->quoteColumnName($column);
+            return new QueryFunction('to_char(' . $column . ')');
+        }
+
+        return parent::castColumn($column, $type);
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function like($x, $y, $type = null) {
+        return parent::like($x, $y, $type) . " ESCAPE '\\'";
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function iLike($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return new QueryFunction('REGEXP_LIKE('.$x.', \'^\' || REPLACE('.$y.', \'%\', \'.*\') || \'$\', \'i\')');
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -147,7 +147,7 @@ 
 	public function castColumn($column, $type) {
 		if ($type === IQueryBuilder::PARAM_STR) {
 			$column = $this->helper->quoteColumnName($column);
-			return new QueryFunction('to_char(' . $column . ')');
+			return new QueryFunction('to_char('.$column.')');
 		}
 
 		return parent::castColumn($column, $type);
@@ -157,7 +157,7 @@ 
 	 * @inheritdoc
 	 */
 	public function like($x, $y, $type = null) {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
+		return parent::like($x, $y, $type)." ESCAPE '\\'";
 	}
 
 	/**

lib/private/DB/QueryBuilder/ExpressionBuilder/SqliteExpressionBuilder.php

Indentation +6 added lines, -6 removed lines

@@ -29,10 +29,10 @@
 use OCP\DB\QueryBuilder\IQueryFunction;
 
 class SqliteExpressionBuilder extends ExpressionBuilder {
-	/**
-	 * @inheritdoc
-	 */
-	public function like($x, $y, $type = null) {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
-	}
+    /**
+     * @inheritdoc
+     */
+    public function like($x, $y, $type = null) {
+        return parent::like($x, $y, $type) . " ESCAPE '\\'";
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -33,6 +33,6 @@
 	 * @inheritdoc
 	 */
 	public function like($x, $y, $type = null) {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
+		return parent::like($x, $y, $type)." ESCAPE '\\'";
 	}
 }

lib/private/DB/QueryBuilder/QueryBuilder.php

Indentation +1147 added lines, -1147 removed lines

@@ -46,1151 +46,1151 @@
 
 class QueryBuilder implements IQueryBuilder {
 
-	/** @var \OCP\IDBConnection */
-	private $connection;
-
-	/** @var SystemConfig */
-	private $systemConfig;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var \Doctrine\DBAL\Query\QueryBuilder */
-	private $queryBuilder;
-
-	/** @var QuoteHelper */
-	private $helper;
-
-	/** @var bool */
-	private $automaticTablePrefix = true;
-
-	/** @var string */
-	protected $lastInsertedTable;
-
-	/**
-	 * Initializes a new QueryBuilder.
-	 *
-	 * @param IDBConnection $connection
-	 * @param SystemConfig $systemConfig
-	 * @param ILogger $logger
-	 */
-	public function __construct(IDBConnection $connection, SystemConfig $systemConfig, ILogger $logger) {
-		$this->connection = $connection;
-		$this->systemConfig = $systemConfig;
-		$this->logger = $logger;
-		$this->queryBuilder = new \Doctrine\DBAL\Query\QueryBuilder($this->connection);
-		$this->helper = new QuoteHelper();
-	}
-
-	/**
-	 * Enable/disable automatic prefixing of table names with the oc_ prefix
-	 *
-	 * @param bool $enabled If set to true table names will be prefixed with the
-	 * owncloud database prefix automatically.
-	 * @since 8.2.0
-	 */
-	public function automaticTablePrefix($enabled) {
-		$this->automaticTablePrefix = (bool) $enabled;
-	}
-
-	/**
-	 * Gets an ExpressionBuilder used for object-oriented construction of query expressions.
-	 * This producer method is intended for convenient inline usage. Example:
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where($qb->expr()->eq('u.id', 1));
-	 * </code>
-	 *
-	 * For more complex expression construction, consider storing the expression
-	 * builder object in a local variable.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IExpressionBuilder
-	 */
-	public function expr() {
-		if ($this->connection instanceof OracleConnection) {
-			return new OCIExpressionBuilder($this->connection);
-		} else if ($this->connection->getDatabasePlatform() instanceof PostgreSqlPlatform) {
-			return new PgSqlExpressionBuilder($this->connection);
-		} else if ($this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
-			return new MySqlExpressionBuilder($this->connection);
-		} else if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-			return new SqliteExpressionBuilder($this->connection);
-		} else {
-			return new ExpressionBuilder($this->connection);
-		}
-	}
-
-	/**
-	 * Gets an FunctionBuilder used for object-oriented construction of query functions.
-	 * This producer method is intended for convenient inline usage. Example:
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where($qb->fun()->md5('u.id'));
-	 * </code>
-	 *
-	 * For more complex function construction, consider storing the function
-	 * builder object in a local variable.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IFunctionBuilder
-	 */
-	public function fun() {
-		if ($this->connection instanceof OracleConnection) {
-			return new OCIFunctionBuilder($this->helper);
-		} else if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-			return new SqliteFunctionBuilder($this->helper);
-		} else if ($this->connection->getDatabasePlatform() instanceof PostgreSqlPlatform) {
-			return new PgSqlFunctionBuilder($this->helper);
-		} else {
-			return new FunctionBuilder($this->helper);
-		}
-	}
-
-	/**
-	 * Gets the type of the currently built query.
-	 *
-	 * @return integer
-	 */
-	public function getType() {
-		return $this->queryBuilder->getType();
-	}
-
-	/**
-	 * Gets the associated DBAL Connection for this query builder.
-	 *
-	 * @return \OCP\IDBConnection
-	 */
-	public function getConnection() {
-		return $this->connection;
-	}
-
-	/**
-	 * Gets the state of this query builder instance.
-	 *
-	 * @return integer Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN.
-	 */
-	public function getState() {
-		return $this->queryBuilder->getState();
-	}
-
-	/**
-	 * Executes this query using the bound parameters and their types.
-	 *
-	 * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeUpdate}
-	 * for insert, update and delete statements.
-	 *
-	 * @return \Doctrine\DBAL\Driver\Statement|int
-	 */
-	public function execute() {
-		if ($this->systemConfig->getValue('log_query', false)) {
-			$params = [];
-			foreach ($this->getParameters() as $placeholder => $value) {
-				if (is_array($value)) {
-					$params[] = $placeholder . ' => (\'' . implode('\', \'', $value) . '\')';
-				} else {
-					$params[] = $placeholder . ' => \'' . $value . '\'';
-				}
-			}
-			if (empty($params)) {
-				$this->logger->debug('DB QueryBuilder: \'{query}\'', [
-					'query' => $this->getSQL(),
-					'app' => 'core',
-				]);
-			} else {
-				$this->logger->debug('DB QueryBuilder: \'{query}\' with parameters: {params}', [
-					'query' => $this->getSQL(),
-					'params' => implode(', ', $params),
-					'app' => 'core',
-				]);
-			}
-		}
-
-		return $this->queryBuilder->execute();
-	}
-
-	/**
-	 * Gets the complete SQL string formed by the current specifications of this QueryBuilder.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('User', 'u')
-	 *     echo $qb->getSQL(); // SELECT u FROM User u
-	 * </code>
-	 *
-	 * @return string The SQL query string.
-	 */
-	public function getSQL() {
-		return $this->queryBuilder->getSQL();
-	}
-
-	/**
-	 * Sets a query parameter for the query being constructed.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = :user_id')
-	 *         ->setParameter(':user_id', 1);
-	 * </code>
-	 *
-	 * @param string|integer $key The parameter position or name.
-	 * @param mixed $value The parameter value.
-	 * @param string|null $type One of the IQueryBuilder::PARAM_* constants.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function setParameter($key, $value, $type = null) {
-		$this->queryBuilder->setParameter($key, $value, $type);
-
-		return $this;
-	}
-
-	/**
-	 * Sets a collection of query parameters for the query being constructed.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = :user_id1 OR u.id = :user_id2')
-	 *         ->setParameters(array(
-	 *             ':user_id1' => 1,
-	 *             ':user_id2' => 2
-	 *         ));
-	 * </code>
-	 *
-	 * @param array $params The query parameters to set.
-	 * @param array $types The query parameters types to set.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function setParameters(array $params, array $types = array()) {
-		$this->queryBuilder->setParameters($params, $types);
-
-		return $this;
-	}
-
-	/**
-	 * Gets all defined query parameters for the query being constructed indexed by parameter index or name.
-	 *
-	 * @return array The currently defined query parameters indexed by parameter index or name.
-	 */
-	public function getParameters() {
-		return $this->queryBuilder->getParameters();
-	}
-
-	/**
-	 * Gets a (previously set) query parameter of the query being constructed.
-	 *
-	 * @param mixed $key The key (index or name) of the bound parameter.
-	 *
-	 * @return mixed The value of the bound parameter.
-	 */
-	public function getParameter($key) {
-		return $this->queryBuilder->getParameter($key);
-	}
-
-	/**
-	 * Gets all defined query parameter types for the query being constructed indexed by parameter index or name.
-	 *
-	 * @return array The currently defined query parameter types indexed by parameter index or name.
-	 */
-	public function getParameterTypes() {
-		return $this->queryBuilder->getParameterTypes();
-	}
-
-	/**
-	 * Gets a (previously set) query parameter type of the query being constructed.
-	 *
-	 * @param mixed $key The key (index or name) of the bound parameter type.
-	 *
-	 * @return mixed The value of the bound parameter type.
-	 */
-	public function getParameterType($key) {
-		return $this->queryBuilder->getParameterType($key);
-	}
-
-	/**
-	 * Sets the position of the first result to retrieve (the "offset").
-	 *
-	 * @param integer $firstResult The first result to return.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function setFirstResult($firstResult) {
-		$this->queryBuilder->setFirstResult($firstResult);
-
-		return $this;
-	}
-
-	/**
-	 * Gets the position of the first result the query object was set to retrieve (the "offset").
-	 * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder.
-	 *
-	 * @return integer The position of the first result.
-	 */
-	public function getFirstResult() {
-		return $this->queryBuilder->getFirstResult();
-	}
-
-	/**
-	 * Sets the maximum number of results to retrieve (the "limit").
-	 *
-	 * NOTE: Setting max results to "0" will cause mixed behaviour. While most
-	 * of the databases will just return an empty result set, Oracle will return
-	 * all entries.
-	 *
-	 * @param integer $maxResults The maximum number of results to retrieve.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function setMaxResults($maxResults) {
-		$this->queryBuilder->setMaxResults($maxResults);
-
-		return $this;
-	}
-
-	/**
-	 * Gets the maximum number of results the query object was set to retrieve (the "limit").
-	 * Returns NULL if {@link setMaxResults} was not applied to this query builder.
-	 *
-	 * @return integer The maximum number of results.
-	 */
-	public function getMaxResults() {
-		return $this->queryBuilder->getMaxResults();
-	}
-
-	/**
-	 * Specifies an item that is to be returned in the query result.
-	 * Replaces any previously specified selections, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id', 'p.id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expressions.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function select($select = null) {
-		$selects = is_array($select) ? $select : func_get_args();
-
-		$this->queryBuilder->select(
-			$this->helper->quoteColumnNames($selects)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies an item that is to be returned with a different name in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->selectAlias('u.id', 'user_id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expressions.
-	 * @param string $alias The column alias used in the constructed query.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function selectAlias($select, $alias) {
-
-		$this->queryBuilder->addSelect(
-			$this->helper->quoteColumnName($select) . ' AS ' . $this->helper->quoteColumnName($alias)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies an item that is to be returned uniquely in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->selectDistinct('type')
-	 *         ->from('users');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expressions.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function selectDistinct($select) {
-
-		$this->queryBuilder->addSelect(
-			'DISTINCT ' . $this->helper->quoteColumnName($select)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds an item that is to be returned in the query result.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id')
-	 *         ->addSelect('p.id')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'u.id = p.user_id');
-	 * </code>
-	 *
-	 * @param mixed $select The selection expression.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function addSelect($select = null) {
-		$selects = is_array($select) ? $select : func_get_args();
-
-		$this->queryBuilder->addSelect(
-			$this->helper->quoteColumnNames($selects)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Turns the query being built into a bulk delete query that ranges over
-	 * a certain table.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->delete('users', 'u')
-	 *         ->where('u.id = :user_id');
-	 *         ->setParameter(':user_id', 1);
-	 * </code>
-	 *
-	 * @param string $delete The table whose rows are subject to the deletion.
-	 * @param string $alias The table alias used in the constructed query.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function delete($delete = null, $alias = null) {
-		$this->queryBuilder->delete(
-			$this->getTableName($delete),
-			$alias
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Turns the query being built into a bulk update query that ranges over
-	 * a certain table
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where('u.id = ?');
-	 * </code>
-	 *
-	 * @param string $update The table whose rows are subject to the update.
-	 * @param string $alias The table alias used in the constructed query.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function update($update = null, $alias = null) {
-		$this->queryBuilder->update(
-			$this->getTableName($update),
-			$alias
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Turns the query being built into an insert query that inserts into
-	 * a certain table
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?',
-	 *                 'password' => '?'
-	 *             )
-	 *         );
-	 * </code>
-	 *
-	 * @param string $insert The table into which the rows should be inserted.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function insert($insert = null) {
-		$this->queryBuilder->insert(
-			$this->getTableName($insert)
-		);
-
-		$this->lastInsertedTable = $insert;
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a query root corresponding to the table identified by the
-	 * given alias, forming a cartesian product with any existing query roots.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.id')
-	 *         ->from('users', 'u')
-	 * </code>
-	 *
-	 * @param string $from The table.
-	 * @param string|null $alias The alias of the table.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function from($from, $alias = null) {
-		$this->queryBuilder->from(
-			$this->getTableName($from),
-			$alias
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->join('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string $condition The condition for the join.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function join($fromAlias, $join, $alias, $condition = null) {
-		$this->queryBuilder->join(
-			$fromAlias,
-			$this->getTableName($join),
-			$alias,
-			$condition
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->innerJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string $condition The condition for the join.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function innerJoin($fromAlias, $join, $alias, $condition = null) {
-		$this->queryBuilder->innerJoin(
-			$fromAlias,
-			$this->getTableName($join),
-			$alias,
-			$condition
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a left join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->leftJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string $condition The condition for the join.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function leftJoin($fromAlias, $join, $alias, $condition = null) {
-		$this->queryBuilder->leftJoin(
-			$fromAlias,
-			$this->getTableName($join),
-			$alias,
-			$condition
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Creates and adds a right join to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->rightJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
-	 * </code>
-	 *
-	 * @param string $fromAlias The alias that points to a from clause.
-	 * @param string $join The table name to join.
-	 * @param string $alias The alias of the join table.
-	 * @param string $condition The condition for the join.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function rightJoin($fromAlias, $join, $alias, $condition = null) {
-		$this->queryBuilder->rightJoin(
-			$fromAlias,
-			$this->getTableName($join),
-			$alias,
-			$condition
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Sets a new value for a column in a bulk update query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where('u.id = ?');
-	 * </code>
-	 *
-	 * @param string $key The column to set.
-	 * @param string $value The value, expression, placeholder, etc.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function set($key, $value) {
-		$this->queryBuilder->set(
-			$this->helper->quoteColumnName($key),
-			$this->helper->quoteColumnName($value)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies one or more restrictions to the query result.
-	 * Replaces any previously specified restrictions, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = ?');
-	 *
-	 *     // You can optionally programatically build and/or expressions
-	 *     $qb = $conn->getQueryBuilder();
-	 *
-	 *     $or = $qb->expr()->orx();
-	 *     $or->add($qb->expr()->eq('u.id', 1));
-	 *     $or->add($qb->expr()->eq('u.id', 2));
-	 *
-	 *     $qb->update('users', 'u')
-	 *         ->set('u.password', md5('password'))
-	 *         ->where($or);
-	 * </code>
-	 *
-	 * @param mixed $predicates The restriction predicates.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function where($predicates) {
-		call_user_func_array(
-			[$this->queryBuilder, 'where'],
-			func_get_args()
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds one or more restrictions to the query results, forming a logical
-	 * conjunction with any previously specified restrictions.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u')
-	 *         ->from('users', 'u')
-	 *         ->where('u.username LIKE ?')
-	 *         ->andWhere('u.is_active = 1');
-	 * </code>
-	 *
-	 * @param mixed $where The query restrictions.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 *
-	 * @see where()
-	 */
-	public function andWhere($where) {
-		call_user_func_array(
-			[$this->queryBuilder, 'andWhere'],
-			func_get_args()
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds one or more restrictions to the query results, forming a logical
-	 * disjunction with any previously specified restrictions.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->where('u.id = 1')
-	 *         ->orWhere('u.id = 2');
-	 * </code>
-	 *
-	 * @param mixed $where The WHERE statement.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 *
-	 * @see where()
-	 */
-	public function orWhere($where) {
-		call_user_func_array(
-			[$this->queryBuilder, 'orWhere'],
-			func_get_args()
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies a grouping over the results of the query.
-	 * Replaces any previously specified groupings, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->groupBy('u.id');
-	 * </code>
-	 *
-	 * @param mixed $groupBy The grouping expression.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function groupBy($groupBy) {
-		$groupBys = is_array($groupBy) ? $groupBy : func_get_args();
-
-		call_user_func_array(
-			[$this->queryBuilder, 'groupBy'],
-			$this->helper->quoteColumnNames($groupBys)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a grouping expression to the query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->select('u.name')
-	 *         ->from('users', 'u')
-	 *         ->groupBy('u.lastLogin');
-	 *         ->addGroupBy('u.createdAt')
-	 * </code>
-	 *
-	 * @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();
-
-		call_user_func_array(
-			[$this->queryBuilder, 'addGroupBy'],
-			$this->helper->quoteColumnNames($groupBys)
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Sets a value for a column in an insert query.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?'
-	 *             )
-	 *         )
-	 *         ->setValue('password', '?');
-	 * </code>
-	 *
-	 * @param string $column The column into which the value should be inserted.
-	 * @param string $value The value that should be inserted into the column.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function setValue($column, $value) {
-		$this->queryBuilder->setValue(
-			$this->helper->quoteColumnName($column),
-			$value
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies values for an insert query indexed by column names.
-	 * Replaces any previous values, if any.
-	 *
-	 * <code>
-	 *     $qb = $conn->getQueryBuilder()
-	 *         ->insert('users')
-	 *         ->values(
-	 *             array(
-	 *                 'name' => '?',
-	 *                 'password' => '?'
-	 *             )
-	 *         );
-	 * </code>
-	 *
-	 * @param array $values The values to specify for the insert query indexed by column names.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function values(array $values) {
-		$quotedValues = [];
-		foreach ($values as $key => $value) {
-			$quotedValues[$this->helper->quoteColumnName($key)] = $value;
-		}
-
-		$this->queryBuilder->values($quotedValues);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies a restriction over the groups of the query.
-	 * Replaces any previous having restrictions, if any.
-	 *
-	 * @param mixed $having The restriction over the groups.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function having($having) {
-		call_user_func_array(
-			[$this->queryBuilder, 'having'],
-			func_get_args()
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a restriction over the groups of the query, forming a logical
-	 * conjunction with any existing having restrictions.
-	 *
-	 * @param mixed $having The restriction to append.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function andHaving($having) {
-		call_user_func_array(
-			[$this->queryBuilder, 'andHaving'],
-			func_get_args()
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds a restriction over the groups of the query, forming a logical
-	 * disjunction with any existing having restrictions.
-	 *
-	 * @param mixed $having The restriction to add.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function orHaving($having) {
-		call_user_func_array(
-			[$this->queryBuilder, 'orHaving'],
-			func_get_args()
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Specifies an ordering for the query results.
-	 * Replaces any previously specified orderings, if any.
-	 *
-	 * @param string $sort The ordering expression.
-	 * @param string $order The ordering direction.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function orderBy($sort, $order = null) {
-		$this->queryBuilder->orderBy(
-			$this->helper->quoteColumnName($sort),
-			$order
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Adds an ordering to the query results.
-	 *
-	 * @param string $sort The ordering expression.
-	 * @param string $order The ordering direction.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function addOrderBy($sort, $order = null) {
-		$this->queryBuilder->addOrderBy(
-			$this->helper->quoteColumnName($sort),
-			$order
-		);
-
-		return $this;
-	}
-
-	/**
-	 * Gets a query part by its name.
-	 *
-	 * @param string $queryPartName
-	 *
-	 * @return mixed
-	 */
-	public function getQueryPart($queryPartName) {
-		return $this->queryBuilder->getQueryPart($queryPartName);
-	}
-
-	/**
-	 * Gets all query parts.
-	 *
-	 * @return array
-	 */
-	public function getQueryParts() {
-		return $this->queryBuilder->getQueryParts();
-	}
-
-	/**
-	 * Resets SQL parts.
-	 *
-	 * @param array|null $queryPartNames
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function resetQueryParts($queryPartNames = null) {
-		$this->queryBuilder->resetQueryParts($queryPartNames);
-
-		return $this;
-	}
-
-	/**
-	 * Resets a single SQL part.
-	 *
-	 * @param string $queryPartName
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
-	 */
-	public function resetQueryPart($queryPartName) {
-		$this->queryBuilder->resetQueryPart($queryPartName);
-
-		return $this;
-	}
-
-	/**
-	 * Creates a new named parameter and bind the value $value to it.
-	 *
-	 * This method provides a shortcut for PDOStatement::bindValue
-	 * when using prepared statements.
-	 *
-	 * The parameter $value specifies the value that you want to bind. If
-	 * $placeholder is not provided bindValue() will automatically create a
-	 * placeholder for you. An automatic placeholder will be of the name
-	 * ':dcValue1', ':dcValue2' etc.
-	 *
-	 * For more information see {@link http://php.net/pdostatement-bindparam}
-	 *
-	 * Example:
-	 * <code>
-	 * $value = 2;
-	 * $q->eq( 'id', $q->bindValue( $value ) );
-	 * $stmt = $q->executeQuery(); // executed with 'id = 2'
-	 * </code>
-	 *
-	 * @license New BSD License
-	 * @link http://www.zetacomponents.org
-	 *
-	 * @param mixed $value
-	 * @param mixed $type
-	 * @param string $placeHolder The name to bind with. The string must start with a colon ':'.
-	 *
-	 * @return IParameter the placeholder name used.
-	 */
-	public function createNamedParameter($value, $type = IQueryBuilder::PARAM_STR, $placeHolder = null) {
-		return new Parameter($this->queryBuilder->createNamedParameter($value, $type, $placeHolder));
-	}
-
-	/**
-	 * Creates a new positional parameter and bind the given value to it.
-	 *
-	 * Attention: If you are using positional parameters with the query builder you have
-	 * to be very careful to bind all parameters in the order they appear in the SQL
-	 * statement , otherwise they get bound in the wrong order which can lead to serious
-	 * bugs in your code.
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select('u.*')
-	 *     ->from('users', 'u')
-	 *     ->where('u.username = ' . $qb->createPositionalParameter('Foo', IQueryBuilder::PARAM_STR))
-	 *     ->orWhere('u.username = ' . $qb->createPositionalParameter('Bar', IQueryBuilder::PARAM_STR))
-	 * </code>
-	 *
-	 * @param mixed $value
-	 * @param integer $type
-	 *
-	 * @return IParameter
-	 */
-	public function createPositionalParameter($value, $type = IQueryBuilder::PARAM_STR) {
-		return new Parameter($this->queryBuilder->createPositionalParameter($value, $type));
-	}
-
-	/**
-	 * Creates a new parameter
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select('u.*')
-	 *     ->from('users', 'u')
-	 *     ->where('u.username = ' . $qb->createParameter('name'))
-	 *     ->setParameter('name', 'Bar', IQueryBuilder::PARAM_STR))
-	 * </code>
-	 *
-	 * @param string $name
-	 *
-	 * @return IParameter
-	 */
-	public function createParameter($name) {
-		return new Parameter(':' . $name);
-	}
-
-	/**
-	 * Creates a new function
-	 *
-	 * Attention: Column names inside the call have to be quoted before hand
-	 *
-	 * Example:
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select($qb->createFunction('COUNT(*)'))
-	 *     ->from('users', 'u')
-	 *  echo $qb->getSQL(); // SELECT COUNT(*) FROM `users` u
-	 * </code>
-	 * <code>
-	 *  $qb = $conn->getQueryBuilder();
-	 *  $qb->select($qb->createFunction('COUNT(`column`)'))
-	 *     ->from('users', 'u')
-	 *  echo $qb->getSQL(); // SELECT COUNT(`column`) FROM `users` u
-	 * </code>
-	 *
-	 * @param string $call
-	 *
-	 * @return IQueryFunction
-	 */
-	public function createFunction($call) {
-		return new QueryFunction($call);
-	}
-
-	/**
-	 * Used to get the id of the last inserted element
-	 * @return int
-	 * @throws \BadMethodCallException When being called before an insert query has been run.
-	 */
-	public function getLastInsertId() {
-		if ($this->getType() === \Doctrine\DBAL\Query\QueryBuilder::INSERT && $this->lastInsertedTable) {
-			// lastInsertId() needs the prefix but no quotes
-			$table = $this->prefixTableName($this->lastInsertedTable);
-			return (int) $this->connection->lastInsertId($table);
-		}
-
-		throw new \BadMethodCallException('Invalid call to getLastInsertId without using insert() before.');
-	}
-
-	/**
-	 * Returns the table name quoted and with database prefix as needed by the implementation
-	 *
-	 * @param string $table
-	 * @return string
-	 */
-	public function getTableName($table) {
-		$table = $this->prefixTableName($table);
-		return $this->helper->quoteColumnName($table);
-	}
-
-	/**
-	 * Returns the table name with database prefix as needed by the implementation
-	 *
-	 * @param string $table
-	 * @return string
-	 */
-	protected function prefixTableName($table) {
-		if ($this->automaticTablePrefix === false || strpos($table, '*PREFIX*') === 0) {
-			return $table;
-		}
-
-		return '*PREFIX*' . $table;
-	}
-
-	/**
-	 * Returns the column name quoted and with table alias prefix as needed by the implementation
-	 *
-	 * @param string $column
-	 * @param string $tableAlias
-	 * @return string
-	 */
-	public function getColumnName($column, $tableAlias = '') {
-		if ($tableAlias !== '') {
-			$tableAlias .= '.';
-		}
-
-		return $this->helper->quoteColumnName($tableAlias . $column);
-	}
+    /** @var \OCP\IDBConnection */
+    private $connection;
+
+    /** @var SystemConfig */
+    private $systemConfig;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var \Doctrine\DBAL\Query\QueryBuilder */
+    private $queryBuilder;
+
+    /** @var QuoteHelper */
+    private $helper;
+
+    /** @var bool */
+    private $automaticTablePrefix = true;
+
+    /** @var string */
+    protected $lastInsertedTable;
+
+    /**
+     * Initializes a new QueryBuilder.
+     *
+     * @param IDBConnection $connection
+     * @param SystemConfig $systemConfig
+     * @param ILogger $logger
+     */
+    public function __construct(IDBConnection $connection, SystemConfig $systemConfig, ILogger $logger) {
+        $this->connection = $connection;
+        $this->systemConfig = $systemConfig;
+        $this->logger = $logger;
+        $this->queryBuilder = new \Doctrine\DBAL\Query\QueryBuilder($this->connection);
+        $this->helper = new QuoteHelper();
+    }
+
+    /**
+     * Enable/disable automatic prefixing of table names with the oc_ prefix
+     *
+     * @param bool $enabled If set to true table names will be prefixed with the
+     * owncloud database prefix automatically.
+     * @since 8.2.0
+     */
+    public function automaticTablePrefix($enabled) {
+        $this->automaticTablePrefix = (bool) $enabled;
+    }
+
+    /**
+     * Gets an ExpressionBuilder used for object-oriented construction of query expressions.
+     * This producer method is intended for convenient inline usage. Example:
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where($qb->expr()->eq('u.id', 1));
+     * </code>
+     *
+     * For more complex expression construction, consider storing the expression
+     * builder object in a local variable.
+     *
+     * @return \OCP\DB\QueryBuilder\IExpressionBuilder
+     */
+    public function expr() {
+        if ($this->connection instanceof OracleConnection) {
+            return new OCIExpressionBuilder($this->connection);
+        } else if ($this->connection->getDatabasePlatform() instanceof PostgreSqlPlatform) {
+            return new PgSqlExpressionBuilder($this->connection);
+        } else if ($this->connection->getDatabasePlatform() instanceof MySqlPlatform) {
+            return new MySqlExpressionBuilder($this->connection);
+        } else if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
+            return new SqliteExpressionBuilder($this->connection);
+        } else {
+            return new ExpressionBuilder($this->connection);
+        }
+    }
+
+    /**
+     * Gets an FunctionBuilder used for object-oriented construction of query functions.
+     * This producer method is intended for convenient inline usage. Example:
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where($qb->fun()->md5('u.id'));
+     * </code>
+     *
+     * For more complex function construction, consider storing the function
+     * builder object in a local variable.
+     *
+     * @return \OCP\DB\QueryBuilder\IFunctionBuilder
+     */
+    public function fun() {
+        if ($this->connection instanceof OracleConnection) {
+            return new OCIFunctionBuilder($this->helper);
+        } else if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
+            return new SqliteFunctionBuilder($this->helper);
+        } else if ($this->connection->getDatabasePlatform() instanceof PostgreSqlPlatform) {
+            return new PgSqlFunctionBuilder($this->helper);
+        } else {
+            return new FunctionBuilder($this->helper);
+        }
+    }
+
+    /**
+     * Gets the type of the currently built query.
+     *
+     * @return integer
+     */
+    public function getType() {
+        return $this->queryBuilder->getType();
+    }
+
+    /**
+     * Gets the associated DBAL Connection for this query builder.
+     *
+     * @return \OCP\IDBConnection
+     */
+    public function getConnection() {
+        return $this->connection;
+    }
+
+    /**
+     * Gets the state of this query builder instance.
+     *
+     * @return integer Either QueryBuilder::STATE_DIRTY or QueryBuilder::STATE_CLEAN.
+     */
+    public function getState() {
+        return $this->queryBuilder->getState();
+    }
+
+    /**
+     * Executes this query using the bound parameters and their types.
+     *
+     * Uses {@see Connection::executeQuery} for select statements and {@see Connection::executeUpdate}
+     * for insert, update and delete statements.
+     *
+     * @return \Doctrine\DBAL\Driver\Statement|int
+     */
+    public function execute() {
+        if ($this->systemConfig->getValue('log_query', false)) {
+            $params = [];
+            foreach ($this->getParameters() as $placeholder => $value) {
+                if (is_array($value)) {
+                    $params[] = $placeholder . ' => (\'' . implode('\', \'', $value) . '\')';
+                } else {
+                    $params[] = $placeholder . ' => \'' . $value . '\'';
+                }
+            }
+            if (empty($params)) {
+                $this->logger->debug('DB QueryBuilder: \'{query}\'', [
+                    'query' => $this->getSQL(),
+                    'app' => 'core',
+                ]);
+            } else {
+                $this->logger->debug('DB QueryBuilder: \'{query}\' with parameters: {params}', [
+                    'query' => $this->getSQL(),
+                    'params' => implode(', ', $params),
+                    'app' => 'core',
+                ]);
+            }
+        }
+
+        return $this->queryBuilder->execute();
+    }
+
+    /**
+     * Gets the complete SQL string formed by the current specifications of this QueryBuilder.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('User', 'u')
+     *     echo $qb->getSQL(); // SELECT u FROM User u
+     * </code>
+     *
+     * @return string The SQL query string.
+     */
+    public function getSQL() {
+        return $this->queryBuilder->getSQL();
+    }
+
+    /**
+     * Sets a query parameter for the query being constructed.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.id = :user_id')
+     *         ->setParameter(':user_id', 1);
+     * </code>
+     *
+     * @param string|integer $key The parameter position or name.
+     * @param mixed $value The parameter value.
+     * @param string|null $type One of the IQueryBuilder::PARAM_* constants.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function setParameter($key, $value, $type = null) {
+        $this->queryBuilder->setParameter($key, $value, $type);
+
+        return $this;
+    }
+
+    /**
+     * Sets a collection of query parameters for the query being constructed.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.id = :user_id1 OR u.id = :user_id2')
+     *         ->setParameters(array(
+     *             ':user_id1' => 1,
+     *             ':user_id2' => 2
+     *         ));
+     * </code>
+     *
+     * @param array $params The query parameters to set.
+     * @param array $types The query parameters types to set.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function setParameters(array $params, array $types = array()) {
+        $this->queryBuilder->setParameters($params, $types);
+
+        return $this;
+    }
+
+    /**
+     * Gets all defined query parameters for the query being constructed indexed by parameter index or name.
+     *
+     * @return array The currently defined query parameters indexed by parameter index or name.
+     */
+    public function getParameters() {
+        return $this->queryBuilder->getParameters();
+    }
+
+    /**
+     * Gets a (previously set) query parameter of the query being constructed.
+     *
+     * @param mixed $key The key (index or name) of the bound parameter.
+     *
+     * @return mixed The value of the bound parameter.
+     */
+    public function getParameter($key) {
+        return $this->queryBuilder->getParameter($key);
+    }
+
+    /**
+     * Gets all defined query parameter types for the query being constructed indexed by parameter index or name.
+     *
+     * @return array The currently defined query parameter types indexed by parameter index or name.
+     */
+    public function getParameterTypes() {
+        return $this->queryBuilder->getParameterTypes();
+    }
+
+    /**
+     * Gets a (previously set) query parameter type of the query being constructed.
+     *
+     * @param mixed $key The key (index or name) of the bound parameter type.
+     *
+     * @return mixed The value of the bound parameter type.
+     */
+    public function getParameterType($key) {
+        return $this->queryBuilder->getParameterType($key);
+    }
+
+    /**
+     * Sets the position of the first result to retrieve (the "offset").
+     *
+     * @param integer $firstResult The first result to return.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function setFirstResult($firstResult) {
+        $this->queryBuilder->setFirstResult($firstResult);
+
+        return $this;
+    }
+
+    /**
+     * Gets the position of the first result the query object was set to retrieve (the "offset").
+     * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder.
+     *
+     * @return integer The position of the first result.
+     */
+    public function getFirstResult() {
+        return $this->queryBuilder->getFirstResult();
+    }
+
+    /**
+     * Sets the maximum number of results to retrieve (the "limit").
+     *
+     * NOTE: Setting max results to "0" will cause mixed behaviour. While most
+     * of the databases will just return an empty result set, Oracle will return
+     * all entries.
+     *
+     * @param integer $maxResults The maximum number of results to retrieve.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function setMaxResults($maxResults) {
+        $this->queryBuilder->setMaxResults($maxResults);
+
+        return $this;
+    }
+
+    /**
+     * Gets the maximum number of results the query object was set to retrieve (the "limit").
+     * Returns NULL if {@link setMaxResults} was not applied to this query builder.
+     *
+     * @return integer The maximum number of results.
+     */
+    public function getMaxResults() {
+        return $this->queryBuilder->getMaxResults();
+    }
+
+    /**
+     * Specifies an item that is to be returned in the query result.
+     * Replaces any previously specified selections, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id', 'p.id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed $select The selection expressions.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function select($select = null) {
+        $selects = is_array($select) ? $select : func_get_args();
+
+        $this->queryBuilder->select(
+            $this->helper->quoteColumnNames($selects)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies an item that is to be returned with a different name in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->selectAlias('u.id', 'user_id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed $select The selection expressions.
+     * @param string $alias The column alias used in the constructed query.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function selectAlias($select, $alias) {
+
+        $this->queryBuilder->addSelect(
+            $this->helper->quoteColumnName($select) . ' AS ' . $this->helper->quoteColumnName($alias)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies an item that is to be returned uniquely in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->selectDistinct('type')
+     *         ->from('users');
+     * </code>
+     *
+     * @param mixed $select The selection expressions.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function selectDistinct($select) {
+
+        $this->queryBuilder->addSelect(
+            'DISTINCT ' . $this->helper->quoteColumnName($select)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds an item that is to be returned in the query result.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id')
+     *         ->addSelect('p.id')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'u.id = p.user_id');
+     * </code>
+     *
+     * @param mixed $select The selection expression.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function addSelect($select = null) {
+        $selects = is_array($select) ? $select : func_get_args();
+
+        $this->queryBuilder->addSelect(
+            $this->helper->quoteColumnNames($selects)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Turns the query being built into a bulk delete query that ranges over
+     * a certain table.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->delete('users', 'u')
+     *         ->where('u.id = :user_id');
+     *         ->setParameter(':user_id', 1);
+     * </code>
+     *
+     * @param string $delete The table whose rows are subject to the deletion.
+     * @param string $alias The table alias used in the constructed query.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function delete($delete = null, $alias = null) {
+        $this->queryBuilder->delete(
+            $this->getTableName($delete),
+            $alias
+        );
+
+        return $this;
+    }
+
+    /**
+     * Turns the query being built into a bulk update query that ranges over
+     * a certain table
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where('u.id = ?');
+     * </code>
+     *
+     * @param string $update The table whose rows are subject to the update.
+     * @param string $alias The table alias used in the constructed query.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function update($update = null, $alias = null) {
+        $this->queryBuilder->update(
+            $this->getTableName($update),
+            $alias
+        );
+
+        return $this;
+    }
+
+    /**
+     * Turns the query being built into an insert query that inserts into
+     * a certain table
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?',
+     *                 'password' => '?'
+     *             )
+     *         );
+     * </code>
+     *
+     * @param string $insert The table into which the rows should be inserted.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function insert($insert = null) {
+        $this->queryBuilder->insert(
+            $this->getTableName($insert)
+        );
+
+        $this->lastInsertedTable = $insert;
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a query root corresponding to the table identified by the
+     * given alias, forming a cartesian product with any existing query roots.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.id')
+     *         ->from('users', 'u')
+     * </code>
+     *
+     * @param string $from The table.
+     * @param string|null $alias The alias of the table.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function from($from, $alias = null) {
+        $this->queryBuilder->from(
+            $this->getTableName($from),
+            $alias
+        );
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->join('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string $condition The condition for the join.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function join($fromAlias, $join, $alias, $condition = null) {
+        $this->queryBuilder->join(
+            $fromAlias,
+            $this->getTableName($join),
+            $alias,
+            $condition
+        );
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->innerJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string $condition The condition for the join.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function innerJoin($fromAlias, $join, $alias, $condition = null) {
+        $this->queryBuilder->innerJoin(
+            $fromAlias,
+            $this->getTableName($join),
+            $alias,
+            $condition
+        );
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a left join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->leftJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string $condition The condition for the join.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function leftJoin($fromAlias, $join, $alias, $condition = null) {
+        $this->queryBuilder->leftJoin(
+            $fromAlias,
+            $this->getTableName($join),
+            $alias,
+            $condition
+        );
+
+        return $this;
+    }
+
+    /**
+     * Creates and adds a right join to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->rightJoin('u', 'phonenumbers', 'p', 'p.is_primary = 1');
+     * </code>
+     *
+     * @param string $fromAlias The alias that points to a from clause.
+     * @param string $join The table name to join.
+     * @param string $alias The alias of the join table.
+     * @param string $condition The condition for the join.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function rightJoin($fromAlias, $join, $alias, $condition = null) {
+        $this->queryBuilder->rightJoin(
+            $fromAlias,
+            $this->getTableName($join),
+            $alias,
+            $condition
+        );
+
+        return $this;
+    }
+
+    /**
+     * Sets a new value for a column in a bulk update query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where('u.id = ?');
+     * </code>
+     *
+     * @param string $key The column to set.
+     * @param string $value The value, expression, placeholder, etc.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function set($key, $value) {
+        $this->queryBuilder->set(
+            $this->helper->quoteColumnName($key),
+            $this->helper->quoteColumnName($value)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies one or more restrictions to the query result.
+     * Replaces any previously specified restrictions, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->where('u.id = ?');
+     *
+     *     // You can optionally programatically build and/or expressions
+     *     $qb = $conn->getQueryBuilder();
+     *
+     *     $or = $qb->expr()->orx();
+     *     $or->add($qb->expr()->eq('u.id', 1));
+     *     $or->add($qb->expr()->eq('u.id', 2));
+     *
+     *     $qb->update('users', 'u')
+     *         ->set('u.password', md5('password'))
+     *         ->where($or);
+     * </code>
+     *
+     * @param mixed $predicates The restriction predicates.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function where($predicates) {
+        call_user_func_array(
+            [$this->queryBuilder, 'where'],
+            func_get_args()
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds one or more restrictions to the query results, forming a logical
+     * conjunction with any previously specified restrictions.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u')
+     *         ->from('users', 'u')
+     *         ->where('u.username LIKE ?')
+     *         ->andWhere('u.is_active = 1');
+     * </code>
+     *
+     * @param mixed $where The query restrictions.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     *
+     * @see where()
+     */
+    public function andWhere($where) {
+        call_user_func_array(
+            [$this->queryBuilder, 'andWhere'],
+            func_get_args()
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds one or more restrictions to the query results, forming a logical
+     * disjunction with any previously specified restrictions.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->where('u.id = 1')
+     *         ->orWhere('u.id = 2');
+     * </code>
+     *
+     * @param mixed $where The WHERE statement.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     *
+     * @see where()
+     */
+    public function orWhere($where) {
+        call_user_func_array(
+            [$this->queryBuilder, 'orWhere'],
+            func_get_args()
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies a grouping over the results of the query.
+     * Replaces any previously specified groupings, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->groupBy('u.id');
+     * </code>
+     *
+     * @param mixed $groupBy The grouping expression.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function groupBy($groupBy) {
+        $groupBys = is_array($groupBy) ? $groupBy : func_get_args();
+
+        call_user_func_array(
+            [$this->queryBuilder, 'groupBy'],
+            $this->helper->quoteColumnNames($groupBys)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds a grouping expression to the query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->select('u.name')
+     *         ->from('users', 'u')
+     *         ->groupBy('u.lastLogin');
+     *         ->addGroupBy('u.createdAt')
+     * </code>
+     *
+     * @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();
+
+        call_user_func_array(
+            [$this->queryBuilder, 'addGroupBy'],
+            $this->helper->quoteColumnNames($groupBys)
+        );
+
+        return $this;
+    }
+
+    /**
+     * Sets a value for a column in an insert query.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?'
+     *             )
+     *         )
+     *         ->setValue('password', '?');
+     * </code>
+     *
+     * @param string $column The column into which the value should be inserted.
+     * @param string $value The value that should be inserted into the column.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function setValue($column, $value) {
+        $this->queryBuilder->setValue(
+            $this->helper->quoteColumnName($column),
+            $value
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies values for an insert query indexed by column names.
+     * Replaces any previous values, if any.
+     *
+     * <code>
+     *     $qb = $conn->getQueryBuilder()
+     *         ->insert('users')
+     *         ->values(
+     *             array(
+     *                 'name' => '?',
+     *                 'password' => '?'
+     *             )
+     *         );
+     * </code>
+     *
+     * @param array $values The values to specify for the insert query indexed by column names.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function values(array $values) {
+        $quotedValues = [];
+        foreach ($values as $key => $value) {
+            $quotedValues[$this->helper->quoteColumnName($key)] = $value;
+        }
+
+        $this->queryBuilder->values($quotedValues);
+
+        return $this;
+    }
+
+    /**
+     * Specifies a restriction over the groups of the query.
+     * Replaces any previous having restrictions, if any.
+     *
+     * @param mixed $having The restriction over the groups.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function having($having) {
+        call_user_func_array(
+            [$this->queryBuilder, 'having'],
+            func_get_args()
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds a restriction over the groups of the query, forming a logical
+     * conjunction with any existing having restrictions.
+     *
+     * @param mixed $having The restriction to append.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function andHaving($having) {
+        call_user_func_array(
+            [$this->queryBuilder, 'andHaving'],
+            func_get_args()
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds a restriction over the groups of the query, forming a logical
+     * disjunction with any existing having restrictions.
+     *
+     * @param mixed $having The restriction to add.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function orHaving($having) {
+        call_user_func_array(
+            [$this->queryBuilder, 'orHaving'],
+            func_get_args()
+        );
+
+        return $this;
+    }
+
+    /**
+     * Specifies an ordering for the query results.
+     * Replaces any previously specified orderings, if any.
+     *
+     * @param string $sort The ordering expression.
+     * @param string $order The ordering direction.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function orderBy($sort, $order = null) {
+        $this->queryBuilder->orderBy(
+            $this->helper->quoteColumnName($sort),
+            $order
+        );
+
+        return $this;
+    }
+
+    /**
+     * Adds an ordering to the query results.
+     *
+     * @param string $sort The ordering expression.
+     * @param string $order The ordering direction.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function addOrderBy($sort, $order = null) {
+        $this->queryBuilder->addOrderBy(
+            $this->helper->quoteColumnName($sort),
+            $order
+        );
+
+        return $this;
+    }
+
+    /**
+     * Gets a query part by its name.
+     *
+     * @param string $queryPartName
+     *
+     * @return mixed
+     */
+    public function getQueryPart($queryPartName) {
+        return $this->queryBuilder->getQueryPart($queryPartName);
+    }
+
+    /**
+     * Gets all query parts.
+     *
+     * @return array
+     */
+    public function getQueryParts() {
+        return $this->queryBuilder->getQueryParts();
+    }
+
+    /**
+     * Resets SQL parts.
+     *
+     * @param array|null $queryPartNames
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function resetQueryParts($queryPartNames = null) {
+        $this->queryBuilder->resetQueryParts($queryPartNames);
+
+        return $this;
+    }
+
+    /**
+     * Resets a single SQL part.
+     *
+     * @param string $queryPartName
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder This QueryBuilder instance.
+     */
+    public function resetQueryPart($queryPartName) {
+        $this->queryBuilder->resetQueryPart($queryPartName);
+
+        return $this;
+    }
+
+    /**
+     * Creates a new named parameter and bind the value $value to it.
+     *
+     * This method provides a shortcut for PDOStatement::bindValue
+     * when using prepared statements.
+     *
+     * The parameter $value specifies the value that you want to bind. If
+     * $placeholder is not provided bindValue() will automatically create a
+     * placeholder for you. An automatic placeholder will be of the name
+     * ':dcValue1', ':dcValue2' etc.
+     *
+     * For more information see {@link http://php.net/pdostatement-bindparam}
+     *
+     * Example:
+     * <code>
+     * $value = 2;
+     * $q->eq( 'id', $q->bindValue( $value ) );
+     * $stmt = $q->executeQuery(); // executed with 'id = 2'
+     * </code>
+     *
+     * @license New BSD License
+     * @link http://www.zetacomponents.org
+     *
+     * @param mixed $value
+     * @param mixed $type
+     * @param string $placeHolder The name to bind with. The string must start with a colon ':'.
+     *
+     * @return IParameter the placeholder name used.
+     */
+    public function createNamedParameter($value, $type = IQueryBuilder::PARAM_STR, $placeHolder = null) {
+        return new Parameter($this->queryBuilder->createNamedParameter($value, $type, $placeHolder));
+    }
+
+    /**
+     * Creates a new positional parameter and bind the given value to it.
+     *
+     * Attention: If you are using positional parameters with the query builder you have
+     * to be very careful to bind all parameters in the order they appear in the SQL
+     * statement , otherwise they get bound in the wrong order which can lead to serious
+     * bugs in your code.
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select('u.*')
+     *     ->from('users', 'u')
+     *     ->where('u.username = ' . $qb->createPositionalParameter('Foo', IQueryBuilder::PARAM_STR))
+     *     ->orWhere('u.username = ' . $qb->createPositionalParameter('Bar', IQueryBuilder::PARAM_STR))
+     * </code>
+     *
+     * @param mixed $value
+     * @param integer $type
+     *
+     * @return IParameter
+     */
+    public function createPositionalParameter($value, $type = IQueryBuilder::PARAM_STR) {
+        return new Parameter($this->queryBuilder->createPositionalParameter($value, $type));
+    }
+
+    /**
+     * Creates a new parameter
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select('u.*')
+     *     ->from('users', 'u')
+     *     ->where('u.username = ' . $qb->createParameter('name'))
+     *     ->setParameter('name', 'Bar', IQueryBuilder::PARAM_STR))
+     * </code>
+     *
+     * @param string $name
+     *
+     * @return IParameter
+     */
+    public function createParameter($name) {
+        return new Parameter(':' . $name);
+    }
+
+    /**
+     * Creates a new function
+     *
+     * Attention: Column names inside the call have to be quoted before hand
+     *
+     * Example:
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select($qb->createFunction('COUNT(*)'))
+     *     ->from('users', 'u')
+     *  echo $qb->getSQL(); // SELECT COUNT(*) FROM `users` u
+     * </code>
+     * <code>
+     *  $qb = $conn->getQueryBuilder();
+     *  $qb->select($qb->createFunction('COUNT(`column`)'))
+     *     ->from('users', 'u')
+     *  echo $qb->getSQL(); // SELECT COUNT(`column`) FROM `users` u
+     * </code>
+     *
+     * @param string $call
+     *
+     * @return IQueryFunction
+     */
+    public function createFunction($call) {
+        return new QueryFunction($call);
+    }
+
+    /**
+     * Used to get the id of the last inserted element
+     * @return int
+     * @throws \BadMethodCallException When being called before an insert query has been run.
+     */
+    public function getLastInsertId() {
+        if ($this->getType() === \Doctrine\DBAL\Query\QueryBuilder::INSERT && $this->lastInsertedTable) {
+            // lastInsertId() needs the prefix but no quotes
+            $table = $this->prefixTableName($this->lastInsertedTable);
+            return (int) $this->connection->lastInsertId($table);
+        }
+
+        throw new \BadMethodCallException('Invalid call to getLastInsertId without using insert() before.');
+    }
+
+    /**
+     * Returns the table name quoted and with database prefix as needed by the implementation
+     *
+     * @param string $table
+     * @return string
+     */
+    public function getTableName($table) {
+        $table = $this->prefixTableName($table);
+        return $this->helper->quoteColumnName($table);
+    }
+
+    /**
+     * Returns the table name with database prefix as needed by the implementation
+     *
+     * @param string $table
+     * @return string
+     */
+    protected function prefixTableName($table) {
+        if ($this->automaticTablePrefix === false || strpos($table, '*PREFIX*') === 0) {
+            return $table;
+        }
+
+        return '*PREFIX*' . $table;
+    }
+
+    /**
+     * Returns the column name quoted and with table alias prefix as needed by the implementation
+     *
+     * @param string $column
+     * @param string $tableAlias
+     * @return string
+     */
+    public function getColumnName($column, $tableAlias = '') {
+        if ($tableAlias !== '') {
+            $tableAlias .= '.';
+        }
+
+        return $this->helper->quoteColumnName($tableAlias . $column);
+    }
 }

lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php

Indentation +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@
 use OC\DB\QueryBuilder\QueryFunction;
 
 class OCIFunctionBuilder extends FunctionBuilder {
-	public function md5($input) {
-		return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))');
-	}
+    public function md5($input) {
+        return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))');
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -25,6 +25,6 @@
 
 class OCIFunctionBuilder extends FunctionBuilder {
 	public function md5($input) {
-		return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))');
+		return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw('.$this->helper->quoteColumnName($input).')))');
 	}
 }

lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php

Indentation +23 added lines, -23 removed lines

@@ -26,31 +26,31 @@
 use OCP\DB\QueryBuilder\IFunctionBuilder;
 
 class FunctionBuilder implements IFunctionBuilder {
-	/** @var QuoteHelper */
-	protected $helper;
+    /** @var QuoteHelper */
+    protected $helper;
 
-	/**
-	 * ExpressionBuilder constructor.
-	 *
-	 * @param QuoteHelper $helper
-	 */
-	public function __construct(QuoteHelper $helper) {
-		$this->helper = $helper;
-	}
+    /**
+     * ExpressionBuilder constructor.
+     *
+     * @param QuoteHelper $helper
+     */
+    public function __construct(QuoteHelper $helper) {
+        $this->helper = $helper;
+    }
 
-	public function md5($input) {
-		return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
-	}
+    public function md5($input) {
+        return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
+    }
 
-	public function concat($x, $y) {
-		return new QueryFunction('CONCAT(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
-	}
+    public function concat($x, $y) {
+        return new QueryFunction('CONCAT(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+    }
 
-	public function substring($input, $start, $length = null) {
-		if ($length) {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
-		} else {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
-		}
-	}
+    public function substring($input, $start, $length = null) {
+        if ($length) {
+            return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
+        } else {
+            return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
+        }
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -39,18 +39,18 @@
 	}
 
 	public function md5($input) {
-		return new QueryFunction('MD5(' . $this->helper->quoteColumnName($input) . ')');
+		return new QueryFunction('MD5('.$this->helper->quoteColumnName($input).')');
 	}
 
 	public function concat($x, $y) {
-		return new QueryFunction('CONCAT(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
+		return new QueryFunction('CONCAT('.$this->helper->quoteColumnName($x).', '.$this->helper->quoteColumnName($y).')');
 	}
 
 	public function substring($input, $start, $length = null) {
 		if ($length) {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ', ' . $this->helper->quoteColumnName($length) . ')');
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).', '.$this->helper->quoteColumnName($length).')');
 		} else {
-			return new QueryFunction('SUBSTR(' . $this->helper->quoteColumnName($input) . ', ' . $this->helper->quoteColumnName($start) . ')');
+			return new QueryFunction('SUBSTR('.$this->helper->quoteColumnName($input).', '.$this->helper->quoteColumnName($start).')');
 		}
 	}
 }

lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php

Indentation +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@
 use OC\DB\QueryBuilder\QueryFunction;
 
 class SqliteFunctionBuilder extends FunctionBuilder {
-	public function concat($x, $y) {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y));
-	}
+    public function concat($x, $y) {
+        return new QueryFunction($this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y));
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -25,6 +25,6 @@
 
 class SqliteFunctionBuilder extends FunctionBuilder {
 	public function concat($x, $y) {
-		return new QueryFunction($this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y));
+		return new QueryFunction($this->helper->quoteColumnName($x).' || '.$this->helper->quoteColumnName($y));
 	}
 }