wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove beginTransaction, commit, rollback from OC_DB

Browse source
This commit is contained in:
Morris Jobke 2016-01-07 10:18:38 +01:00
parent 3917d888bd
commit 0a41cfefe3
2 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/private/db.php
View file

@ -172,27 +172,6 @@ class OC_DB {
return \OC::$server->getDatabaseConnection()->lastInsertId($table);
}
/**
* Start a transaction
*/
public static function beginTransaction() {
return \OC::$server->getDatabaseConnection()->beginTransaction();
}
/**
* Commit the database changes done during a transaction that is in progress
*/
public static function commit() {
return \OC::$server->getDatabaseConnection()->commit();
}
/**
* Rollback the database changes done during a transaction that is in progress
*/
public static function rollback() {
return \OC::$server->getDatabaseConnection()->rollback();
}
/**
* saves database schema to xml file
* @param string $file name of file

6
lib/private/files/cache/scanner.php vendored
View file

@ -336,7 +336,7 @@ class Scanner extends BasicEmitter {
$newChildren = $this->getNewChildren($path);
if ($this->useTransactions) {
\OC_DB::beginTransaction();
\OC::$server->getDatabaseConnection()->beginTransaction();
}
$exceptionOccurred = false;
foreach ($newChildren as $file) {
@ -361,7 +361,7 @@ class Scanner extends BasicEmitter {
$exceptionOccurred = true;
} catch (\OCP\Lock\LockedException $e) {
if ($this->useTransactions) {
\OC_DB::rollback();
\OC::$server->getDatabaseConnection()->rollback();
}
throw $e;
}
@ -372,7 +372,7 @@ class Scanner extends BasicEmitter {
$this->removeFromCache($child);
}
if ($this->useTransactions) {
\OC_DB::commit();
\OC::$server->getDatabaseConnection()->commit();
}
if ($exceptionOccurred) {
// It might happen that the parallel scan process has already