diff options
Diffstat (limited to 'lib/private/db.php')
| -rw-r--r-- | lib/private/db.php | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/lib/private/db.php b/lib/private/db.php index ba069977d35..381ed93e81e 100644 --- a/lib/private/db.php +++ b/lib/private/db.php @@ -110,10 +110,9 @@ class OC_DB { * The existing database connection is closed and connected again */ public static function reconnect() { - if(self::$connection) { - self::$connection->close(); - self::$connection->connect(); - } + $connection = \OC::$server->getDatabaseConnection(); + $connection->close(); + $connection->connect(); } /** @@ -146,7 +145,7 @@ class OC_DB { * SQL query via Doctrine prepare(), needs to be execute()'d! */ static public function prepare( $query , $limit = null, $offset = null, $isManipulation = null) { - self::connect(); + $connection = \OC::$server->getDatabaseConnection(); if ($isManipulation === null) { //try to guess, so we return the number of rows on manipulations @@ -155,7 +154,7 @@ class OC_DB { // return the result try { - $result = self::$connection->prepare($query, $limit, $offset); + $result =$connection->prepare($query, $limit, $offset); } catch (\Doctrine\DBAL\DBALException $e) { throw new \DatabaseException($e->getMessage(), $query); } @@ -252,8 +251,7 @@ class OC_DB { * cause trouble! */ public static function insertid($table=null) { - self::connect(); - return self::$connection->lastInsertId($table); + return \OC::$server->getDatabaseConnection()->lastInsertId($table); } /** @@ -263,24 +261,21 @@ class OC_DB { * @return boolean number of updated rows */ public static function insertIfNotExist($table, $input) { - self::connect(); - return self::$connection->insertIfNotExist($table, $input); + return \OC::$server->getDatabaseConnection()->insertIfNotExist($table, $input); } /** * Start a transaction */ public static function beginTransaction() { - self::connect(); - self::$connection->beginTransaction(); + return \OC::$server->getDatabaseConnection()->beginTransaction(); } /** * Commit the database changes done during a transaction that is in progress */ public static function commit() { - self::connect(); - self::$connection->commit(); + return \OC::$server->getDatabaseConnection()->commit(); } /** @@ -415,18 +410,6 @@ class OC_DB { } /** - * @param bool $enabled - */ - static public function enableCaching($enabled) { - self::connect(); - if ($enabled) { - self::$connection->enableQueryStatementCaching(); - } else { - self::$connection->disableQueryStatementCaching(); - } - } - - /** * Checks if a table exists in the database - the database prefix will be prepended * * @param string $table |