diff options
| author |  Daniel De Graaf | 2010-10-02 17:25:07 -0400 |
|---|---|---|
| committer | Daniel De Graaf | 2010-10-02 17:25:07 -0400 |
| commit | 02528316c5ccbe10464a3aeed12eef5637d2319b (patch) | |
| tree | 4ef0fe57023a076a086e6a7bb6ee3f3eed0e7688 /src/modules/m_sql_channels.cpp | |
| parent | Remove some unneeded complexity from spanningtree (diff) | |
Fix error handling and bad SQL syntax
Diffstat (limited to 'src/modules/m_sql_channels.cpp')
| -rw-r--r-- | src/modules/m_sql_channels.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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"); |