diff options
| author | Adam <Adam@anope.org> | 2012-12-27 21:43:19 -0500 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2012-12-28 10:43:30 -0500 |
| commit | 379b2ccf92b6124f2026a5ec683cfc98f08e223a (patch) | |
| tree | 9cec160f53a579a83950656d5978301823f4312d /modules | |
| parent | 3fb4cf56b651eb500b1bbafb14c0d328d81e1f3c (diff) | |
The timestamp column in SQL should actually be null sometimes, and fixed some valgrind errors with db_sql_live
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/database/db_sql_live.cpp | 2 | ||||
| -rw-r--r-- | modules/extra/m_mysql.cpp | 2 | ||||
| -rw-r--r-- | modules/extra/m_sqlite.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/modules/database/db_sql_live.cpp b/modules/database/db_sql_live.cpp index 8d8836055..0461e40b9 100644 --- a/modules/database/db_sql_live.cpp +++ b/modules/database/db_sql_live.cpp @@ -192,8 +192,8 @@ class DBMySQL : public Module, public Pipe std::map<unsigned int, Serializable *>::iterator it = obj->objects.find(id); if (it != obj->objects.end()) { - it->second->Destroy(); obj->objects.erase(it); + it->second->Destroy(); // This also tries to remove this object from the map } } else diff --git a/modules/extra/m_mysql.cpp b/modules/extra/m_mysql.cpp index a8433fd38..d431ba909 100644 --- a/modules/extra/m_mysql.cpp +++ b/modules/extra/m_mysql.cpp @@ -372,7 +372,7 @@ std::vector<Query> MySQLService::CreateTable(const Anope::string &table, const D if (known_cols.empty()) { Anope::string query_text = "CREATE TABLE `" + table + "` (`id` int(10) unsigned NOT NULL AUTO_INCREMENT," - " `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"; + " `timestamp` timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"; for (Data::Map::const_iterator it = data.data.begin(), it_end = data.data.end(); it != it_end; ++it) { known_cols.insert(it->first); diff --git a/modules/extra/m_sqlite.cpp b/modules/extra/m_sqlite.cpp index 5d59c3eb9..69fd16b9f 100644 --- a/modules/extra/m_sqlite.cpp +++ b/modules/extra/m_sqlite.cpp @@ -209,7 +209,7 @@ std::vector<Query> SQLiteService::CreateTable(const Anope::string &table, const if (known_cols.empty()) { - Anope::string query_text = "CREATE TABLE `" + table + "` (`id` INTEGER PRIMARY KEY, `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP"; + Anope::string query_text = "CREATE TABLE `" + table + "` (`id` INTEGER PRIMARY KEY, `timestamp` timestamp DEFAULT CURRENT_TIMESTAMP"; for (Data::Map::const_iterator it = data.data.begin(), it_end = data.data.end(); it != it_end; ++it) { |