From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 16 Apr 2019 12:39:16 +0000 (+0100)
Subject: Revert "[Minor] Joins cleanup"
X-Git-Tag: 1.9.2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=277d0a32c3327a92fde4a9c8de15e51d2d4c6e89;p=thirdparty%2Frspamd.git

Revert "[Minor] Joins cleanup"

This reverts commit f803de985a63f31321f3f4fcbed656b692d7d756.
---

diff --git a/src/libstat/backends/sqlite3_backend.c b/src/libstat/backends/sqlite3_backend.c
index 9904e469b8..cf7291ee0b 100644
--- a/src/libstat/backends/sqlite3_backend.c
+++ b/src/libstat/backends/sqlite3_backend.c
@@ -151,8 +151,10 @@ static struct rspamd_sqlite3_prstmt prepared_stmts[RSPAMD_STAT_BACKEND_MAX] =
 	[RSPAMD_STAT_BACKEND_GET_TOKEN] = {
 		.idx = RSPAMD_STAT_BACKEND_GET_TOKEN,
 		.sql = "SELECT value FROM tokens "
-				"WHERE token=?1 AND users=?2 "
-				"AND (language=?3 OR language=0);",
+				"LEFT JOIN languages ON tokens.language=languages.id "
+				"LEFT JOIN users ON tokens.user=users.id "
+				"WHERE token=?1 AND (users.id=?2) "
+				"AND (languages.id=?3 OR languages.id=0);",
 		.stmt = NULL,
 		.args = "III",
 		.result = SQLITE_ROW,