From c3b57944ac31f63cbbd575dfd7200fa3b050f4ef Mon Sep 17 00:00:00 2001 From: Thomas Schmidt Date: Fri, 30 Sep 2011 17:03:04 +0200 Subject: [PATCH] Revert "enhance detection of un-initialized database", conflicted with setup step, needs rework This reverts commit 7fb89c5386fe7f1a1e238853a24d1da556ab9719. --- lib/MDB2/Driver/sqlite3.php | 6 ------ lib/db.php | 8 -------- 2 files changed, 14 deletions(-) diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php index 967e3335b13..a41aeed4850 100644 --- a/lib/MDB2/Driver/sqlite3.php +++ b/lib/MDB2/Driver/sqlite3.php @@ -582,12 +582,6 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common return $query; } - /* Dummy interface for sqlite, to stay compatible with the database abstraction */ - function getUserInfo() { - return "sqlite standard user"; - } - - // }}} // {{{ getServerVersion() diff --git a/lib/db.php b/lib/db.php index 4bcb184b100..ede8ba897e9 100644 --- a/lib/db.php +++ b/lib/db.php @@ -97,14 +97,6 @@ class OC_DB { die( $error ); } - self::$DBConnection->loadModule('Manager'); - if (count(self::$DBConnection->listTables()) == 0) { - $error = 'database tables not initialized, using '.$CONFIG_DBTYPE.'. ('.self::$DBConnection->getUserInfo() . ')'; - if(defined("DEBUG") && DEBUG) {error_log( $error);} - if(defined("DEBUG") && DEBUG) {error_log( self::$DBConnection->getUserInfo());} - die( $error ); - } - // We always, really always want associative arrays self::$DBConnection->setFetchMode(MDB2_FETCHMODE_ASSOC); -- 2.39.5