From 35794877981720c8b782deaec57ea88ab31577b5 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 21 Mar 2018 12:17:55 +0100
Subject: [PATCH] Remove unused and deprecated methods of OCP\DB

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 lib/private/Tags.php | 12 ++++++------
 lib/public/DB.php    | 29 -----------------------------
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/lib/private/Tags.php b/lib/private/Tags.php
index 2bc5572c40f64..cf1c5c0fbad45 100644
--- a/lib/private/Tags.php
+++ b/lib/private/Tags.php
@@ -237,7 +237,7 @@ public function getTagsForObjects(array $objIds) {
 					$entries[$objId][] = $row['category'];
 				}
 				if ($result === null) {
-					\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
+					\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), \OCP\Util::ERROR);
 					return false;
 				}
 			}
@@ -291,7 +291,7 @@ public function getIdsForTag($tag) {
 			$stmt = \OCP\DB::prepare($sql);
 			$result = $stmt->execute(array($tagId));
 			if ($result === null) {
-				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), \OCP\Util::ERROR);
 				return false;
 			}
 		} catch(\Exception $e) {
@@ -534,7 +534,7 @@ public static function post_deleteUser($arguments) {
 				. 'WHERE `uid` = ?');
 			$result = $stmt->execute(array($arguments['uid']));
 			if ($result === null) {
-				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), \OCP\Util::ERROR);
 			}
 		} catch(\Exception $e) {
 			\OC::$server->getLogger()->logException($e, [
@@ -572,7 +572,7 @@ public static function post_deleteUser($arguments) {
 				. 'WHERE `uid` = ?');
 			$result = $stmt->execute(array($arguments['uid']));
 			if ($result === null) {
-				\OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OC::$server->getDatabaseConnection()->getError(), \OCP\Util::ERROR);
 			}
 		} catch(\Exception $e) {
 			\OC::$server->getLogger()->logException($e, [
@@ -603,7 +603,7 @@ public function purgeObjects(array $ids) {
 			$stmt = \OCP\DB::prepare($query);
 			$result = $stmt->execute($updates);
 			if ($result === null) {
-				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(), \OCP\Util::ERROR);
+				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(), \OCP\Util::ERROR);
 				return false;
 			}
 		} catch(\Exception $e) {
@@ -773,7 +773,7 @@ public function delete($names) {
 					$result = $stmt->execute(array($id));
 					if ($result === null) {
 						\OCP\Util::writeLog('core',
-							__METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage(),
+							__METHOD__. 'DB error: ' . \OC::$server->getDatabaseConnection()->getError(),
 							\OCP\Util::ERROR);
 						return false;
 					}
diff --git a/lib/public/DB.php b/lib/public/DB.php
index 23ebdceccd0ea..85a34ff37a0ab 100644
--- a/lib/public/DB.php
+++ b/lib/public/DB.php
@@ -61,33 +61,4 @@ static public function prepare( $query, $limit=null, $offset=null ) {
 		return \OC_DB::prepare($query, $limit, $offset);
 	}
 
-	/**
-	 * Start a transaction
-	 * @deprecated 8.1.0 use beginTransaction() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
-	 * @since 4.5.0
-	 */
-	public static function beginTransaction() {
-		\OC::$server->getDatabaseConnection()->beginTransaction();
-	}
-
-	/**
-	 * Commit the database changes done during a transaction that is in progress
-	 * @deprecated 8.1.0 use commit() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
-	 * @since 4.5.0
-	 */
-	public static function commit() {
-		\OC::$server->getDatabaseConnection()->commit();
-	}
-
-	/**
-	 * returns the error code and message as a string for logging
-	 * works with DoctrineException
-	 * @return string
-	 * @deprecated 8.1.0 use getError() of \OCP\IDBConnection - \OC::$server->getDatabaseConnection()
-	 * @since 6.0.0
-	 */
-	public static function getErrorMessage() {
-		return \OC::$server->getDatabaseConnection()->getError();
-	}
-
 }