]> source.dussan.org Git - rspamd.git/commitdiff
Revert "[Minor] Joins cleanup"
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 16 Apr 2019 12:39:16 +0000 (13:39 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Tue, 16 Apr 2019 12:39:16 +0000 (13:39 +0100)
This reverts commit f803de985a63f31321f3f4fcbed656b692d7d756.

src/libstat/backends/sqlite3_backend.c

index 9904e469b84dd6d03032e308f5dd05a081b594d8..cf7291ee0b57a5c4f70ab6b9560e3040352905c5 100644 (file)
@@ -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,