Signed-off-by: Joas Schilling <coding@schilljs.com>tags/v12.0.0beta1
use OCP\AppFramework\Db\Mapper; | use OCP\AppFramework\Db\Mapper; | ||||
use OCP\DB\QueryBuilder\IQueryBuilder; | use OCP\DB\QueryBuilder\IQueryBuilder; | ||||
use OCP\IDb; | |||||
use OCP\IDBConnection; | |||||
use OCP\IUser; | use OCP\IUser; | ||||
class BackupCodeMapper extends Mapper { | class BackupCodeMapper extends Mapper { | ||||
public function __construct(IDb $db) { | |||||
public function __construct(IDBConnection $db) { | |||||
parent::__construct($db, 'twofactor_backup_codes'); | parent::__construct($db, 'twofactor_backup_codes'); | ||||
} | } | ||||
'OCP\\IDBConnection' => $baseDir . '/lib/public/IDBConnection.php', | 'OCP\\IDBConnection' => $baseDir . '/lib/public/IDBConnection.php', | ||||
'OCP\\IDateTimeFormatter' => $baseDir . '/lib/public/IDateTimeFormatter.php', | 'OCP\\IDateTimeFormatter' => $baseDir . '/lib/public/IDateTimeFormatter.php', | ||||
'OCP\\IDateTimeZone' => $baseDir . '/lib/public/IDateTimeZone.php', | 'OCP\\IDateTimeZone' => $baseDir . '/lib/public/IDateTimeZone.php', | ||||
'OCP\\IDb' => $baseDir . '/lib/public/IDb.php', | |||||
'OCP\\IEventSource' => $baseDir . '/lib/public/IEventSource.php', | 'OCP\\IEventSource' => $baseDir . '/lib/public/IEventSource.php', | ||||
'OCP\\IGroup' => $baseDir . '/lib/public/IGroup.php', | 'OCP\\IGroup' => $baseDir . '/lib/public/IGroup.php', | ||||
'OCP\\IGroupManager' => $baseDir . '/lib/public/IGroupManager.php', | 'OCP\\IGroupManager' => $baseDir . '/lib/public/IGroupManager.php', | ||||
'OC\\AppConfig' => $baseDir . '/lib/private/AppConfig.php', | 'OC\\AppConfig' => $baseDir . '/lib/private/AppConfig.php', | ||||
'OC\\AppFramework\\App' => $baseDir . '/lib/private/AppFramework/App.php', | 'OC\\AppFramework\\App' => $baseDir . '/lib/private/AppFramework/App.php', | ||||
'OC\\AppFramework\\Core\\API' => $baseDir . '/lib/private/AppFramework/Core/API.php', | 'OC\\AppFramework\\Core\\API' => $baseDir . '/lib/private/AppFramework/Core/API.php', | ||||
'OC\\AppFramework\\Db\\Db' => $baseDir . '/lib/private/AppFramework/Db/Db.php', | |||||
'OC\\AppFramework\\DependencyInjection\\DIContainer' => $baseDir . '/lib/private/AppFramework/DependencyInjection/DIContainer.php', | 'OC\\AppFramework\\DependencyInjection\\DIContainer' => $baseDir . '/lib/private/AppFramework/DependencyInjection/DIContainer.php', | ||||
'OC\\AppFramework\\Http' => $baseDir . '/lib/private/AppFramework/Http.php', | 'OC\\AppFramework\\Http' => $baseDir . '/lib/private/AppFramework/Http.php', | ||||
'OC\\AppFramework\\Http\\Dispatcher' => $baseDir . '/lib/private/AppFramework/Http/Dispatcher.php', | 'OC\\AppFramework\\Http\\Dispatcher' => $baseDir . '/lib/private/AppFramework/Http/Dispatcher.php', |
'OCP\\IDBConnection' => __DIR__ . '/../../..' . '/lib/public/IDBConnection.php', | 'OCP\\IDBConnection' => __DIR__ . '/../../..' . '/lib/public/IDBConnection.php', | ||||
'OCP\\IDateTimeFormatter' => __DIR__ . '/../../..' . '/lib/public/IDateTimeFormatter.php', | 'OCP\\IDateTimeFormatter' => __DIR__ . '/../../..' . '/lib/public/IDateTimeFormatter.php', | ||||
'OCP\\IDateTimeZone' => __DIR__ . '/../../..' . '/lib/public/IDateTimeZone.php', | 'OCP\\IDateTimeZone' => __DIR__ . '/../../..' . '/lib/public/IDateTimeZone.php', | ||||
'OCP\\IDb' => __DIR__ . '/../../..' . '/lib/public/IDb.php', | |||||
'OCP\\IEventSource' => __DIR__ . '/../../..' . '/lib/public/IEventSource.php', | 'OCP\\IEventSource' => __DIR__ . '/../../..' . '/lib/public/IEventSource.php', | ||||
'OCP\\IGroup' => __DIR__ . '/../../..' . '/lib/public/IGroup.php', | 'OCP\\IGroup' => __DIR__ . '/../../..' . '/lib/public/IGroup.php', | ||||
'OCP\\IGroupManager' => __DIR__ . '/../../..' . '/lib/public/IGroupManager.php', | 'OCP\\IGroupManager' => __DIR__ . '/../../..' . '/lib/public/IGroupManager.php', | ||||
'OC\\AppConfig' => __DIR__ . '/../../..' . '/lib/private/AppConfig.php', | 'OC\\AppConfig' => __DIR__ . '/../../..' . '/lib/private/AppConfig.php', | ||||
'OC\\AppFramework\\App' => __DIR__ . '/../../..' . '/lib/private/AppFramework/App.php', | 'OC\\AppFramework\\App' => __DIR__ . '/../../..' . '/lib/private/AppFramework/App.php', | ||||
'OC\\AppFramework\\Core\\API' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Core/API.php', | 'OC\\AppFramework\\Core\\API' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Core/API.php', | ||||
'OC\\AppFramework\\Db\\Db' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Db/Db.php', | |||||
'OC\\AppFramework\\DependencyInjection\\DIContainer' => __DIR__ . '/../../..' . '/lib/private/AppFramework/DependencyInjection/DIContainer.php', | 'OC\\AppFramework\\DependencyInjection\\DIContainer' => __DIR__ . '/../../..' . '/lib/private/AppFramework/DependencyInjection/DIContainer.php', | ||||
'OC\\AppFramework\\Http' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Http.php', | 'OC\\AppFramework\\Http' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Http.php', | ||||
'OC\\AppFramework\\Http\\Dispatcher' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Http/Dispatcher.php', | 'OC\\AppFramework\\Http\\Dispatcher' => __DIR__ . '/../../..' . '/lib/private/AppFramework/Http/Dispatcher.php', |
<?php | |||||
/** | |||||
* @copyright Copyright (c) 2016, ownCloud, Inc. | |||||
* | |||||
* @author Bernhard Posselt <dev@bernhard-posselt.com> | |||||
* @author Joas Schilling <coding@schilljs.com> | |||||
* @author Morris Jobke <hey@morrisjobke.de> | |||||
* @author Robin Appelman <robin@icewind.nl> | |||||
* @author Robin McCorkell <robin@mccorkell.me.uk> | |||||
* @author Thomas Müller <thomas.mueller@tmit.eu> | |||||
* | |||||
* @license AGPL-3.0 | |||||
* | |||||
* This code is free software: you can redistribute it and/or modify | |||||
* it under the terms of the GNU Affero General Public License, version 3, | |||||
* as published by the Free Software Foundation. | |||||
* | |||||
* This program is distributed in the hope that it will be useful, | |||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||||
* GNU Affero General Public License for more details. | |||||
* | |||||
* You should have received a copy of the GNU Affero General Public License, version 3, | |||||
* along with this program. If not, see <http://www.gnu.org/licenses/> | |||||
* | |||||
*/ | |||||
namespace OC\AppFramework\Db; | |||||
use OCP\DB\QueryBuilder\IQueryBuilder; | |||||
use OCP\IDb; | |||||
use OCP\IDBConnection; | |||||
use OCP\PreConditionNotMetException; | |||||
use Doctrine\DBAL\Platforms\MySqlPlatform; | |||||
/** | |||||
* @deprecated use IDBConnection directly, will be removed in ownCloud 10 | |||||
* Small Facade for being able to inject the database connection for tests | |||||
*/ | |||||
class Db implements IDb { | |||||
/** | |||||
* @var IDBConnection | |||||
*/ | |||||
protected $connection; | |||||
/** | |||||
* @param IDBConnection $connection | |||||
*/ | |||||
public function __construct(IDBConnection $connection) { | |||||
$this->connection = $connection; | |||||
} | |||||
/** | |||||
* Gets the ExpressionBuilder for the connection. | |||||
* | |||||
* @return \OCP\DB\QueryBuilder\IQueryBuilder | |||||
*/ | |||||
public function getQueryBuilder() { | |||||
return $this->connection->getQueryBuilder(); | |||||
} | |||||
/** | |||||
* Used to abstract the ownCloud database access away | |||||
* | |||||
* @param string $sql the sql query with ? placeholder for params | |||||
* @param int $limit the maximum number of rows | |||||
* @param int $offset from which row we want to start | |||||
* @deprecated use prepare instead, will be removed in ownCloud 10 | |||||
* @return \OC_DB_StatementWrapper prepared SQL query | |||||
*/ | |||||
public function prepareQuery($sql, $limit = null, $offset = null) { | |||||
$isManipulation = \OC_DB::isManipulation($sql); | |||||
$statement = $this->connection->prepare($sql, $limit, $offset); | |||||
return new \OC_DB_StatementWrapper($statement, $isManipulation); | |||||
} | |||||
/** | |||||
* Used to get the id of the just inserted element | |||||
* | |||||
* @deprecated use lastInsertId instead, will be removed in ownCloud 10 | |||||
* @param string $tableName the name of the table where we inserted the item | |||||
* @return int the id of the inserted element | |||||
*/ | |||||
public function getInsertId($tableName) { | |||||
return $this->connection->lastInsertId($tableName); | |||||
} | |||||
/** | |||||
* Used to abstract the ownCloud database access away | |||||
* @param string $sql the sql query with ? placeholder for params | |||||
* @param int $limit the maximum number of rows | |||||
* @param int $offset from which row we want to start | |||||
* @return \Doctrine\DBAL\Driver\Statement The prepared statement. | |||||
*/ | |||||
public function prepare($sql, $limit=null, $offset=null) { | |||||
return $this->connection->prepare($sql, $limit, $offset); | |||||
} | |||||
/** | |||||
* Executes an, optionally parameterized, SQL query. | |||||
* | |||||
* If the query is parameterized, a prepared statement is used. | |||||
* If an SQLLogger is configured, the execution is logged. | |||||
* | |||||
* @param string $query The SQL query to execute. | |||||
* @param string[] $params The parameters to bind to the query, if any. | |||||
* @param array $types The types the previous parameters are in. | |||||
* @return \Doctrine\DBAL\Driver\Statement The executed statement. | |||||
*/ | |||||
public function executeQuery($query, array $params = array(), $types = array()) { | |||||
return $this->connection->executeQuery($query, $params, $types); | |||||
} | |||||
/** | |||||
* 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. | |||||
*/ | |||||
public function executeUpdate($query, array $params = array(), array $types = array()) { | |||||
return $this->connection->executeUpdate($query, $params, $types); | |||||
} | |||||
/** | |||||
* Used to get the id of the just inserted element | |||||
* @param string $table the name of the table where we inserted the item | |||||
* @return int the id of the inserted element | |||||
*/ | |||||
public function lastInsertId($table = null) { | |||||
return $this->connection->lastInsertId($table); | |||||
} | |||||
/** | |||||
* 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->connection->insertIfNotExist($table, $input, $compare); | |||||
} | |||||
/** | |||||
* 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 | |||||
*/ | |||||
public function setValues($table, array $keys, array $values, array $updatePreconditionValues = []) { | |||||
return $this->connection->setValues($table, $keys, $values, $updatePreconditionValues); | |||||
} | |||||
/** | |||||
* @inheritdoc | |||||
*/ | |||||
public function lockTable($tableName) { | |||||
$this->connection->lockTable($tableName); | |||||
} | |||||
/** | |||||
* @inheritdoc | |||||
*/ | |||||
public function unlockTable() { | |||||
$this->connection->unlockTable(); | |||||
} | |||||
/** | |||||
* Start a transaction | |||||
*/ | |||||
public function beginTransaction() { | |||||
$this->connection->beginTransaction(); | |||||
} | |||||
/** | |||||
* Check if a transaction is active | |||||
* | |||||
* @return bool | |||||
*/ | |||||
public function inTransaction() { | |||||
return $this->connection->inTransaction(); | |||||
} | |||||
/** | |||||
* Commit the database changes done during a transaction that is in progress | |||||
*/ | |||||
public function commit() { | |||||
$this->connection->commit(); | |||||
} | |||||
/** | |||||
* Rollback the database changes done during a transaction that is in progress | |||||
*/ | |||||
public function rollBack() { | |||||
$this->connection->rollBack(); | |||||
} | |||||
/** | |||||
* Gets the error code and message as a string for logging | |||||
* @return string | |||||
*/ | |||||
public function getError() { | |||||
return $this->connection->getError(); | |||||
} | |||||
/** | |||||
* Fetch the SQLSTATE associated with the last database operation. | |||||
* | |||||
* @return integer The last error code. | |||||
*/ | |||||
public function errorCode() { | |||||
return $this->connection->errorCode(); | |||||
} | |||||
/** | |||||
* Fetch extended error information associated with the last database operation. | |||||
* | |||||
* @return array The last error information. | |||||
*/ | |||||
public function errorInfo() { | |||||
return $this->connection->errorInfo(); | |||||
} | |||||
/** | |||||
* Establishes the connection with the database. | |||||
* | |||||
* @return bool | |||||
*/ | |||||
public function connect() { | |||||
return $this->connection->connect(); | |||||
} | |||||
/** | |||||
* Close the database connection | |||||
*/ | |||||
public function close() { | |||||
$this->connection->close(); | |||||
} | |||||
/** | |||||
* Quotes a given input parameter. | |||||
* | |||||
* @param mixed $input Parameter to be quoted. | |||||
* @param int $type Type of the parameter. | |||||
* @return string The quoted parameter. | |||||
*/ | |||||
public function quote($input, $type = IQueryBuilder::PARAM_STR) { | |||||
return $this->connection->quote($input, $type); | |||||
} | |||||
/** | |||||
* Gets the DatabasePlatform instance that provides all the metadata about | |||||
* the platform this driver connects to. | |||||
* | |||||
* @return \Doctrine\DBAL\Platforms\AbstractPlatform The database platform. | |||||
*/ | |||||
public function getDatabasePlatform() { | |||||
return $this->connection->getDatabasePlatform(); | |||||
} | |||||
/** | |||||
* Drop a table from the database if it exists | |||||
* | |||||
* @param string $table table name without the prefix | |||||
*/ | |||||
public function dropTable($table) { | |||||
$this->connection->dropTable($table); | |||||
} | |||||
/** | |||||
* Check if a table exists | |||||
* | |||||
* @param string $table table name without the prefix | |||||
* @return bool | |||||
*/ | |||||
public function tableExists($table) { | |||||
return $this->connection->tableExists($table); | |||||
} | |||||
/** | |||||
* Espace a parameter to be used in a LIKE query | |||||
* | |||||
* @param string $param | |||||
* @return string | |||||
*/ | |||||
public function escapeLikeParameter($param) { | |||||
return $this->connection->escapeLikeParameter($param); | |||||
} | |||||
/** | |||||
* Check whether or not the current database support 4byte wide unicode | |||||
* | |||||
* @return bool | |||||
* @since 11.0.0 | |||||
*/ | |||||
public function supports4ByteText() { | |||||
return $this->connection->supports4ByteText(); | |||||
} | |||||
} |
return $this->getServer()->getDateTimeFormatter(); | return $this->getServer()->getDateTimeFormatter(); | ||||
}); | }); | ||||
$this->registerService('OCP\\IDb', function($c) { | |||||
return $this->getServer()->getDb(); | |||||
}); | |||||
$this->registerService('OCP\\IDBConnection', function($c) { | $this->registerService('OCP\\IDBConnection', function($c) { | ||||
return $this->getServer()->getDatabaseConnection(); | return $this->getServer()->getDatabaseConnection(); | ||||
}); | }); |
use OC\App\AppStore\Fetcher\AppFetcher; | use OC\App\AppStore\Fetcher\AppFetcher; | ||||
use OC\App\AppStore\Fetcher\CategoryFetcher; | use OC\App\AppStore\Fetcher\CategoryFetcher; | ||||
use OC\AppFramework\Http\Request; | use OC\AppFramework\Http\Request; | ||||
use OC\AppFramework\Db\Db; | |||||
use OC\AppFramework\Utility\TimeFactory; | use OC\AppFramework\Utility\TimeFactory; | ||||
use OC\Command\AsyncBus; | use OC\Command\AsyncBus; | ||||
use OC\Diagnostics\EventLogger; | use OC\Diagnostics\EventLogger; | ||||
$connection->getConfiguration()->setSQLLogger($c->getQueryLogger()); | $connection->getConfiguration()->setSQLLogger($c->getQueryLogger()); | ||||
return $connection; | return $connection; | ||||
}); | }); | ||||
$this->registerService('Db', function (Server $c) { | |||||
return new Db($c->getDatabaseConnection()); | |||||
}); | |||||
$this->registerService('HTTPHelper', function (Server $c) { | $this->registerService('HTTPHelper', function (Server $c) { | ||||
$config = $c->getConfig(); | $config = $c->getConfig(); | ||||
return new HTTPHelper( | return new HTTPHelper( | ||||
return $this->query('CredentialsManager'); | return $this->query('CredentialsManager'); | ||||
} | } | ||||
/** | |||||
* Returns an instance of the db facade | |||||
* | |||||
* @deprecated use getDatabaseConnection, will be removed in ownCloud 10 | |||||
* @return \OCP\IDb | |||||
*/ | |||||
public function getDb() { | |||||
return $this->query('Db'); | |||||
} | |||||
/** | /** | ||||
* Returns an instance of the HTTP helper class | * Returns an instance of the HTTP helper class | ||||
* | * |
namespace OCP\AppFramework\Db; | namespace OCP\AppFramework\Db; | ||||
use OCP\IDBConnection; | use OCP\IDBConnection; | ||||
use OCP\IDb; | |||||
/** | /** | ||||
* @since 7.0.0 | * @since 7.0.0 | ||||
*/ | */ | ||||
protected function execute($sql, array $params=[], $limit=null, $offset=null){ | protected function execute($sql, array $params=[], $limit=null, $offset=null){ | ||||
if ($this->db instanceof IDb) { | |||||
$query = $this->db->prepareQuery($sql, $limit, $offset); | |||||
} else { | |||||
$query = $this->db->prepare($sql, $limit, $offset); | |||||
} | |||||
$query = $this->db->prepare($sql, $limit, $offset); | |||||
if ($this->isAssocArray($params)) { | if ($this->isAssocArray($params)) { | ||||
foreach ($params as $key => $param) { | foreach ($params as $key => $param) { | ||||
$result = $query->execute(); | $result = $query->execute(); | ||||
// this is only for backwards compatibility reasons and can be removed | |||||
// in owncloud 10. IDb returns a StatementWrapper from execute, PDO, | |||||
// Doctrine and IDbConnection don't so this needs to be done in order | |||||
// to stay backwards compatible for the things that rely on the | |||||
// StatementWrapper being returned | |||||
if ($result instanceof \OC_DB_StatementWrapper) { | |||||
return $result; | |||||
} | |||||
return $query; | return $query; | ||||
} | } | ||||
<?php | |||||
/** | |||||
* @copyright Copyright (c) 2016, ownCloud, Inc. | |||||
* | |||||
* @author Bernhard Posselt <dev@bernhard-posselt.com> | |||||
* @author Morris Jobke <hey@morrisjobke.de> | |||||
* | |||||
* @license AGPL-3.0 | |||||
* | |||||
* This code is free software: you can redistribute it and/or modify | |||||
* it under the terms of the GNU Affero General Public License, version 3, | |||||
* as published by the Free Software Foundation. | |||||
* | |||||
* This program is distributed in the hope that it will be useful, | |||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||||
* GNU Affero General Public License for more details. | |||||
* | |||||
* You should have received a copy of the GNU Affero General Public License, version 3, | |||||
* along with this program. If not, see <http://www.gnu.org/licenses/> | |||||
* | |||||
*/ | |||||
namespace OCP; | |||||
/** | |||||
* Small Facade for being able to inject the database connection for tests | |||||
* @since 7.0.0 - extends IDBConnection was added in 8.1.0 | |||||
*/ | |||||
interface IDb extends IDBConnection { | |||||
/** | |||||
* Used to abstract the owncloud database access away | |||||
* @param string $sql the sql query with ? placeholder for params | |||||
* @param int $limit the maximum number of rows | |||||
* @param int $offset from which row we want to start | |||||
* @return \OC_DB_StatementWrapper prepared SQL query | |||||
* @since 7.0.0 | |||||
*/ | |||||
public function prepareQuery($sql, $limit=null, $offset=null); | |||||
/** | |||||
* Used to get the id of the just inserted element | |||||
* @param string $tableName the name of the table where we inserted the item | |||||
* @return int the id of the inserted element | |||||
* @since 7.0.0 | |||||
*/ | |||||
public function getInsertId($tableName); | |||||
} |
*/ | */ | ||||
public function getCredentialsManager(); | public function getCredentialsManager(); | ||||
/** | |||||
* Returns an instance of the db facade | |||||
* @deprecated 8.1.0 use getDatabaseConnection, will be removed in ownCloud 10 | |||||
* @return \OCP\IDb | |||||
* @since 7.0.0 | |||||
*/ | |||||
public function getDb(); | |||||
/** | /** | ||||
* Returns the app config manager | * Returns the app config manager | ||||
* | * |
['DateTimeFormatter', '\OCP\IDateTimeFormatter'], | ['DateTimeFormatter', '\OCP\IDateTimeFormatter'], | ||||
['DateTimeZone', '\OC\DateTimeZone'], | ['DateTimeZone', '\OC\DateTimeZone'], | ||||
['DateTimeZone', '\OCP\IDateTimeZone'], | ['DateTimeZone', '\OCP\IDateTimeZone'], | ||||
['Db', '\OC\AppFramework\Db\Db'], | |||||
['Db', '\OCP\IDb'], | |||||
['EncryptionFileHelper', '\OC\Encryption\File'], | ['EncryptionFileHelper', '\OC\Encryption\File'], | ||||
['EncryptionFileHelper', '\OCP\Encryption\IFile'], | ['EncryptionFileHelper', '\OCP\Encryption\IFile'], |