# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1298959963 0
# Node ID 8a271b3fcaa7d5e84352bfc43165fb7c5d27c889
# Parent  ff80a8471e86680a1018257a6d0679e8b827272f
mod_storage_sql: Display friendlier error when LuaDBI is missing

diff -r ff80a8471e86 -r 8a271b3fcaa7 plugins/mod_storage_sql.lua
--- a/plugins/mod_storage_sql.lua	Sat Feb 26 00:23:48 2011 +0000
+++ b/plugins/mod_storage_sql.lua	Tue Mar 01 06:12:43 2011 +0000
@@ -96,7 +96,18 @@
 end
 
 do -- process options to get a db connection
-	DBI = require "DBI";
+	local ok;
+	prosody.unlock_globals();
+	ok, DBI = pcall(require, "DBI");
+	if not ok then
+		package.loaded["DBI"] = {};
+		module:log("error", "Failed to load the LuaDBI library for accessing SQL databases: %s", DBI);
+		module:log("error", "More information on installing LuaDBI can be found at http://prosody.im/doc/depends#luadbi");
+	end
+	prosody.lock_globals();
+	if not ok or not DBI.Connect then
+		return; -- Halt loading of this module
+	end
 
 	params = params or { driver = "SQLite3" };