Remove OC_DB::isError

diff --git a/lib/private/db.php b/lib/private/db.php
index f339855fb20a5bb780f030335f235a31a5864fe4..bac0f600e953a7f8098364ebbd3d9afef0b90e71 100644 (file)
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -262,15 +262,6 @@ class OC_DB {
                $schemaManager->removeDBStructure($file);
        }
 
-       /**
-        * check if a result is an error, works with Doctrine
-        * @param mixed $result
-        * @return bool
-        */
-       public static function isError($result) {
-               //Doctrine returns false on error (and throws an exception)
-               return $result === false;
-       }
        /**
         * check if a result is an error and throws an exception, works with \Doctrine\DBAL\DBALException
         * @param mixed $result
@@ -279,20 +270,16 @@ class OC_DB {
         * @throws \OC\DatabaseException
         */
        public static function raiseExceptionOnError($result, $message = null) {
-               if(self::isError($result)) {
+               if($result === false) {
                        if ($message === null) {
                                $message = self::getErrorMessage();
                        } else {
                                $message .= ', Root cause:' . self::getErrorMessage();
                        }
-                       throw new \OC\DatabaseException($message, self::getErrorCode());
+                       throw new \OC\DatabaseException($message, \OC::$server->getDatabaseConnection()->errorCode());
                }
        }
 
-       public static function getErrorCode() {
-               $connection = \OC::$server->getDatabaseConnection();
-               return $connection->errorCode();
-       }
        /**
         * returns the error code and message as a string for logging
         * works with DoctrineException

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index fff437b3ff72f601cc6bdb48bd4f20ae5672771d..b10de850356ee2a3f8bcc265d92d0b0ebb0fcc50 100644 (file)
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -491,7 +491,7 @@ class Share extends Constants {
        public static function getShareByToken($token, $checkPasswordProtection = true) {
                $query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `token` = ?', 1);
                $result = $query->execute(array($token));
-               if (\OC_DB::isError($result)) {
+               if ($result === false) {
                        \OCP\Util::writeLog('OCP\Share', \OC_DB::getErrorMessage() . ', token=' . $token, \OCP\Util::ERROR);
                }
                $row = $result->fetchRow();
@@ -1722,7 +1722,7 @@ class Share extends Constants {
                $root = strlen($root);
                $query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit);
                $result = $query->execute($queryArgs);
-               if (\OC_DB::isError($result)) {
+               if ($result === false) {
                        \OCP\Util::writeLog('OCP\Share',
                                \OC_DB::getErrorMessage() . ', select=' . $select . ' where=',
                                \OCP\Util::ERROR);
@@ -1786,7 +1786,7 @@ class Share extends Constants {
                                if (isset($row['parent'])) {
                                        $query = \OC_DB::prepare('SELECT `file_target` FROM `*PREFIX*share` WHERE `id` = ?');
                                        $parentResult = $query->execute(array($row['parent']));
-                                       if (\OC_DB::isError($result)) {
+                                       if ($result === false) {
                                                \OCP\Util::writeLog('OCP\Share', 'Can\'t select parent: ' .
                                                        \OC_DB::getErrorMessage() . ', select=' . $select . ' where=' . $where,
                                                        \OCP\Util::ERROR);

diff --git a/lib/private/user/database.php b/lib/private/user/database.php
index 98850771212d75ba470fdbf420b0d1e770e32c3d..5bee509e8bded3c2332955070b42398ba397d3c9 100644 (file)
--- a/lib/private/user/database.php
+++ b/lib/private/user/database.php
@@ -210,7 +210,7 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend {
                        $query = OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)');
                        $result = $query->execute(array($uid));
 
-                       if (OC_DB::isError($result)) {
+                       if ($result === false) {
                                \OCP\Util::writeLog('core', OC_DB::getErrorMessage(), \OCP\Util::ERROR);
                                return false;
                        }
@@ -287,7 +287,7 @@ class OC_User_Database extends OC_User_Backend implements \OCP\IUserBackend {
        public function countUsers() {
                $query = OC_DB::prepare('SELECT COUNT(*) FROM `*PREFIX*users`');
                $result = $query->execute();
-               if (OC_DB::isError($result)) {
+               if ($result === false) {
                        \OCP\Util::writeLog('core', OC_DB::getErrorMessage(), \OCP\Util::ERROR);
                        return false;
                }