Hi Uwe.

On Fri, 2009-02-06 at 19:40 +0100, Uwe Kiewel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Uwe Kiewel schrieb:
> > Hi,
> > 
> > with the current git version, I get the following error in my log:
> > 
> > Error:[db] db_mailbox_has_message_id(+2739): SQLException:
> > 
> 
> If I deactivate supress_dumplicates, the error disappears.
> 
> I habe stil a problem, reading multi part messages. The body is empty.

Please try this patch, as there were some missing renames in the code.
From cdea484dee3a3109b4e30ab13dde233a8fd8c9b5 Mon Sep 17 00:00:00 2001
From: Niki Guldbrand <n...@guldbrand.net>
Date: Fri, 6 Feb 2009 20:28:36 +0100
Subject: [PATCH] Fixed some missing headervalue columb renames.

---
 src/dbmail-mailbox.c |    8 ++++----
 src/dm_db.c          |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/dbmail-mailbox.c b/src/dbmail-mailbox.c
index bb54382..1e88f60 100644
--- a/src/dbmail-mailbox.c
+++ b/src/dbmail-mailbox.c
@@ -1360,7 +1360,7 @@ static GTree * mailbox_search(DbmailMailbox *self, search_key_t *s)
 			case IST_HDR:
 			
 			memset(partial,0,sizeof(partial));
-			snprintf(partial, DEF_FRAGSIZE, db_get_sql(SQL_PARTIAL), "v.value");
+			snprintf(partial, DEF_FRAGSIZE, db_get_sql(SQL_PARTIAL), "v.headervalue");
 			g_string_printf(q, "SELECT message_idnr FROM %smessages m "
 				"JOIN %sphysmessage p ON m.physmessage_id=p.id "
 				"JOIN %sheader h ON h.physmessage_id=p.id "
@@ -1387,8 +1387,8 @@ static GTree * mailbox_search(DbmailMailbox *self, search_key_t *s)
 
 			memset(partial,0,sizeof(partial));
 			g_string_printf(t,db_get_sql(SQL_ENCODE_ESCAPE), "k.data");
-			snprintf(partial, DEF_FRAGSIZE, db_get_sql(SQL_PARTIAL), "v.value");
-			g_string_printf(q,"SELECT m.message_idnr, v.value, k.data "
+			snprintf(partial, DEF_FRAGSIZE, db_get_sql(SQL_PARTIAL), "v.headervalue");
+			g_string_printf(q,"SELECT m.message_idnr, v.headervalue, k.data "
 					"FROM %smimeparts k "
 					"JOIN %spartlists l ON k.id=l.part_id "
 					"JOIN %sphysmessage p ON l.physmessage_id=p.id "
@@ -1396,7 +1396,7 @@ static GTree * mailbox_search(DbmailMailbox *self, search_key_t *s)
 					"JOIN %sheadervalue v ON h.headervalue_id=v.id "
 					"JOIN %smessages m ON m.physmessage_id=p.id "
 					"WHERE m.mailbox_idnr = ? AND m.status IN (?,?) "
-					"GROUP BY m.message_idnr, v.value, k.data "
+					"GROUP BY m.message_idnr, v.headervalue, k.data "
 					"HAVING %s %s ? OR %s %s ? "
 					"ORDER BY m.message_idnr",
 					DBPFX, DBPFX, DBPFX, DBPFX, DBPFX, DBPFX,
diff --git a/src/dm_db.c b/src/dm_db.c
index bc1c71e..95cde72 100644
--- a/src/dm_db.c
+++ b/src/dm_db.c
@@ -2721,7 +2721,7 @@ int db_mailbox_has_message_id(u64_t mailbox_idnr, const char *messageid)
 	g_return_val_if_fail(messageid!=NULL,0);
 
 	snprintf(expire, DEF_FRAGSIZE, db_get_sql(SQL_EXPIRE), EXPIRE_DAYS);
-	snprintf(partial, DEF_FRAGSIZE, db_get_sql(SQL_PARTIAL), "v.value");
+	snprintf(partial, DEF_FRAGSIZE, db_get_sql(SQL_PARTIAL), "v.headervalue");
 	snprintf(query, DEF_QUERYSIZE,
 		"SELECT m.message_idnr "
 		"FROM %smessages m "
-- 
1.6.0.4

Attachment: signature.asc
Description: This is a digitally signed message part

_______________________________________________
Dbmail-dev mailing list
Dbmail-dev@dbmail.org
http://twister.fastxs.net/mailman/listinfo/dbmail-dev

Reply via email to