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

Merge pull request #6503 from owncloud/finally-kill-mdb2-master 

Finally kill mdb2 master
This commit is contained in:
Vincent Petry 2013-12-19 02:56:46 -08:00
parent 748d90592a aa17a896ac
commit 684e331b5b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty

@ -1 +1 @@
Subproject commit 42efd966284debadf83b761367e529bc45f806d6
Subproject commit 66b9afaeb53f31a2a02d4a998bad4a6f93620ffa

12
lib/public/db.php
View File

@ -39,9 +39,9 @@ class DB {
* @param string $query Query string
* @param int $limit Limit of the SQL statement
* @param int $offset Offset of the SQL statement
* @return \MDB2_Statement_Common prepared SQL query
* @return \Doctrine\DBAL\Statement prepared SQL query
*
* SQL query via MDB2 prepare(), needs to be execute()'d!
* SQL query via Doctrine prepare(), needs to be execute()'d!
*/
static public function prepare( $query, $limit=null, $offset=null ) {
return(\OC_DB::prepare($query, $limit, $offset));
@ -73,7 +73,7 @@ class DB {
* @param $table string The optional table name (will replace *PREFIX*) and add sequence suffix
* @return int
*
* MDB2 lastInsertID()
* \Doctrine\DBAL\Connection lastInsertID()
*
* Call this method right after the insert command or other functions may
* cause trouble!
@ -86,18 +86,18 @@ class DB {
* Start a transaction
*/
public static function beginTransaction() {
return(\OC_DB::beginTransaction());
\OC_DB::beginTransaction();
}
/**
* Commit the database changes done during a transaction that is in progress
*/
public static function commit() {
return(\OC_DB::commit());
\OC_DB::commit();
}
/**
* Check if a result is an error, works with MDB2 and PDOException
* Check if a result is an error, works with Doctrine
* @param mixed $result
* @return bool
*/