From: Thomas Schmidt <tschmidt@suse.de>
Date: Fri, 30 Sep 2011 12:40:17 +0000 (+0200)
Subject: enhance detection of un-initialized database
X-Git-Tag: v3.0~101^2~34
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7fb89c5386fe7f1a1e238853a24d1da556ab9719;p=nextcloud-server.git

enhance detection of un-initialized database
---

diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index a41aeed4850..967e3335b13 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -582,6 +582,12 @@ 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 ede8ba897e9..4bcb184b100 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -97,6 +97,14 @@ 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);