Remove IDb interface which was deprecated for 3 years already

Signed-off-by: Joas Schilling <coding@schilljs.com>

1 files changed, 1 insertions, 15 deletions

diff --git a/lib/public/AppFramework/Db/Mapper.php b/lib/public/AppFramework/Db/Mapper.php
index aa3d9cdde37..611791a4364 100644
--- a/lib/public/AppFramework/Db/Mapper.php
+++ b/lib/public/AppFramework/Db/Mapper.php
@@ -28,7 +28,6 @@
 namespace OCP\AppFramework\Db;
 
 use OCP\IDBConnection;
-use OCP\IDb;
 
 
 /**
@@ -229,11 +228,7 @@ abstract class Mapper {
 	 * @since 7.0.0
 	 */
 	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)) {
 			foreach ($params as $key => $param) {
@@ -251,15 +246,6 @@ abstract class Mapper {
 
 		$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;
 	}