nextcloud / server

lib/public/DB/QueryBuilder/IFunctionBuilder.php

Indentation +47 added lines, -47 removed lines

@@ -29,55 +29,55 @@
  * @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);
 
-	/**
-	 * Takes the sum of all rows in a column
-	 *
-	 * @param mixed $field the column to sum
-	 *
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function sum($field);
+    /**
+     * Takes the sum of all rows in a column
+     *
+     * @param mixed $field the column to sum
+     *
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function sum($field);
 
-	/**
-	 * Transforms a string field or value to lower case
-	 *
-	 * @param mixed $field
-	 * @return IQueryFunction
-	 * @since 13.0.0
-	 */
-	public function lower($field);
+    /**
+     * Transforms a string field or value to lower case
+     *
+     * @param mixed $field
+     * @return IQueryFunction
+     * @since 13.0.0
+     */
+    public function lower($field);
 }

lib/private/DB/Connection.php

Indentation +401 added lines, -401 removed lines

@@ -44,405 +44,405 @@
 use OCP\PreConditionNotMetException;
 
 class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
-	/**
-	 * @var string $tablePrefix
-	 */
-	protected $tablePrefix;
-
-	/**
-	 * @var \OC\DB\Adapter $adapter
-	 */
-	protected $adapter;
-
-	protected $lockedTable = null;
-
-	public function connect() {
-		try {
-			return parent::connect();
-		} catch (DBALException $e) {
-			// throw a new exception to prevent leaking info from the stacktrace
-			throw new DBALException('Failed to connect to the database: ' . $e->getMessage(), $e->getCode());
-		}
-	}
-
-	/**
-	 * Returns a QueryBuilder for the connection.
-	 *
-	 * @return \OCP\DB\QueryBuilder\IQueryBuilder
-	 */
-	public function getQueryBuilder() {
-		return new QueryBuilder(
-			$this,
-			\OC::$server->getSystemConfig(),
-			\OC::$server->getLogger()
-		);
-	}
-
-	/**
-	 * Gets the QueryBuilder for the connection.
-	 *
-	 * @return \Doctrine\DBAL\Query\QueryBuilder
-	 * @deprecated please use $this->getQueryBuilder() instead
-	 */
-	public function createQueryBuilder() {
-		$backtrace = $this->getCallerBacktrace();
-		\OC::$server->getLogger()->debug('Doctrine QueryBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
-		return parent::createQueryBuilder();
-	}
-
-	/**
-	 * Gets the ExpressionBuilder for the connection.
-	 *
-	 * @return \Doctrine\DBAL\Query\Expression\ExpressionBuilder
-	 * @deprecated please use $this->getQueryBuilder()->expr() instead
-	 */
-	public function getExpressionBuilder() {
-		$backtrace = $this->getCallerBacktrace();
-		\OC::$server->getLogger()->debug('Doctrine ExpressionBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
-		return parent::getExpressionBuilder();
-	}
-
-	/**
-	 * Get the file and line that called the method where `getCallerBacktrace()` was used
-	 *
-	 * @return string
-	 */
-	protected function getCallerBacktrace() {
-		$traces = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
-
-		// 0 is the method where we use `getCallerBacktrace`
-		// 1 is the target method which uses the method we want to log
-		if (isset($traces[1])) {
-			return $traces[1]['file'] . ':' . $traces[1]['line'];
-		}
-
-		return '';
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPrefix() {
-		return $this->tablePrefix;
-	}
-
-	/**
-	 * Initializes a new instance of the Connection class.
-	 *
-	 * @param array $params  The connection parameters.
-	 * @param \Doctrine\DBAL\Driver $driver
-	 * @param \Doctrine\DBAL\Configuration $config
-	 * @param \Doctrine\Common\EventManager $eventManager
-	 * @throws \Exception
-	 */
-	public function __construct(array $params, Driver $driver, Configuration $config = null,
-		EventManager $eventManager = null)
-	{
-		if (!isset($params['adapter'])) {
-			throw new \Exception('adapter not set');
-		}
-		if (!isset($params['tablePrefix'])) {
-			throw new \Exception('tablePrefix not set');
-		}
-		parent::__construct($params, $driver, $config, $eventManager);
-		$this->adapter = new $params['adapter']($this);
-		$this->tablePrefix = $params['tablePrefix'];
-
-		parent::setTransactionIsolation(parent::TRANSACTION_READ_COMMITTED);
-	}
-
-	/**
-	 * Prepares an SQL statement.
-	 *
-	 * @param string $statement The SQL statement to prepare.
-	 * @param int $limit
-	 * @param int $offset
-	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
-	 */
-	public function prepare( $statement, $limit=null, $offset=null ) {
-		if ($limit === -1) {
-			$limit = null;
-		}
-		if (!is_null($limit)) {
-			$platform = $this->getDatabasePlatform();
-			$statement = $platform->modifyLimitQuery($statement, $limit, $offset);
-		}
-		$statement = $this->replaceTablePrefix($statement);
-		$statement = $this->adapter->fixupStatement($statement);
-
-		return parent::prepare($statement);
-	}
-
-	/**
-	 * Executes an, optionally parametrized, SQL query.
-	 *
-	 * If the query is parametrized, a prepared statement is used.
-	 * If an SQLLogger is configured, the execution is logged.
-	 *
-	 * @param string                                      $query  The SQL query to execute.
-	 * @param array                                       $params The parameters to bind to the query, if any.
-	 * @param array                                       $types  The types the previous parameters are in.
-	 * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp    The query cache profile, optional.
-	 *
-	 * @return \Doctrine\DBAL\Driver\Statement The executed statement.
-	 *
-	 * @throws \Doctrine\DBAL\DBALException
-	 */
-	public function executeQuery($query, array $params = array(), $types = array(), QueryCacheProfile $qcp = null)
-	{
-		$query = $this->replaceTablePrefix($query);
-		$query = $this->adapter->fixupStatement($query);
-		return parent::executeQuery($query, $params, $types, $qcp);
-	}
-
-	/**
-	 * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
-	 * and returns the number of affected rows.
-	 *
-	 * This method supports PDO binding types as well as DBAL mapping types.
-	 *
-	 * @param string $query  The SQL query.
-	 * @param array  $params The query parameters.
-	 * @param array  $types  The parameter types.
-	 *
-	 * @return integer The number of affected rows.
-	 *
-	 * @throws \Doctrine\DBAL\DBALException
-	 */
-	public function executeUpdate($query, array $params = array(), array $types = array())
-	{
-		$query = $this->replaceTablePrefix($query);
-		$query = $this->adapter->fixupStatement($query);
-		return parent::executeUpdate($query, $params, $types);
-	}
-
-	/**
-	 * Returns the ID of the last inserted row, or the last value from a sequence object,
-	 * depending on the underlying driver.
-	 *
-	 * Note: This method may not return a meaningful or consistent result across different drivers,
-	 * because the underlying database may not even support the notion of AUTO_INCREMENT/IDENTITY
-	 * columns or sequences.
-	 *
-	 * @param string $seqName Name of the sequence object from which the ID should be returned.
-	 * @return string A string representation of the last inserted ID.
-	 */
-	public function lastInsertId($seqName = null) {
-		if ($seqName) {
-			$seqName = $this->replaceTablePrefix($seqName);
-		}
-		return $this->adapter->lastInsertId($seqName);
-	}
-
-	// internal use
-	public function realLastInsertId($seqName = null) {
-		return parent::lastInsertId($seqName);
-	}
-
-	/**
-	 * Insert a row if the matching row does not exists.
-	 *
-	 * @param string $table The table name (will replace *PREFIX* with the actual prefix)
-	 * @param array $input data that should be inserted into the table  (column name => value)
-	 * @param array|null $compare List of values that should be checked for "if not exists"
-	 *				If this is null or an empty array, all keys of $input will be compared
-	 *				Please note: text fields (clob) must not be used in the compare array
-	 * @return int number of inserted rows
-	 * @throws \Doctrine\DBAL\DBALException
-	 */
-	public function insertIfNotExist($table, $input, array $compare = null) {
-		return $this->adapter->insertIfNotExist($table, $input, $compare);
-	}
-
-	private function getType($value) {
-		if (is_bool($value)) {
-			return IQueryBuilder::PARAM_BOOL;
-		} else if (is_int($value)) {
-			return IQueryBuilder::PARAM_INT;
-		} else {
-			return IQueryBuilder::PARAM_STR;
-		}
-	}
-
-	/**
-	 * Insert or update a row value
-	 *
-	 * @param string $table
-	 * @param array $keys (column name => value)
-	 * @param array $values (column name => value)
-	 * @param array $updatePreconditionValues ensure values match preconditions (column name => value)
-	 * @return int number of new rows
-	 * @throws \Doctrine\DBAL\DBALException
-	 * @throws PreConditionNotMetException
-	 * @suppress SqlInjectionChecker
-	 */
-	public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []) {
-		try {
-			$insertQb = $this->getQueryBuilder();
-			$insertQb->insert($table)
-				->values(
-					array_map(function($value) use ($insertQb) {
-						return $insertQb->createNamedParameter($value, $this->getType($value));
-					}, array_merge($keys, $values))
-				);
-			return $insertQb->execute();
-		} catch (ConstraintViolationException $e) {
-			// value already exists, try update
-			$updateQb = $this->getQueryBuilder();
-			$updateQb->update($table);
-			foreach ($values as $name => $value) {
-				$updateQb->set($name, $updateQb->createNamedParameter($value, $this->getType($value)));
-			}
-			$where = $updateQb->expr()->andX();
-			$whereValues = array_merge($keys, $updatePreconditionValues);
-			foreach ($whereValues as $name => $value) {
-				$where->add($updateQb->expr()->eq(
-					$name,
-					$updateQb->createNamedParameter($value, $this->getType($value)),
-					$this->getType($value)
-				));
-			}
-			$updateQb->where($where);
-			$affected = $updateQb->execute();
-
-			if ($affected === 0 && !empty($updatePreconditionValues)) {
-				throw new PreConditionNotMetException();
-			}
-
-			return 0;
-		}
-	}
-
-	/**
-	 * Create an exclusive read+write lock on a table
-	 *
-	 * @param string $tableName
-	 * @throws \BadMethodCallException When trying to acquire a second lock
-	 * @since 9.1.0
-	 */
-	public function lockTable($tableName) {
-		if ($this->lockedTable !== null) {
-			throw new \BadMethodCallException('Can not lock a new table until the previous lock is released.');
-		}
-
-		$tableName = $this->tablePrefix . $tableName;
-		$this->lockedTable = $tableName;
-		$this->adapter->lockTable($tableName);
-	}
-
-	/**
-	 * Release a previous acquired lock again
-	 *
-	 * @since 9.1.0
-	 */
-	public function unlockTable() {
-		$this->adapter->unlockTable();
-		$this->lockedTable = null;
-	}
-
-	/**
-	 * returns the error code and message as a string for logging
-	 * works with DoctrineException
-	 * @return string
-	 */
-	public function getError() {
-		$msg = $this->errorCode() . ': ';
-		$errorInfo = $this->errorInfo();
-		if (is_array($errorInfo)) {
-			$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
-			$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
-			$msg .= 'Driver Message = '.$errorInfo[2];
-		}
-		return $msg;
-	}
-
-	/**
-	 * Drop a table from the database if it exists
-	 *
-	 * @param string $table table name without the prefix
-	 */
-	public function dropTable($table) {
-		$table = $this->tablePrefix . trim($table);
-		$schema = $this->getSchemaManager();
-		if($schema->tablesExist(array($table))) {
-			$schema->dropTable($table);
-		}
-	}
-
-	/**
-	 * Check if a table exists
-	 *
-	 * @param string $table table name without the prefix
-	 * @return bool
-	 */
-	public function tableExists($table){
-		$table = $this->tablePrefix . trim($table);
-		$schema = $this->getSchemaManager();
-		return $schema->tablesExist(array($table));
-	}
-
-	// internal use
-	/**
-	 * @param string $statement
-	 * @return string
-	 */
-	protected function replaceTablePrefix($statement) {
-		return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
-	}
-
-	/**
-	 * Check if a transaction is active
-	 *
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function inTransaction() {
-		return $this->getTransactionNestingLevel() > 0;
-	}
-
-	/**
-	 * Escape a parameter to be used in a LIKE query
-	 *
-	 * @param string $param
-	 * @return string
-	 */
-	public function escapeLikeParameter($param) {
-		return addcslashes($param, '\\_%');
-	}
-
-	/**
-	 * Check whether or not the current database support 4byte wide unicode
-	 *
-	 * @return bool
-	 * @since 11.0.0
-	 */
-	public function supports4ByteText() {
-		if (!$this->getDatabasePlatform() instanceof MySqlPlatform) {
-			return true;
-		}
-		return $this->getParams()['charset'] === 'utf8mb4';
-	}
-
-
-	/**
-	 * Create the schema of the connected database
-	 *
-	 * @return Schema
-	 */
-	public function createSchema() {
-		$schemaManager = new MDB2SchemaManager($this);
-		$migrator = $schemaManager->getMigrator();
-		return $migrator->createSchema();
-	}
-
-	/**
-	 * Migrate the database to the given schema
-	 *
-	 * @param Schema $toSchema
-	 */
-	public function migrateToSchema(Schema $toSchema) {
-		$schemaManager = new MDB2SchemaManager($this);
-		$migrator = $schemaManager->getMigrator();
-		$migrator->migrate($toSchema);
-	}
+    /**
+     * @var string $tablePrefix
+     */
+    protected $tablePrefix;
+
+    /**
+     * @var \OC\DB\Adapter $adapter
+     */
+    protected $adapter;
+
+    protected $lockedTable = null;
+
+    public function connect() {
+        try {
+            return parent::connect();
+        } catch (DBALException $e) {
+            // throw a new exception to prevent leaking info from the stacktrace
+            throw new DBALException('Failed to connect to the database: ' . $e->getMessage(), $e->getCode());
+        }
+    }
+
+    /**
+     * Returns a QueryBuilder for the connection.
+     *
+     * @return \OCP\DB\QueryBuilder\IQueryBuilder
+     */
+    public function getQueryBuilder() {
+        return new QueryBuilder(
+            $this,
+            \OC::$server->getSystemConfig(),
+            \OC::$server->getLogger()
+        );
+    }
+
+    /**
+     * Gets the QueryBuilder for the connection.
+     *
+     * @return \Doctrine\DBAL\Query\QueryBuilder
+     * @deprecated please use $this->getQueryBuilder() instead
+     */
+    public function createQueryBuilder() {
+        $backtrace = $this->getCallerBacktrace();
+        \OC::$server->getLogger()->debug('Doctrine QueryBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
+        return parent::createQueryBuilder();
+    }
+
+    /**
+     * Gets the ExpressionBuilder for the connection.
+     *
+     * @return \Doctrine\DBAL\Query\Expression\ExpressionBuilder
+     * @deprecated please use $this->getQueryBuilder()->expr() instead
+     */
+    public function getExpressionBuilder() {
+        $backtrace = $this->getCallerBacktrace();
+        \OC::$server->getLogger()->debug('Doctrine ExpressionBuilder retrieved in {backtrace}', ['app' => 'core', 'backtrace' => $backtrace]);
+        return parent::getExpressionBuilder();
+    }
+
+    /**
+     * Get the file and line that called the method where `getCallerBacktrace()` was used
+     *
+     * @return string
+     */
+    protected function getCallerBacktrace() {
+        $traces = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+
+        // 0 is the method where we use `getCallerBacktrace`
+        // 1 is the target method which uses the method we want to log
+        if (isset($traces[1])) {
+            return $traces[1]['file'] . ':' . $traces[1]['line'];
+        }
+
+        return '';
+    }
+
+    /**
+     * @return string
+     */
+    public function getPrefix() {
+        return $this->tablePrefix;
+    }
+
+    /**
+     * Initializes a new instance of the Connection class.
+     *
+     * @param array $params  The connection parameters.
+     * @param \Doctrine\DBAL\Driver $driver
+     * @param \Doctrine\DBAL\Configuration $config
+     * @param \Doctrine\Common\EventManager $eventManager
+     * @throws \Exception
+     */
+    public function __construct(array $params, Driver $driver, Configuration $config = null,
+        EventManager $eventManager = null)
+    {
+        if (!isset($params['adapter'])) {
+            throw new \Exception('adapter not set');
+        }
+        if (!isset($params['tablePrefix'])) {
+            throw new \Exception('tablePrefix not set');
+        }
+        parent::__construct($params, $driver, $config, $eventManager);
+        $this->adapter = new $params['adapter']($this);
+        $this->tablePrefix = $params['tablePrefix'];
+
+        parent::setTransactionIsolation(parent::TRANSACTION_READ_COMMITTED);
+    }
+
+    /**
+     * Prepares an SQL statement.
+     *
+     * @param string $statement The SQL statement to prepare.
+     * @param int $limit
+     * @param int $offset
+     * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
+     */
+    public function prepare( $statement, $limit=null, $offset=null ) {
+        if ($limit === -1) {
+            $limit = null;
+        }
+        if (!is_null($limit)) {
+            $platform = $this->getDatabasePlatform();
+            $statement = $platform->modifyLimitQuery($statement, $limit, $offset);
+        }
+        $statement = $this->replaceTablePrefix($statement);
+        $statement = $this->adapter->fixupStatement($statement);
+
+        return parent::prepare($statement);
+    }
+
+    /**
+     * Executes an, optionally parametrized, SQL query.
+     *
+     * If the query is parametrized, a prepared statement is used.
+     * If an SQLLogger is configured, the execution is logged.
+     *
+     * @param string                                      $query  The SQL query to execute.
+     * @param array                                       $params The parameters to bind to the query, if any.
+     * @param array                                       $types  The types the previous parameters are in.
+     * @param \Doctrine\DBAL\Cache\QueryCacheProfile|null $qcp    The query cache profile, optional.
+     *
+     * @return \Doctrine\DBAL\Driver\Statement The executed statement.
+     *
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function executeQuery($query, array $params = array(), $types = array(), QueryCacheProfile $qcp = null)
+    {
+        $query = $this->replaceTablePrefix($query);
+        $query = $this->adapter->fixupStatement($query);
+        return parent::executeQuery($query, $params, $types, $qcp);
+    }
+
+    /**
+     * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
+     * and returns the number of affected rows.
+     *
+     * This method supports PDO binding types as well as DBAL mapping types.
+     *
+     * @param string $query  The SQL query.
+     * @param array  $params The query parameters.
+     * @param array  $types  The parameter types.
+     *
+     * @return integer The number of affected rows.
+     *
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function executeUpdate($query, array $params = array(), array $types = array())
+    {
+        $query = $this->replaceTablePrefix($query);
+        $query = $this->adapter->fixupStatement($query);
+        return parent::executeUpdate($query, $params, $types);
+    }
+
+    /**
+     * Returns the ID of the last inserted row, or the last value from a sequence object,
+     * depending on the underlying driver.
+     *
+     * Note: This method may not return a meaningful or consistent result across different drivers,
+     * because the underlying database may not even support the notion of AUTO_INCREMENT/IDENTITY
+     * columns or sequences.
+     *
+     * @param string $seqName Name of the sequence object from which the ID should be returned.
+     * @return string A string representation of the last inserted ID.
+     */
+    public function lastInsertId($seqName = null) {
+        if ($seqName) {
+            $seqName = $this->replaceTablePrefix($seqName);
+        }
+        return $this->adapter->lastInsertId($seqName);
+    }
+
+    // internal use
+    public function realLastInsertId($seqName = null) {
+        return parent::lastInsertId($seqName);
+    }
+
+    /**
+     * Insert a row if the matching row does not exists.
+     *
+     * @param string $table The table name (will replace *PREFIX* with the actual prefix)
+     * @param array $input data that should be inserted into the table  (column name => value)
+     * @param array|null $compare List of values that should be checked for "if not exists"
+     *				If this is null or an empty array, all keys of $input will be compared
+     *				Please note: text fields (clob) must not be used in the compare array
+     * @return int number of inserted rows
+     * @throws \Doctrine\DBAL\DBALException
+     */
+    public function insertIfNotExist($table, $input, array $compare = null) {
+        return $this->adapter->insertIfNotExist($table, $input, $compare);
+    }
+
+    private function getType($value) {
+        if (is_bool($value)) {
+            return IQueryBuilder::PARAM_BOOL;
+        } else if (is_int($value)) {
+            return IQueryBuilder::PARAM_INT;
+        } else {
+            return IQueryBuilder::PARAM_STR;
+        }
+    }
+
+    /**
+     * Insert or update a row value
+     *
+     * @param string $table
+     * @param array $keys (column name => value)
+     * @param array $values (column name => value)
+     * @param array $updatePreconditionValues ensure values match preconditions (column name => value)
+     * @return int number of new rows
+     * @throws \Doctrine\DBAL\DBALException
+     * @throws PreConditionNotMetException
+     * @suppress SqlInjectionChecker
+     */
+    public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []) {
+        try {
+            $insertQb = $this->getQueryBuilder();
+            $insertQb->insert($table)
+                ->values(
+                    array_map(function($value) use ($insertQb) {
+                        return $insertQb->createNamedParameter($value, $this->getType($value));
+                    }, array_merge($keys, $values))
+                );
+            return $insertQb->execute();
+        } catch (ConstraintViolationException $e) {
+            // value already exists, try update
+            $updateQb = $this->getQueryBuilder();
+            $updateQb->update($table);
+            foreach ($values as $name => $value) {
+                $updateQb->set($name, $updateQb->createNamedParameter($value, $this->getType($value)));
+            }
+            $where = $updateQb->expr()->andX();
+            $whereValues = array_merge($keys, $updatePreconditionValues);
+            foreach ($whereValues as $name => $value) {
+                $where->add($updateQb->expr()->eq(
+                    $name,
+                    $updateQb->createNamedParameter($value, $this->getType($value)),
+                    $this->getType($value)
+                ));
+            }
+            $updateQb->where($where);
+            $affected = $updateQb->execute();
+
+            if ($affected === 0 && !empty($updatePreconditionValues)) {
+                throw new PreConditionNotMetException();
+            }
+
+            return 0;
+        }
+    }
+
+    /**
+     * Create an exclusive read+write lock on a table
+     *
+     * @param string $tableName
+     * @throws \BadMethodCallException When trying to acquire a second lock
+     * @since 9.1.0
+     */
+    public function lockTable($tableName) {
+        if ($this->lockedTable !== null) {
+            throw new \BadMethodCallException('Can not lock a new table until the previous lock is released.');
+        }
+
+        $tableName = $this->tablePrefix . $tableName;
+        $this->lockedTable = $tableName;
+        $this->adapter->lockTable($tableName);
+    }
+
+    /**
+     * Release a previous acquired lock again
+     *
+     * @since 9.1.0
+     */
+    public function unlockTable() {
+        $this->adapter->unlockTable();
+        $this->lockedTable = null;
+    }
+
+    /**
+     * returns the error code and message as a string for logging
+     * works with DoctrineException
+     * @return string
+     */
+    public function getError() {
+        $msg = $this->errorCode() . ': ';
+        $errorInfo = $this->errorInfo();
+        if (is_array($errorInfo)) {
+            $msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
+            $msg .= 'Driver Code = '.$errorInfo[1] . ', ';
+            $msg .= 'Driver Message = '.$errorInfo[2];
+        }
+        return $msg;
+    }
+
+    /**
+     * Drop a table from the database if it exists
+     *
+     * @param string $table table name without the prefix
+     */
+    public function dropTable($table) {
+        $table = $this->tablePrefix . trim($table);
+        $schema = $this->getSchemaManager();
+        if($schema->tablesExist(array($table))) {
+            $schema->dropTable($table);
+        }
+    }
+
+    /**
+     * Check if a table exists
+     *
+     * @param string $table table name without the prefix
+     * @return bool
+     */
+    public function tableExists($table){
+        $table = $this->tablePrefix . trim($table);
+        $schema = $this->getSchemaManager();
+        return $schema->tablesExist(array($table));
+    }
+
+    // internal use
+    /**
+     * @param string $statement
+     * @return string
+     */
+    protected function replaceTablePrefix($statement) {
+        return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
+    }
+
+    /**
+     * Check if a transaction is active
+     *
+     * @return bool
+     * @since 8.2.0
+     */
+    public function inTransaction() {
+        return $this->getTransactionNestingLevel() > 0;
+    }
+
+    /**
+     * Escape a parameter to be used in a LIKE query
+     *
+     * @param string $param
+     * @return string
+     */
+    public function escapeLikeParameter($param) {
+        return addcslashes($param, '\\_%');
+    }
+
+    /**
+     * Check whether or not the current database support 4byte wide unicode
+     *
+     * @return bool
+     * @since 11.0.0
+     */
+    public function supports4ByteText() {
+        if (!$this->getDatabasePlatform() instanceof MySqlPlatform) {
+            return true;
+        }
+        return $this->getParams()['charset'] === 'utf8mb4';
+    }
+
+
+    /**
+     * Create the schema of the connected database
+     *
+     * @return Schema
+     */
+    public function createSchema() {
+        $schemaManager = new MDB2SchemaManager($this);
+        $migrator = $schemaManager->getMigrator();
+        return $migrator->createSchema();
+    }
+
+    /**
+     * Migrate the database to the given schema
+     *
+     * @param Schema $toSchema
+     */
+    public function migrateToSchema(Schema $toSchema) {
+        $schemaManager = new MDB2SchemaManager($this);
+        $migrator = $schemaManager->getMigrator();
+        $migrator->migrate($toSchema);
+    }
 }

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

Indentation +367 added lines, -367 removed lines

@@ -37,397 +37,397 @@
 use OCP\IDBConnection;
 
 class ExpressionBuilder implements IExpressionBuilder {
-	/** @var \Doctrine\DBAL\Query\Expression\ExpressionBuilder */
-	protected $expressionBuilder;
+    /** @var \Doctrine\DBAL\Query\Expression\ExpressionBuilder */
+    protected $expressionBuilder;
 
-	/** @var QuoteHelper */
-	protected $helper;
+    /** @var QuoteHelper */
+    protected $helper;
 
-	/** @var IDBConnection */
-	protected $connection;
+    /** @var IDBConnection */
+    protected $connection;
 
-	/** @var FunctionBuilder */
-	protected $functionBuilder;
+    /** @var FunctionBuilder */
+    protected $functionBuilder;
 
-	/**
-	 * Initializes a new <tt>ExpressionBuilder</tt>.
-	 *
-	 * @param \OCP\IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-		$this->helper = new QuoteHelper();
-		$this->expressionBuilder = new DoctrineExpressionBuilder($connection);
-		$this->functionBuilder = $connection->getQueryBuilder()->func();
-	}
+    /**
+     * Initializes a new <tt>ExpressionBuilder</tt>.
+     *
+     * @param \OCP\IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+        $this->helper = new QuoteHelper();
+        $this->expressionBuilder = new DoctrineExpressionBuilder($connection);
+        $this->functionBuilder = $connection->getQueryBuilder()->func();
+    }
 
-	/**
-	 * Creates a conjunction of the given boolean expressions.
-	 *
-	 * Example:
-	 *
-	 *     [php]
-	 *     // (u.type = ?) AND (u.role = ?)
-	 *     $expr->andX('u.type = ?', 'u.role = ?'));
-	 *
-	 * @param mixed $x Optional clause. Defaults = null, but requires
-	 *                 at least one defined when converting to string.
-	 *
-	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
-	 */
-	public function andX($x = null) {
-		$arguments = func_get_args();
-		$compositeExpression = call_user_func_array([$this->expressionBuilder, 'andX'], $arguments);
-		return new CompositeExpression($compositeExpression);
-	}
+    /**
+     * Creates a conjunction of the given boolean expressions.
+     *
+     * Example:
+     *
+     *     [php]
+     *     // (u.type = ?) AND (u.role = ?)
+     *     $expr->andX('u.type = ?', 'u.role = ?'));
+     *
+     * @param mixed $x Optional clause. Defaults = null, but requires
+     *                 at least one defined when converting to string.
+     *
+     * @return \OCP\DB\QueryBuilder\ICompositeExpression
+     */
+    public function andX($x = null) {
+        $arguments = func_get_args();
+        $compositeExpression = call_user_func_array([$this->expressionBuilder, 'andX'], $arguments);
+        return new CompositeExpression($compositeExpression);
+    }
 
-	/**
-	 * Creates a disjunction of the given boolean expressions.
-	 *
-	 * Example:
-	 *
-	 *     [php]
-	 *     // (u.type = ?) OR (u.role = ?)
-	 *     $qb->where($qb->expr()->orX('u.type = ?', 'u.role = ?'));
-	 *
-	 * @param mixed $x Optional clause. Defaults = null, but requires
-	 *                 at least one defined when converting to string.
-	 *
-	 * @return \OCP\DB\QueryBuilder\ICompositeExpression
-	 */
-	public function orX($x = null) {
-		$arguments = func_get_args();
-		$compositeExpression = call_user_func_array([$this->expressionBuilder, 'orX'], $arguments);
-		return new CompositeExpression($compositeExpression);
-	}
+    /**
+     * Creates a disjunction of the given boolean expressions.
+     *
+     * Example:
+     *
+     *     [php]
+     *     // (u.type = ?) OR (u.role = ?)
+     *     $qb->where($qb->expr()->orX('u.type = ?', 'u.role = ?'));
+     *
+     * @param mixed $x Optional clause. Defaults = null, but requires
+     *                 at least one defined when converting to string.
+     *
+     * @return \OCP\DB\QueryBuilder\ICompositeExpression
+     */
+    public function orX($x = null) {
+        $arguments = func_get_args();
+        $compositeExpression = call_user_func_array([$this->expressionBuilder, 'orX'], $arguments);
+        return new CompositeExpression($compositeExpression);
+    }
 
-	/**
-	 * Creates a comparison expression.
-	 *
-	 * @param mixed $x The left expression.
-	 * @param string $operator One of the IExpressionBuilder::* constants.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function comparison($x, $operator, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->comparison($x, $operator, $y);
-	}
+    /**
+     * Creates a comparison expression.
+     *
+     * @param mixed $x The left expression.
+     * @param string $operator One of the IExpressionBuilder::* constants.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function comparison($x, $operator, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->comparison($x, $operator, $y);
+    }
 
-	/**
-	 * Creates an equality comparison expression with the given arguments.
-	 *
-	 * First argument is considered the left expression and the second is the right expression.
-	 * When converted to string, it will generated a <left expr> = <right expr>. Example:
-	 *
-	 *     [php]
-	 *     // u.id = ?
-	 *     $expr->eq('u.id', '?');
-	 *
-	 * @param mixed $x The left expression.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function eq($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->eq($x, $y);
-	}
+    /**
+     * Creates an equality comparison expression with the given arguments.
+     *
+     * First argument is considered the left expression and the second is the right expression.
+     * When converted to string, it will generated a <left expr> = <right expr>. Example:
+     *
+     *     [php]
+     *     // u.id = ?
+     *     $expr->eq('u.id', '?');
+     *
+     * @param mixed $x The left expression.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function eq($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->eq($x, $y);
+    }
 
-	/**
-	 * Creates a non equality comparison expression with the given arguments.
-	 * First argument is considered the left expression and the second is the right expression.
-	 * When converted to string, it will generated a <left expr> <> <right expr>. Example:
-	 *
-	 *     [php]
-	 *     // u.id <> 1
-	 *     $q->where($q->expr()->neq('u.id', '1'));
-	 *
-	 * @param mixed $x The left expression.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function neq($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->neq($x, $y);
-	}
+    /**
+     * Creates a non equality comparison expression with the given arguments.
+     * First argument is considered the left expression and the second is the right expression.
+     * When converted to string, it will generated a <left expr> <> <right expr>. Example:
+     *
+     *     [php]
+     *     // u.id <> 1
+     *     $q->where($q->expr()->neq('u.id', '1'));
+     *
+     * @param mixed $x The left expression.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function neq($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->neq($x, $y);
+    }
 
-	/**
-	 * Creates a lower-than comparison expression with the given arguments.
-	 * First argument is considered the left expression and the second is the right expression.
-	 * When converted to string, it will generated a <left expr> < <right expr>. Example:
-	 *
-	 *     [php]
-	 *     // u.id < ?
-	 *     $q->where($q->expr()->lt('u.id', '?'));
-	 *
-	 * @param mixed $x The left expression.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function lt($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->lt($x, $y);
-	}
+    /**
+     * Creates a lower-than comparison expression with the given arguments.
+     * First argument is considered the left expression and the second is the right expression.
+     * When converted to string, it will generated a <left expr> < <right expr>. Example:
+     *
+     *     [php]
+     *     // u.id < ?
+     *     $q->where($q->expr()->lt('u.id', '?'));
+     *
+     * @param mixed $x The left expression.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function lt($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->lt($x, $y);
+    }
 
-	/**
-	 * Creates a lower-than-equal comparison expression with the given arguments.
-	 * First argument is considered the left expression and the second is the right expression.
-	 * When converted to string, it will generated a <left expr> <= <right expr>. Example:
-	 *
-	 *     [php]
-	 *     // u.id <= ?
-	 *     $q->where($q->expr()->lte('u.id', '?'));
-	 *
-	 * @param mixed $x The left expression.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function lte($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->lte($x, $y);
-	}
+    /**
+     * Creates a lower-than-equal comparison expression with the given arguments.
+     * First argument is considered the left expression and the second is the right expression.
+     * When converted to string, it will generated a <left expr> <= <right expr>. Example:
+     *
+     *     [php]
+     *     // u.id <= ?
+     *     $q->where($q->expr()->lte('u.id', '?'));
+     *
+     * @param mixed $x The left expression.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function lte($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->lte($x, $y);
+    }
 
-	/**
-	 * Creates a greater-than comparison expression with the given arguments.
-	 * First argument is considered the left expression and the second is the right expression.
-	 * When converted to string, it will generated a <left expr> > <right expr>. Example:
-	 *
-	 *     [php]
-	 *     // u.id > ?
-	 *     $q->where($q->expr()->gt('u.id', '?'));
-	 *
-	 * @param mixed $x The left expression.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function gt($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->gt($x, $y);
-	}
+    /**
+     * Creates a greater-than comparison expression with the given arguments.
+     * First argument is considered the left expression and the second is the right expression.
+     * When converted to string, it will generated a <left expr> > <right expr>. Example:
+     *
+     *     [php]
+     *     // u.id > ?
+     *     $q->where($q->expr()->gt('u.id', '?'));
+     *
+     * @param mixed $x The left expression.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function gt($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->gt($x, $y);
+    }
 
-	/**
-	 * Creates a greater-than-equal comparison expression with the given arguments.
-	 * First argument is considered the left expression and the second is the right expression.
-	 * When converted to string, it will generated a <left expr> >= <right expr>. Example:
-	 *
-	 *     [php]
-	 *     // u.id >= ?
-	 *     $q->where($q->expr()->gte('u.id', '?'));
-	 *
-	 * @param mixed $x The left expression.
-	 * @param mixed $y The right expression.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function gte($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->gte($x, $y);
-	}
+    /**
+     * Creates a greater-than-equal comparison expression with the given arguments.
+     * First argument is considered the left expression and the second is the right expression.
+     * When converted to string, it will generated a <left expr> >= <right expr>. Example:
+     *
+     *     [php]
+     *     // u.id >= ?
+     *     $q->where($q->expr()->gte('u.id', '?'));
+     *
+     * @param mixed $x The left expression.
+     * @param mixed $y The right expression.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function gte($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->gte($x, $y);
+    }
 
-	/**
-	 * Creates an IS NULL expression with the given arguments.
-	 *
-	 * @param string $x The field in string format to be restricted by IS NULL.
-	 *
-	 * @return string
-	 */
-	public function isNull($x) {
-		$x = $this->helper->quoteColumnName($x);
-		return $this->expressionBuilder->isNull($x);
-	}
+    /**
+     * Creates an IS NULL expression with the given arguments.
+     *
+     * @param string $x The field in string format to be restricted by IS NULL.
+     *
+     * @return string
+     */
+    public function isNull($x) {
+        $x = $this->helper->quoteColumnName($x);
+        return $this->expressionBuilder->isNull($x);
+    }
 
-	/**
-	 * Creates an IS NOT NULL expression with the given arguments.
-	 *
-	 * @param string $x The field in string format to be restricted by IS NOT NULL.
-	 *
-	 * @return string
-	 */
-	public function isNotNull($x) {
-		$x = $this->helper->quoteColumnName($x);
-		return $this->expressionBuilder->isNotNull($x);
-	}
+    /**
+     * Creates an IS NOT NULL expression with the given arguments.
+     *
+     * @param string $x The field in string format to be restricted by IS NOT NULL.
+     *
+     * @return string
+     */
+    public function isNotNull($x) {
+        $x = $this->helper->quoteColumnName($x);
+        return $this->expressionBuilder->isNotNull($x);
+    }
 
-	/**
-	 * Creates a LIKE() comparison expression with the given arguments.
-	 *
-	 * @param string $x Field in string format to be inspected by LIKE() comparison.
-	 * @param mixed $y Argument to be used in LIKE() comparison.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function like($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->like($x, $y);
-	}
+    /**
+     * Creates a LIKE() comparison expression with the given arguments.
+     *
+     * @param string $x Field in string format to be inspected by LIKE() comparison.
+     * @param mixed $y Argument to be used in LIKE() comparison.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function like($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->like($x, $y);
+    }
 
-	/**
-	 * Creates a ILIKE() comparison expression with the given arguments.
-	 *
-	 * @param string $x Field in string format to be inspected by ILIKE() comparison.
-	 * @param mixed $y Argument to be used in ILIKE() comparison.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function iLike($x, $y, $type = null) {
-		return $this->expressionBuilder->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y));
-	}
+    /**
+     * Creates a ILIKE() comparison expression with the given arguments.
+     *
+     * @param string $x Field in string format to be inspected by ILIKE() comparison.
+     * @param mixed $y Argument to be used in ILIKE() comparison.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     * @since 9.0.0
+     */
+    public function iLike($x, $y, $type = null) {
+        return $this->expressionBuilder->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y));
+    }
 
-	/**
-	 * Creates a NOT LIKE() comparison expression with the given arguments.
-	 *
-	 * @param string $x Field in string format to be inspected by NOT LIKE() comparison.
-	 * @param mixed $y Argument to be used in NOT LIKE() comparison.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function notLike($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return $this->expressionBuilder->notLike($x, $y);
-	}
+    /**
+     * Creates a NOT LIKE() comparison expression with the given arguments.
+     *
+     * @param string $x Field in string format to be inspected by NOT LIKE() comparison.
+     * @param mixed $y Argument to be used in NOT LIKE() comparison.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function notLike($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnName($y);
+        return $this->expressionBuilder->notLike($x, $y);
+    }
 
-	/**
-	 * Creates a IN () comparison expression with the given arguments.
-	 *
-	 * @param string $x The field in string format to be inspected by IN() comparison.
-	 * @param string|array $y The placeholder or the array of values to be used by IN() comparison.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function in($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnNames($y);
-		return $this->expressionBuilder->in($x, $y);
-	}
+    /**
+     * Creates a IN () comparison expression with the given arguments.
+     *
+     * @param string $x The field in string format to be inspected by IN() comparison.
+     * @param string|array $y The placeholder or the array of values to be used by IN() comparison.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function in($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnNames($y);
+        return $this->expressionBuilder->in($x, $y);
+    }
 
-	/**
-	 * Creates a NOT IN () comparison expression with the given arguments.
-	 *
-	 * @param string $x The field in string format to be inspected by NOT IN() comparison.
-	 * @param string|array $y The placeholder or the array of values to be used by NOT IN() comparison.
-	 * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
-	 *                  required when comparing text fields for oci compatibility
-	 *
-	 * @return string
-	 */
-	public function notIn($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnNames($y);
-		return $this->expressionBuilder->notIn($x, $y);
-	}
+    /**
+     * Creates a NOT IN () comparison expression with the given arguments.
+     *
+     * @param string $x The field in string format to be inspected by NOT IN() comparison.
+     * @param string|array $y The placeholder or the array of values to be used by NOT IN() comparison.
+     * @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
+     *                  required when comparing text fields for oci compatibility
+     *
+     * @return string
+     */
+    public function notIn($x, $y, $type = null) {
+        $x = $this->helper->quoteColumnName($x);
+        $y = $this->helper->quoteColumnNames($y);
+        return $this->expressionBuilder->notIn($x, $y);
+    }
 
-	/**
-	 * Creates a $x = '' statement, because Oracle needs a different check
-	 *
-	 * @param string $x The field in string format to be inspected by the comparison.
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function emptyString($x) {
-		return $this->eq($x, $this->literal('', IQueryBuilder::PARAM_STR));
-	}
+    /**
+     * Creates a $x = '' statement, because Oracle needs a different check
+     *
+     * @param string $x The field in string format to be inspected by the comparison.
+     * @return string
+     * @since 13.0.0
+     */
+    public function emptyString($x) {
+        return $this->eq($x, $this->literal('', IQueryBuilder::PARAM_STR));
+    }
 
-	/**
-	 * Creates a `$x <> ''` statement, because Oracle needs a different check
-	 *
-	 * @param string $x The field in string format to be inspected by the comparison.
-	 * @return string
-	 * @since 13.0.0
-	 */
-	public function nonEmptyString($x) {
-		return $this->neq($x, $this->literal('', IQueryBuilder::PARAM_STR));
-	}
+    /**
+     * Creates a `$x <> ''` statement, because Oracle needs a different check
+     *
+     * @param string $x The field in string format to be inspected by the comparison.
+     * @return string
+     * @since 13.0.0
+     */
+    public function nonEmptyString($x) {
+        return $this->neq($x, $this->literal('', IQueryBuilder::PARAM_STR));
+    }
 
-	/**
-	 * Binary AND Operator copies a bit to the result if it exists in both operands.
-	 *
-	 * @param string|ILiteral $x The field or value to check
-	 * @param int $y Bitmap that must be set
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function bitwiseAnd($x, $y) {
-		return new QueryFunction($this->connection->getDatabasePlatform()->getBitAndComparisonExpression(
-			$this->helper->quoteColumnName($x),
-			$y
-		));
-	}
+    /**
+     * Binary AND Operator copies a bit to the result if it exists in both operands.
+     *
+     * @param string|ILiteral $x The field or value to check
+     * @param int $y Bitmap that must be set
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function bitwiseAnd($x, $y) {
+        return new QueryFunction($this->connection->getDatabasePlatform()->getBitAndComparisonExpression(
+            $this->helper->quoteColumnName($x),
+            $y
+        ));
+    }
 
-	/**
-	 * Binary OR Operator copies a bit if it exists in either operand.
-	 *
-	 * @param string|ILiteral $x The field or value to check
-	 * @param int $y Bitmap that must be set
-	 * @return IQueryFunction
-	 * @since 12.0.0
-	 */
-	public function bitwiseOr($x, $y) {
-		return new QueryFunction($this->connection->getDatabasePlatform()->getBitOrComparisonExpression(
-			$this->helper->quoteColumnName($x),
-			$y
-		));
-	}
+    /**
+     * Binary OR Operator copies a bit if it exists in either operand.
+     *
+     * @param string|ILiteral $x The field or value to check
+     * @param int $y Bitmap that must be set
+     * @return IQueryFunction
+     * @since 12.0.0
+     */
+    public function bitwiseOr($x, $y) {
+        return new QueryFunction($this->connection->getDatabasePlatform()->getBitOrComparisonExpression(
+            $this->helper->quoteColumnName($x),
+            $y
+        ));
+    }
 
-	/**
-	 * Quotes a given input parameter.
-	 *
-	 * @param mixed $input The parameter to be quoted.
-	 * @param mixed|null $type One of the IQueryBuilder::PARAM_* constants
-	 *
-	 * @return ILiteral
-	 */
-	public function literal($input, $type = null) {
-		return new Literal($this->expressionBuilder->literal($input, $type));
-	}
+    /**
+     * Quotes a given input parameter.
+     *
+     * @param mixed $input The parameter to be quoted.
+     * @param mixed|null $type One of the IQueryBuilder::PARAM_* constants
+     *
+     * @return ILiteral
+     */
+    public function literal($input, $type = null) {
+        return new Literal($this->expressionBuilder->literal($input, $type));
+    }
 
-	/**
-	 * Returns a IQueryFunction that casts the column to the given type
-	 *
-	 * @param string $column
-	 * @param mixed $type One of IQueryBuilder::PARAM_*
-	 * @return string
-	 */
-	public function castColumn($column, $type) {
-		return new QueryFunction(
-			$this->helper->quoteColumnName($column)
-		);
-	}
+    /**
+     * Returns a IQueryFunction that casts the column to the given type
+     *
+     * @param string $column
+     * @param mixed $type One of IQueryBuilder::PARAM_*
+     * @return string
+     */
+    public function castColumn($column, $type) {
+        return new QueryFunction(
+            $this->helper->quoteColumnName($column)
+        );
+    }
 }

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

Indentation +9 added lines, -9 removed lines

@@ -25,14 +25,14 @@
 
 
 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 '\\'";
+    }
 
-	public function iLike($x, $y, $type = null) {
-		return $this->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y), $type);
-	}
+    public function iLike($x, $y, $type = null) {
+        return $this->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y), $type);
+    }
 }

Spacing +1 added lines, -1 removed lines

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

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

Indentation +29 added lines, -29 removed lines

@@ -28,39 +28,39 @@
 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) . ')');
+        }
+    }
 
-	public function sum($field) {
-		return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
-	}
+    public function sum($field) {
+        return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
+    }
 
-	public function lower($field) {
-		return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
-	}
+    public function lower($field) {
+        return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
+    }
 }

Spacing +6 added lines, -6 removed lines

@@ -41,26 +41,26 @@
 	}
 
 	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).')');
 		}
 	}
 
 	public function sum($field) {
-		return new QueryFunction('SUM(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('SUM('.$this->helper->quoteColumnName($field).')');
 	}
 
 	public function lower($field) {
-		return new QueryFunction('LOWER(' . $this->helper->quoteColumnName($field) . ')');
+		return new QueryFunction('LOWER('.$this->helper->quoteColumnName($field).')');
 	}
 }

lib/private/User/Database.php

Indentation +330 added lines, -330 removed lines

@@ -67,334 +67,334 @@
  * Class for user management in a SQL Database (e.g. MySQL, SQLite)
  */
 class Database extends Backend implements IUserBackend {
-	/** @var CappedMemoryCache */
-	private $cache;
-
-	/** @var EventDispatcher */
-	private $eventDispatcher;
-
-	/**
-	 * \OC\User\Database constructor.
-	 *
-	 * @param EventDispatcher $eventDispatcher
-	 */
-	public function __construct($eventDispatcher = null) {
-		$this->cache = new CappedMemoryCache();
-		$this->eventDispatcher = $eventDispatcher ? $eventDispatcher : \OC::$server->getEventDispatcher();
-	}
-
-	/**
-	 * Create a new user
-	 *
-	 * @param string $uid The username of the user to create
-	 * @param string $password The password of the new user
-	 * @return bool
-	 *
-	 * Creates a new user. Basic checking of username is done in OC_User
-	 * itself, not in its subclasses.
-	 */
-	public function createUser($uid, $password) {
-		if (!$this->userExists($uid)) {
-			$event = new GenericEvent($password);
-			$this->eventDispatcher->dispatch('OCP\PasswordPolicy::validate', $event);
-			$query = \OC_DB::prepare('INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )');
-			try {
-				$result = $query->execute(array($uid, \OC::$server->getHasher()->hash($password)));
-			} catch (\Exception $e) {
-				$result = false;
-			}
-
-			// Clear cache
-			unset($this->cache[$uid]);
-
-			return $result ? true : false;
-		}
-
-		return false;
-	}
-
-	/**
-	 * delete a user
-	 *
-	 * @param string $uid The username of the user to delete
-	 * @return bool
-	 *
-	 * Deletes a user
-	 */
-	public function deleteUser($uid) {
-		// Delete user-group-relation
-		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*users` WHERE `uid` = ?');
-		$result = $query->execute(array($uid));
-
-		if (isset($this->cache[$uid])) {
-			unset($this->cache[$uid]);
-		}
-
-		return $result ? true : false;
-	}
-
-	/**
-	 * Set password
-	 *
-	 * @param string $uid The username
-	 * @param string $password The new password
-	 * @return bool
-	 *
-	 * Change the password of a user
-	 */
-	public function setPassword($uid, $password) {
-		if ($this->userExists($uid)) {
-			$event = new GenericEvent($password);
-			$this->eventDispatcher->dispatch('OCP\PasswordPolicy::validate', $event);
-			$query = \OC_DB::prepare('UPDATE `*PREFIX*users` SET `password` = ? WHERE `uid` = ?');
-			$result = $query->execute(array(\OC::$server->getHasher()->hash($password), $uid));
-
-			return $result ? true : false;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Set display name
-	 *
-	 * @param string $uid The username
-	 * @param string $displayName The new display name
-	 * @return bool
-	 *
-	 * Change the display name of a user
-	 */
-	public function setDisplayName($uid, $displayName) {
-		if ($this->userExists($uid)) {
-			$query = \OC_DB::prepare('UPDATE `*PREFIX*users` SET `displayname` = ? WHERE LOWER(`uid`) = LOWER(?)');
-			$query->execute(array($displayName, $uid));
-			$this->cache[$uid]['displayname'] = $displayName;
-
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * get display name of the user
-	 *
-	 * @param string $uid user ID of the user
-	 * @return string display name
-	 */
-	public function getDisplayName($uid) {
-		$this->loadUser($uid);
-		return empty($this->cache[$uid]['displayname']) ? $uid : $this->cache[$uid]['displayname'];
-	}
-
-	/**
-	 * Get a list of all display names and user ids.
-	 *
-	 * @param string $search
-	 * @param string|null $limit
-	 * @param string|null $offset
-	 * @return array an array of all displayNames (value) and the corresponding uids (key)
-	 */
-	public function getDisplayNames($search = '', $limit = null, $offset = null) {
-		$connection = \OC::$server->getDatabaseConnection();
-
-		$query = $connection->getQueryBuilder();
-
-		$query->select('uid', 'displayname')
-			->from('users', 'u')
-			->leftJoin('u', 'preferences', 'p', $query->expr()->andX(
-				$query->expr()->eq('userid', 'uid')),
-				$query->expr()->eq('appid', new Literal('settings')),
-				$query->expr()->eq('configkey', new Literal('email'))
-			)
-			// sqlite doesn't like re-using a single named parameter here
-			->where($query->expr()->iLike('uid', $query->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')))
-			->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')))
-			->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')))
-			->orderBy($query->func()->lower('displayname'), 'ASC')
-			->orderBy($query->func()->lower('uid'), 'ASC')
-			->setMaxResults($limit)
-			->setFirstResult($offset);
-
-		$result = $query->execute();
-		$displayNames = [];
-		while ($row = $result->fetch()) {
-			$displayNames[$row['uid']] = $row['displayname'];
-		}
-
-		return $displayNames;
-	}
-
-	/**
-	 * Check if the password is correct
-	 *
-	 * @param string $uid The username
-	 * @param string $password The password
-	 * @return string
-	 *
-	 * Check if the password is correct without logging in the user
-	 * returns the user id or false
-	 */
-	public function checkPassword($uid, $password) {
-		$query = \OC_DB::prepare('SELECT `uid`, `password` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)');
-		$result = $query->execute(array($uid));
-
-		$row = $result->fetchRow();
-		if ($row) {
-			$storedHash = $row['password'];
-			$newHash = '';
-			if (\OC::$server->getHasher()->verify($password, $storedHash, $newHash)) {
-				if (!empty($newHash)) {
-					$this->setPassword($uid, $password);
-				}
-				return $row['uid'];
-			}
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * Load an user in the cache
-	 *
-	 * @param string $uid the username
-	 * @return boolean true if user was found, false otherwise
-	 */
-	private function loadUser($uid) {
-		$uid = (string)$uid;
-		if (!isset($this->cache[$uid])) {
-			//guests $uid could be NULL or ''
-			if ($uid === '') {
-				$this->cache[$uid] = false;
-				return true;
-			}
-
-			$query = \OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)');
-			$result = $query->execute(array($uid));
-
-			if ($result === false) {
-				Util::writeLog('core', \OC_DB::getErrorMessage(), Util::ERROR);
-				return false;
-			}
-
-			$this->cache[$uid] = false;
-
-			// "uid" is primary key, so there can only be a single result
-			if ($row = $result->fetchRow()) {
-				$this->cache[$uid]['uid'] = $row['uid'];
-				$this->cache[$uid]['displayname'] = $row['displayname'];
-				$result->closeCursor();
-			} else {
-				$result->closeCursor();
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	/**
-	 * Get a list of all users
-	 *
-	 * @param string $search
-	 * @param null|int $limit
-	 * @param null|int $offset
-	 * @return string[] an array of all uids
-	 */
-	public function getUsers($search = '', $limit = null, $offset = null) {
-		$users = $this->getDisplayNames($search, $limit, $offset);
-		$userIds = array_keys($users);
-		sort($userIds, SORT_STRING | SORT_FLAG_CASE);
-		return $userIds;
-	}
-
-	/**
-	 * check if a user exists
-	 *
-	 * @param string $uid the username
-	 * @return boolean
-	 */
-	public function userExists($uid) {
-		$this->loadUser($uid);
-		return $this->cache[$uid] !== false;
-	}
-
-	/**
-	 * get the user's home directory
-	 *
-	 * @param string $uid the username
-	 * @return string|false
-	 */
-	public function getHome($uid) {
-		if ($this->userExists($uid)) {
-			return \OC::$server->getConfig()->getSystemValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $uid;
-		}
-
-		return false;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function hasUserListings() {
-		return true;
-	}
-
-	/**
-	 * counts the users in the database
-	 *
-	 * @return int|bool
-	 */
-	public function countUsers() {
-		$query = \OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`');
-		$result = $query->execute();
-		if ($result === false) {
-			Util::writeLog('core', \OC_DB::getErrorMessage(), Util::ERROR);
-			return false;
-		}
-		return $result->fetchOne();
-	}
-
-	/**
-	 * returns the username for the given login name in the correct casing
-	 *
-	 * @param string $loginName
-	 * @return string|false
-	 */
-	public function loginName2UserName($loginName) {
-		if ($this->userExists($loginName)) {
-			return $this->cache[$loginName]['uid'];
-		}
-
-		return false;
-	}
-
-	/**
-	 * Backend name to be shown in user management
-	 *
-	 * @return string the name of the backend to be shown
-	 */
-	public function getBackendName() {
-		return 'Database';
-	}
-
-	public static function preLoginNameUsedAsUserName($param) {
-		if (!isset($param['uid'])) {
-			throw new \Exception('key uid is expected to be set in $param');
-		}
-
-		$backends = \OC::$server->getUserManager()->getBackends();
-		foreach ($backends as $backend) {
-			if ($backend instanceof Database) {
-				/** @var \OC\User\Database $backend */
-				$uid = $backend->loginName2UserName($param['uid']);
-				if ($uid !== false) {
-					$param['uid'] = $uid;
-					return;
-				}
-			}
-		}
-
-	}
+    /** @var CappedMemoryCache */
+    private $cache;
+
+    /** @var EventDispatcher */
+    private $eventDispatcher;
+
+    /**
+     * \OC\User\Database constructor.
+     *
+     * @param EventDispatcher $eventDispatcher
+     */
+    public function __construct($eventDispatcher = null) {
+        $this->cache = new CappedMemoryCache();
+        $this->eventDispatcher = $eventDispatcher ? $eventDispatcher : \OC::$server->getEventDispatcher();
+    }
+
+    /**
+     * Create a new user
+     *
+     * @param string $uid The username of the user to create
+     * @param string $password The password of the new user
+     * @return bool
+     *
+     * Creates a new user. Basic checking of username is done in OC_User
+     * itself, not in its subclasses.
+     */
+    public function createUser($uid, $password) {
+        if (!$this->userExists($uid)) {
+            $event = new GenericEvent($password);
+            $this->eventDispatcher->dispatch('OCP\PasswordPolicy::validate', $event);
+            $query = \OC_DB::prepare('INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )');
+            try {
+                $result = $query->execute(array($uid, \OC::$server->getHasher()->hash($password)));
+            } catch (\Exception $e) {
+                $result = false;
+            }
+
+            // Clear cache
+            unset($this->cache[$uid]);
+
+            return $result ? true : false;
+        }
+
+        return false;
+    }
+
+    /**
+     * delete a user
+     *
+     * @param string $uid The username of the user to delete
+     * @return bool
+     *
+     * Deletes a user
+     */
+    public function deleteUser($uid) {
+        // Delete user-group-relation
+        $query = \OC_DB::prepare('DELETE FROM `*PREFIX*users` WHERE `uid` = ?');
+        $result = $query->execute(array($uid));
+
+        if (isset($this->cache[$uid])) {
+            unset($this->cache[$uid]);
+        }
+
+        return $result ? true : false;
+    }
+
+    /**
+     * Set password
+     *
+     * @param string $uid The username
+     * @param string $password The new password
+     * @return bool
+     *
+     * Change the password of a user
+     */
+    public function setPassword($uid, $password) {
+        if ($this->userExists($uid)) {
+            $event = new GenericEvent($password);
+            $this->eventDispatcher->dispatch('OCP\PasswordPolicy::validate', $event);
+            $query = \OC_DB::prepare('UPDATE `*PREFIX*users` SET `password` = ? WHERE `uid` = ?');
+            $result = $query->execute(array(\OC::$server->getHasher()->hash($password), $uid));
+
+            return $result ? true : false;
+        }
+
+        return false;
+    }
+
+    /**
+     * Set display name
+     *
+     * @param string $uid The username
+     * @param string $displayName The new display name
+     * @return bool
+     *
+     * Change the display name of a user
+     */
+    public function setDisplayName($uid, $displayName) {
+        if ($this->userExists($uid)) {
+            $query = \OC_DB::prepare('UPDATE `*PREFIX*users` SET `displayname` = ? WHERE LOWER(`uid`) = LOWER(?)');
+            $query->execute(array($displayName, $uid));
+            $this->cache[$uid]['displayname'] = $displayName;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * get display name of the user
+     *
+     * @param string $uid user ID of the user
+     * @return string display name
+     */
+    public function getDisplayName($uid) {
+        $this->loadUser($uid);
+        return empty($this->cache[$uid]['displayname']) ? $uid : $this->cache[$uid]['displayname'];
+    }
+
+    /**
+     * Get a list of all display names and user ids.
+     *
+     * @param string $search
+     * @param string|null $limit
+     * @param string|null $offset
+     * @return array an array of all displayNames (value) and the corresponding uids (key)
+     */
+    public function getDisplayNames($search = '', $limit = null, $offset = null) {
+        $connection = \OC::$server->getDatabaseConnection();
+
+        $query = $connection->getQueryBuilder();
+
+        $query->select('uid', 'displayname')
+            ->from('users', 'u')
+            ->leftJoin('u', 'preferences', 'p', $query->expr()->andX(
+                $query->expr()->eq('userid', 'uid')),
+                $query->expr()->eq('appid', new Literal('settings')),
+                $query->expr()->eq('configkey', new Literal('email'))
+            )
+            // sqlite doesn't like re-using a single named parameter here
+            ->where($query->expr()->iLike('uid', $query->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')))
+            ->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')))
+            ->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')))
+            ->orderBy($query->func()->lower('displayname'), 'ASC')
+            ->orderBy($query->func()->lower('uid'), 'ASC')
+            ->setMaxResults($limit)
+            ->setFirstResult($offset);
+
+        $result = $query->execute();
+        $displayNames = [];
+        while ($row = $result->fetch()) {
+            $displayNames[$row['uid']] = $row['displayname'];
+        }
+
+        return $displayNames;
+    }
+
+    /**
+     * Check if the password is correct
+     *
+     * @param string $uid The username
+     * @param string $password The password
+     * @return string
+     *
+     * Check if the password is correct without logging in the user
+     * returns the user id or false
+     */
+    public function checkPassword($uid, $password) {
+        $query = \OC_DB::prepare('SELECT `uid`, `password` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)');
+        $result = $query->execute(array($uid));
+
+        $row = $result->fetchRow();
+        if ($row) {
+            $storedHash = $row['password'];
+            $newHash = '';
+            if (\OC::$server->getHasher()->verify($password, $storedHash, $newHash)) {
+                if (!empty($newHash)) {
+                    $this->setPassword($uid, $password);
+                }
+                return $row['uid'];
+            }
+
+        }
+
+        return false;
+    }
+
+    /**
+     * Load an user in the cache
+     *
+     * @param string $uid the username
+     * @return boolean true if user was found, false otherwise
+     */
+    private function loadUser($uid) {
+        $uid = (string)$uid;
+        if (!isset($this->cache[$uid])) {
+            //guests $uid could be NULL or ''
+            if ($uid === '') {
+                $this->cache[$uid] = false;
+                return true;
+            }
+
+            $query = \OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)');
+            $result = $query->execute(array($uid));
+
+            if ($result === false) {
+                Util::writeLog('core', \OC_DB::getErrorMessage(), Util::ERROR);
+                return false;
+            }
+
+            $this->cache[$uid] = false;
+
+            // "uid" is primary key, so there can only be a single result
+            if ($row = $result->fetchRow()) {
+                $this->cache[$uid]['uid'] = $row['uid'];
+                $this->cache[$uid]['displayname'] = $row['displayname'];
+                $result->closeCursor();
+            } else {
+                $result->closeCursor();
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Get a list of all users
+     *
+     * @param string $search
+     * @param null|int $limit
+     * @param null|int $offset
+     * @return string[] an array of all uids
+     */
+    public function getUsers($search = '', $limit = null, $offset = null) {
+        $users = $this->getDisplayNames($search, $limit, $offset);
+        $userIds = array_keys($users);
+        sort($userIds, SORT_STRING | SORT_FLAG_CASE);
+        return $userIds;
+    }
+
+    /**
+     * check if a user exists
+     *
+     * @param string $uid the username
+     * @return boolean
+     */
+    public function userExists($uid) {
+        $this->loadUser($uid);
+        return $this->cache[$uid] !== false;
+    }
+
+    /**
+     * get the user's home directory
+     *
+     * @param string $uid the username
+     * @return string|false
+     */
+    public function getHome($uid) {
+        if ($this->userExists($uid)) {
+            return \OC::$server->getConfig()->getSystemValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $uid;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasUserListings() {
+        return true;
+    }
+
+    /**
+     * counts the users in the database
+     *
+     * @return int|bool
+     */
+    public function countUsers() {
+        $query = \OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`');
+        $result = $query->execute();
+        if ($result === false) {
+            Util::writeLog('core', \OC_DB::getErrorMessage(), Util::ERROR);
+            return false;
+        }
+        return $result->fetchOne();
+    }
+
+    /**
+     * returns the username for the given login name in the correct casing
+     *
+     * @param string $loginName
+     * @return string|false
+     */
+    public function loginName2UserName($loginName) {
+        if ($this->userExists($loginName)) {
+            return $this->cache[$loginName]['uid'];
+        }
+
+        return false;
+    }
+
+    /**
+     * Backend name to be shown in user management
+     *
+     * @return string the name of the backend to be shown
+     */
+    public function getBackendName() {
+        return 'Database';
+    }
+
+    public static function preLoginNameUsedAsUserName($param) {
+        if (!isset($param['uid'])) {
+            throw new \Exception('key uid is expected to be set in $param');
+        }
+
+        $backends = \OC::$server->getUserManager()->getBackends();
+        foreach ($backends as $backend) {
+            if ($backend instanceof Database) {
+                /** @var \OC\User\Database $backend */
+                $uid = $backend->loginName2UserName($param['uid']);
+                if ($uid !== false) {
+                    $param['uid'] = $uid;
+                    return;
+                }
+            }
+        }
+
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -208,9 +208,9 @@ 
 				$query->expr()->eq('configkey', new Literal('email'))
 			)
 			// sqlite doesn't like re-using a single named parameter here
-			->where($query->expr()->iLike('uid', $query->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')))
-			->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')))
-			->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%' . $connection->escapeLikeParameter($search) . '%')))
+			->where($query->expr()->iLike('uid', $query->createPositionalParameter('%'.$connection->escapeLikeParameter($search).'%')))
+			->orWhere($query->expr()->iLike('displayname', $query->createPositionalParameter('%'.$connection->escapeLikeParameter($search).'%')))
+			->orWhere($query->expr()->iLike('configvalue', $query->createPositionalParameter('%'.$connection->escapeLikeParameter($search).'%')))
 			->orderBy($query->func()->lower('displayname'), 'ASC')
 			->orderBy($query->func()->lower('uid'), 'ASC')
 			->setMaxResults($limit)
@@ -262,7 +262,7 @@ 
 	 * @return boolean true if user was found, false otherwise
 	 */
 	private function loadUser($uid) {
-		$uid = (string)$uid;
+		$uid = (string) $uid;
 		if (!isset($this->cache[$uid])) {
 			//guests $uid could be NULL or ''
 			if ($uid === '') {
@@ -328,7 +328,7 @@ 
 	 */
 	public function getHome($uid) {
 		if ($this->userExists($uid)) {
-			return \OC::$server->getConfig()->getSystemValue("datadirectory", \OC::$SERVERROOT . "/data") . '/' . $uid;
+			return \OC::$server->getConfig()->getSystemValue("datadirectory", \OC::$SERVERROOT."/data").'/'.$uid;
 		}
 
 		return false;