From 7576e6079749f262c6cd4cd9cefb2f7c767b954a Mon Sep 17 00:00:00 2001 From: Ivanq Date: Thu, 14 Dec 2017 22:13:26 +0300 Subject: [PATCH] Parse both UNION and UNION ALL --- plugins/Newsfeed/NewsfeedPlugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Newsfeed/NewsfeedPlugin.py b/plugins/Newsfeed/NewsfeedPlugin.py index 6a50f5f8..d1c0201c 100644 --- a/plugins/Newsfeed/NewsfeedPlugin.py +++ b/plugins/Newsfeed/NewsfeedPlugin.py @@ -53,7 +53,7 @@ class UiWebsocketPlugin(object): s = time.time() try: query_raw, params = query_set - query_parts = query_raw.split("UNION") + query_parts = re.split(r"UNION(?:\s+ALL|)", query_raw) for i, query_part in enumerate(query_parts): db_query = DbQuery(query_part) if day_limit: