oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1205 from imachug/union

Browse source 
Parse both UNION and UNION ALL
This commit is contained in:
ZeroNet 2017-12-19 20:53:21 +01:00 committed by GitHub
commit adbf787bd4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/Newsfeed/NewsfeedPlugin.py
View file

@ -53,7 +53,7 @@ class UiWebsocketPlugin(object):
s = time.time() s = time.time()
try: try:
query_raw, params = query_set 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): for i, query_part in enumerate(query_parts):
db_query = DbQuery(query_part) db_query = DbQuery(query_part)
if day_limit: if day_limit: