eliminate OC_Template::printErrorPage in database classes, fixes #12182

diff --git a/lib/private/db/adapter.php b/lib/private/db/adapter.php
index 972008776f6007e642fc95118f20e87208cb18a3..93d69cf418328ca411154f68d0c78756bfe3cc79 100644 (file)
--- a/lib/private/db/adapter.php
+++ b/lib/private/db/adapter.php
@@ -43,6 +43,7 @@ class Adapter {
         * insert the @input values when they do not exist yet
         * @param string $table name
         * @param array $input key->value pair, key has to be sanitized properly
+        * @throws \OC\HintException
         * @return int count of inserted rows
         */
        public function insertIfNotExist($table, $input) {
@@ -71,7 +72,7 @@ class Adapter {
                        $entry .= 'Offending command was: ' . $query.'<br />';
                        \OC_Log::write('core', $entry, \OC_Log::FATAL);
                        error_log('DB error: ' . $entry);
-                       \OC_Template::printErrorPage( $entry );
+                       throw new \OC\HintException($entry);
                }
        }
 }

diff --git a/lib/private/db/adaptersqlite.php b/lib/private/db/adaptersqlite.php
index 3471fcf4042bd688a62d6724e4149cf246791543..fa0e7eb62373ce805507f8e649b97086d79a577d 100644 (file)
--- a/lib/private/db/adaptersqlite.php
+++ b/lib/private/db/adaptersqlite.php
@@ -42,7 +42,7 @@ class AdapterSqlite extends Adapter {
                        $entry .= 'Offending command was: ' . $query . '<br />';
                        \OC_Log::write('core', $entry, \OC_Log::FATAL);
                        error_log('DB error: '.$entry);
-                       \OC_Template::printErrorPage( $entry );
+                       throw new \OC\HintException($entry);
                }
 
                if ($stmt->fetchColumn() === '0') {
@@ -61,7 +61,7 @@ class AdapterSqlite extends Adapter {
                        $entry .= 'Offending command was: ' . $query.'<br />';
                        \OC_Log::write('core', $entry, \OC_Log::FATAL);
                        error_log('DB error: ' . $entry);
-                       \OC_Template::printErrorPage( $entry );
+                       throw new \OC\HintException($entry);
                }
 
                return $result;

diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php
index ad63de98e933a238be7e4c6937e18d992c5f5372..8d972411fe4f485bb858242aa3b6e69d8d047f17 100644 (file)
--- a/lib/private/db/statementwrapper.php
+++ b/lib/private/db/statementwrapper.php
@@ -64,7 +64,7 @@ class OC_DB_StatementWrapper {
                } else {
                        $result = $this->statement->execute();
                }
-               
+
                if ($result === false) {
                        return false;
                }
@@ -161,11 +161,10 @@ class OC_DB_StatementWrapper {
                        // send http status 503
                        header('HTTP/1.1 503 Service Temporarily Unavailable');
                        header('Status: 503 Service Temporarily Unavailable');
-                       OC_Template::printErrorPage('Failed to connect to database');
-                       die ($entry);
+                       throw new \OC\HintException($entry);
                }
        }
-    
+
        /**
         * provide an alias for fetch
         *