valitydev/redash
14
0
Fork 0
mirror of https://github.com/valitydev/redash.git synced 2024-11-07 01:25:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve Script Query Runner

Browse Source
This commit is contained in:
ariarijp 2018-06-29 00:03:17 +09:00
parent 75df88a8ff
commit 389c6cb3c5
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
redash/query_runner/script.py
View File

@ -16,6 +16,16 @@ def query_to_script_path(path, query):
return query return query
def run_script(script, shell):
output = subprocess.check_output(script, shell=shell)
if output is not None:
output = output.strip()
if output != "":
return output, None
return None, "Error reading output"
class Script(BaseQueryRunner): class Script(BaseQueryRunner):
@classmethod @classmethod
def annotate_query(cls): def annotate_query(cls):
@ -63,13 +73,7 @@ class Script(BaseQueryRunner):
def run_query(self, query, user): def run_query(self, query, user):
try: try:
script = query_to_script_path(self.configuration["path"], query) script = query_to_script_path(self.configuration["path"], query)
output = subprocess.check_output(script, shell=self.configuration['shell']) return run_script(script, self.configuration['shell'])
if output is not None:
output = output.strip()
if output != "":
return output, None
return None, "Error reading output"
except IOError as e: except IOError as e:
return None, e.message return None, e.message
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:

19
tests/query_runner/test_script.py
View File

@ -1,8 +1,9 @@
import os import os
import subprocess
from _pytest.monkeypatch import MonkeyPatch from _pytest.monkeypatch import MonkeyPatch
from redash.query_runner.script import query_to_script_path from redash.query_runner.script import query_to_script_path, run_script
from tests import BaseTestCase from tests import BaseTestCase
@ -17,3 +18,19 @@ class TestQueryToScript(BaseTestCase):
self.monkeypatch.setattr(os.path, "exists", lambda x: True) self.monkeypatch.setattr(os.path, "exists", lambda x: True)
self.assertEqual(["/foo/bar/baz.sh"], query_to_script_path("/foo/bar", "baz.sh")) self.assertEqual(["/foo/bar/baz.sh"], query_to_script_path("/foo/bar", "baz.sh"))
class TestRunScript(BaseTestCase):
monkeypatch = MonkeyPatch()
def test_success(self):
self.monkeypatch.setattr(subprocess, "check_output", lambda script, shell: "test")
self.assertEqual(("test", None), run_script("/foo/bar/baz.sh", True))
def test_failure(self):
self.monkeypatch.setattr(subprocess, "check_output", lambda script, shell: None)
self.assertEqual((None, "Error reading output"), run_script("/foo/bar/baz.sh", True))
self.monkeypatch.setattr(subprocess, "check_output", lambda script, shell: "")
self.assertEqual((None, "Error reading output"), run_script("/foo/bar/baz.sh", True))
self.monkeypatch.setattr(subprocess, "check_output", lambda script, shell: " ")
self.assertEqual((None, "Error reading output"), run_script("/foo/bar/baz.sh", True))