summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Bartram <daneybartram@gmail.com>2014-10-24 17:44:06 +0100
committerDan Bartram <daneybartram@gmail.com>2014-10-24 17:44:06 +0100
commit9c1015b790560439b039c0cf7e162b316fe3a2f7 (patch)
tree93307aa24eb0981e007cd6af69155dc5461c0945
parent25a4b5a93581800887fceef7444b0d3702e4f018 (diff)
downloadnextcloud-server-9c1015b790560439b039c0cf7e162b316fe3a2f7.tar.gz
nextcloud-server-9c1015b790560439b039c0cf7e162b316fe3a2f7.zip
Add missing DB rollback functionality
-rw-r--r--lib/private/db.php7
-rw-r--r--lib/public/db.php7
2 files changed, 14 insertions, 0 deletions
diff --git a/lib/private/db.php b/lib/private/db.php
index 9b904a1518f..b820281b8a3 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -205,6 +205,13 @@ class OC_DB {
}
/**
+ * 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
* @param int $mode
diff --git a/lib/public/db.php b/lib/public/db.php
index ba3a4724ce0..e8fc817106e 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -97,6 +97,13 @@ class DB {
}
/**
+ * Rollback the database changes done during a transaction that is in progress
+ */
+ public static function rollback() {
+ \OC_DB::rollback();
+ }
+
+ /**
* Check if a result is an error, works with Doctrine
* @param mixed $result
* @return bool