Mercurial > dovecot > core-2.2

changeset 4592:98991f3699c6 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes. select/where fields were used in wrong order
author Timo Sirainen <tss@iki.fi>
date Mon, 28 Aug 2006 19:54:55 +0300
parents bd1da3473e44
children ec2bc538dcad
files src/lib-dict/dict-sql.c
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-dict/dict-sql.c	Sat Aug 26 16:56:05 2006 +0300
+++ b/src/lib-dict/dict-sql.c	Mon Aug 28 19:54:55 2006 +0300
@@ -332,8 +332,8 @@
 			"ON DUPLICATE KEY UPDATE %s = '%s'",
 			dict->table, dict->select_field, dict->where_field,
 			dict->username_field,
+			sql_escape_string(dict->db, value),
 			sql_escape_string(dict->db, key),
-			sql_escape_string(dict->db, value),
 			sql_escape_string(dict->db, dict->username),
 			dict->select_field,
 			sql_escape_string(dict->db, value));
@@ -342,8 +342,8 @@
 			"INSERT INTO %s (%s, %s) VALUES ('%s', '%s') "
 			"ON DUPLICATE KEY UPDATE %s = '%s'",
 			dict->table, dict->select_field, dict->where_field,
+			sql_escape_string(dict->db, value),
 			sql_escape_string(dict->db, key),
-			sql_escape_string(dict->db, value),
                         dict->select_field,
 			sql_escape_string(dict->db, value));
 	}
@@ -402,11 +402,11 @@
 	t_push();
 	if (priv) {
 		query = t_strdup_printf(
-			"INSERT INTO %s (%s, %s, %s) VALUES ('%s', %lld, '%s') "
+			"INSERT INTO %s (%s, %s, %s) VALUES (%lld, '%s', '%s') "
 			"ON DUPLICATE KEY UPDATE %s = %s + %lld",
 			dict->table, dict->select_field, dict->where_field,
 			dict->username_field,
-                        sql_escape_string(dict->db, key), diff,
+                        diff, sql_escape_string(dict->db, key),
 			sql_escape_string(dict->db, dict->username),
                         dict->select_field, dict->select_field, diff);
 	} else {
@@ -414,7 +414,7 @@
 			"INSERT INTO %s (%s, %s) VALUES (%s, %lld) "
 			"ON DUPLICATE KEY UPDATE %s = %s + %lld",
 			dict->table, dict->select_field, dict->where_field,
-                        sql_escape_string(dict->db, key), diff,
+                        diff, sql_escape_string(dict->db, key),
                         dict->select_field, dict->select_field, diff);
 	}
 	sql_update(ctx->sql_ctx, query);