From 5e63ab2ccd1823a9a07c39bd16e562c541938c19 Mon Sep 17 00:00:00 2001 From: Michal Micka Date: Thu, 8 Aug 2013 13:38:57 +0200 Subject: [PATCH 1/2] Fix: Chat history sqlite truncating long messages --- src/plugins/mod_chat_history_sqlite.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/mod_chat_history_sqlite.c b/src/plugins/mod_chat_history_sqlite.c index d9fa31d..553df15 100644 --- a/src/plugins/mod_chat_history_sqlite.c +++ b/src/plugins/mod_chat_history_sqlite.c @@ -49,7 +49,7 @@ static int null_callback(void* ptr, int argc, char **argv, char **colName) { ret static const char* sql_escape_string(const char* str) { - static char out[1024]; + static char out[MAX_HISTORY_SIZE]; size_t i = 0; size_t n = 0; for (; n < strlen(str); n++) @@ -65,7 +65,7 @@ static const char* sql_escape_string(const char* str) static int sql_execute(struct chat_history_data* sql, int (*callback)(void* ptr, int argc, char **argv, char **colName), void* ptr, const char* sql_fmt, ...) { va_list args; - char query[1024]; + char query[MAX_HISTORY_SIZE]; char* errMsg; int rc; From 96cc46117fc5fa11f1f40f94609e91383a1888fe Mon Sep 17 00:00:00 2001 From: mimicmod Date: Wed, 19 Jun 2013 18:32:16 -0400 Subject: [PATCH 2/2] Fix previous commit (Added sqlite VACUUM to cleanup commands) Conflicts: src/plugins/mod_chat_history_sqlite.c --- src/plugins/mod_chat_history_sqlite.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/mod_chat_history_sqlite.c b/src/plugins/mod_chat_history_sqlite.c index 553df15..c64d8b5 100644 --- a/src/plugins/mod_chat_history_sqlite.c +++ b/src/plugins/mod_chat_history_sqlite.c @@ -226,6 +226,8 @@ static int command_historycleanup(struct plugin_handle* plugin, struct plugin_us plugin->hub.send_message(plugin, user, cbuf_get(buf)); cbuf_destroy(buf); + sql_execute(data, null_callback, NULL, "VACUUM;"); + return 0; }