Remove \OC\DB\ConnectionWrapper, have \OC\DB\Connection implement \OCP\IDBConnection...

diff --git a/lib/private/db/connection.php b/lib/private/db/connection.php
index b7981fcd6919e64f67b5050f3366bf7683fcf202..f91175511b052348dbb5d383ca2340cefe47053c 100644 (file)
--- a/lib/private/db/connection.php
+++ b/lib/private/db/connection.php
@@ -11,8 +11,9 @@ use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
 use Doctrine\Common\EventManager;
+use OCP\IDBConnection;
 
-class Connection extends \Doctrine\DBAL\Connection {
+class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
        /**
         * @var string $tablePrefix
         */
@@ -185,13 +186,4 @@ class Connection extends \Doctrine\DBAL\Connection {
        protected function replaceTablePrefix($statement) {
                return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
        }
-
-       public function enableQueryStatementCaching() {
-               $this->cachingQueryStatementEnabled = true;
-       }
-
-       public function disableQueryStatementCaching() {
-               $this->cachingQueryStatementEnabled = false;
-               $this->preparedQueries = array();
-       }
 }

diff --git a/lib/private/db/connectionwrapper.php b/lib/private/db/connectionwrapper.php
deleted file mode 100644 (file)
index 132e766..0000000
--- a/lib/private/db/connectionwrapper.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Thomas Müller <deepdiver@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\DB;
-
-
-class ConnectionWrapper implements \OCP\IDBConnection {
-
-       private $connection;
-
-       public function __construct(Connection $conn) {
-               $this->connection = $conn;
-       }
-
-       /**
-        * Used to the owncloud database access away
-        * @param string $sql the sql query with ? placeholder for params
-        * @param int $limit the maximum number of rows
-        * @param int $offset from which row we want to start
-        * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
-        */
-       public function prepare($sql, $limit = null, $offset = null)
-       {
-               return $this->connection->prepare($sql, $limit, $offset);
-       }
-
-       /**
-        * Used to get the id of the just inserted element
-        * @param string $table the name of the table where we inserted the item
-        * @return string the id of the inserted element
-        */
-       public function lastInsertId($table = null)
-       {
-               return $this->connection->lastInsertId($table);
-       }
-
-       /**
-        * Insert a row if a matching row doesn't exists.
-        * @param string $table The table name (will replace *PREFIX*) to perform the replace on.
-        * @param array $input
-        *
-        * The input array if in the form:
-        *
-        * array ( 'id' => array ( 'value' => 6,
-        *    'key' => true
-        *    ),
-        *    'name' => array ('value' => 'Stoyan'),
-        *    'family' => array ('value' => 'Stefanov'),
-        *    'birth_date' => array ('value' => '1975-06-20')
-        *    );
-        * @return bool
-        *
-        */
-       public function insertIfNotExist($table, $input)
-       {
-               return $this->connection->insertIfNotExist($table, $input);
-       }
-
-       /**
-        * Start a transaction
-        * @return bool TRUE on success or FALSE on failure
-        */
-       public function beginTransaction()
-       {
-               return $this->connection->beginTransaction();
-       }
-
-       /**
-        * Commit the database changes done during a transaction that is in progress
-        * @return bool TRUE on success or FALSE on failure
-        */
-       public function commit()
-       {
-               return $this->connection->commit();
-       }
-
-       /**
-        * Rollback the database changes done during a transaction that is in progress
-        * @return bool TRUE on success or FALSE on failure
-        */
-       public function rollBack()
-       {
-               return $this->connection->rollBack();
-       }
-
-       /**
-        * Gets the error code and message as a string for logging
-        * @return string
-        */
-       public function getError()
-       {
-               return $this->connection->getError();
-       }
-}

diff --git a/lib/private/server.php b/lib/private/server.php
index f7ffee484ea13b97d4e0697ecee9d7af77d549b4..26d540ab23900968edf3387a2ebe49b8bc1313f5 100644 (file)
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -469,7 +469,7 @@ class Server extends SimpleContainer implements IServerContainer {
         * @return \OCP\IDBConnection
         */
        function getDatabaseConnection() {
-               return new ConnectionWrapper(\OC_DB::getConnection());
+               return \OC_DB::getConnection();
        }
 
        /**