Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support a python-table-object string in query_results query-runner #6628

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support a python-table-object string in query_results query-runner #6628

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 32 additions & 2 deletions redash/query_runner/query_results.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import logging
import re
import sqlite3
import os
from urllib.parse import parse_qs

from redash import models
Expand All @@ -15,6 +16,11 @@
)
from redash.utils import json_dumps, json_loads

from redash.settings.helpers import (
parse_boolean,
)


logger = logging.getLogger(__name__)


Expand All @@ -39,6 +45,8 @@ def extract_cached_query_ids(query):
queries = re.findall(r"(?:join|from)\s+cached_query_(\d+)", query, re.IGNORECASE)
return [int(q) for q in queries]

def extract_query_tables(query):
return re.findall(r"(?:join|from)\s+query_table_start_({.*?})_query_table_end", query, re.IGNORECASE)

def _load_query(user, query_id):
query = models.Query.get_by_id(query_id)
Expand Down Expand Up @@ -82,7 +90,7 @@ def get_query_results(user, query_id, bring_from_cache, params=None):
return results


def create_tables_from_query_ids(user, connection, query_ids, query_params, cached_query_ids=[]):
def create_tables_from_query_ids(user, connection, query_ids, query_params, cached_query_ids=[], query_tables=[]):
for query_id in set(cached_query_ids):
results = get_query_results(user, query_id, True)
table_name = "cached_query_{query_id}".format(query_id=query_id)
Expand All @@ -99,6 +107,12 @@ def create_tables_from_query_ids(user, connection, query_ids, query_params, cach
table_name = "query_{query_id}".format(query_id=query_id)
create_table(connection, table_name, results)

for query_table in set(query_tables):
results = eval(query_table)
table_hash = hashlib.md5("query_{hash}".format(hash=query_table).encode()).hexdigest()
table_name = "query_table_{param_hash}".format(param_hash=table_hash)
create_table(connection, table_name, results)


def fix_column_name(name):
return '"{}"'.format(re.sub(r'[:."\s]', "_", name, flags=re.UNICODE))
Expand Down Expand Up @@ -144,6 +158,13 @@ def prepare_parameterized_query(query, query_params):
query = query.replace(key, value)
return query

def prepare_table_query(query, query_tables):
for query_table in query_tables:
table_hash = hashlib.md5("query_{hash}".format(hash=query_table).encode()).hexdigest()
table_name = "query_table_{param_hash}".format(param_hash=table_hash)
key = "query_table_start_{table}_query_table_end".format(table=query_table)
query = query.replace(key, table_name)
return query

class Results(BaseQueryRunner):
should_annotate_query = False
Expand All @@ -165,13 +186,22 @@ def run_query(self, query, user):
query_params = extract_query_params(query)

cached_query_ids = extract_cached_query_ids(query)
create_tables_from_query_ids(user, connection, query_ids, query_params, cached_query_ids)

query_tables = []

if parse_boolean(os.environ.get("REDASH_QUERY_RESULTS_ALLOW_PYTHON_TABLE_STRING", "false")):
query_tables = extract_query_tables(query)

create_tables_from_query_ids(user, connection, query_ids, query_params, cached_query_ids, query_tables)

cursor = connection.cursor()

if query_params is not None:
query = prepare_parameterized_query(query, query_params)

if query_tables is not None:
query = prepare_table_query(query, query_tables)

try:
cursor.execute(query)

Expand Down