jprdonnelly/redash
1
0
Fork 0
mirror of https://github.com/getredash/redash.git synced 2025-12-25 01:03:20 -05:00
Code Issues Projects Releases Wiki Activity

Merge pull request #349 from erans/master

Browse Source 
Minor bug fixes + supprot for limit and skip in simple query
This commit is contained in:
Arik Fraimovich
2015-01-18 10:11:27 +02:00
parent dc0f9a63cb 2dbcd88313
commit 0d35ec7139
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
redash/data/query_runner_mongodb.py
View File

@@ -179,8 +179,7 @@ def mongodb(connection_string):
if "sort" in query_data and query_data["sort"]:
s = []
for field in query_data["sort"]:
for k in field:
s.append((k, field[k]))
s.append((field["name"], field["direction"]))
if "fields" in query_data:
f = query_data["fields"]
@@ -192,11 +191,18 @@ def mongodb(connection_string):
json_data = None
cursor = None
if q:
if q or (not q and not aggregate):
if s:
cursor = db[collection].find(q, f).sort(s)
else:
cursor = db[collection].find(q, f)
if "skip" in query_data:
cursor = cursor.skip(query_data["skip"])
if "limit" in query_data:
cursor = cursor.limit(query_data["limit"])
elif aggregate:
r = db[collection].aggregate(aggregate)
cursor = r["result"]