From 02528316c5ccbe10464a3aeed12eef5637d2319b Mon Sep 17 00:00:00 2001
From: Daniel De Graaf
Date: Sat, 2 Oct 2010 17:25:07 -0400
Subject: Fix error handling and bad SQL syntax

---
 src/modules/m_sql_channels.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/modules/m_sql_channels.cpp')

diff --git a/src/modules/m_sql_channels.cpp b/src/modules/m_sql_channels.cpp
index 9a6d23b09..ecbe6d506 100644
--- a/src/modules/m_sql_channels.cpp
+++ b/src/modules/m_sql_channels.cpp
@@ -112,18 +112,21 @@ class ChanSQLDB : public Module
 		};
 
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		ServerInstance->Modules->AddService(InDB);
 
 		ParamL n;
 		n.push_back(tablename);
 		// just dump the entire thing back to us, please
 		sqldb->submit(new DatabaseReadQuery(this, InDB),
-			"SELECT (name, ts, modes, topic, topicset, topicts) FROM ?", n);
+			"SELECT name, ts, modes, topic, topicset, topicts FROM ?", n);
 	}
 	void ReadConfig(ConfigReadStatus& status)
 	{
 		ConfigTag *tag = ServerInstance->Config->GetTag ("chandb");
 
-		tablename = tag->getString("table");
+		tablename = tag->getString("table", "channels");
+		if (tablename.empty())
+			status.ReportError(tag, "Table name cannot be empty");
 		std::string dbid = tag->getString("dbid");
 		if (dbid.empty())
 			sqldb.SetProvider("SQL");
-- 
cgit v1.3.1-10-gc9f91