Skip to content
This repository has been archived by the owner on Aug 19, 2024. It is now read-only.

Update/ben/snowflake app name #40

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions redash/handlers/query_results.py
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,7 @@ def run_query(
current_user.id,
current_user.is_api_user(),
metadata={
"Username": repr(current_user)
if current_user.is_api_user()
else current_user.email,
"Username": current_user.get_actual_user(),
"query_id": query_id,
},
)
Expand Down
3 changes: 2 additions & 1 deletion redash/models/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,8 @@ def get_id(self):
).hexdigest()
return "{0}-{1}".format(self.id, identity)


def get_actual_user(self):
return repr(self) if self.is_api_user() else self.email
@generic_repr("id", "name", "type", "org_id")
class Group(db.Model, BelongsToOrgMixin):
DEFAULT_PERMISSIONS = [
Expand Down
2 changes: 2 additions & 0 deletions redash/query_runner/snowflake.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
except ImportError:
enabled = False

from redash import __version__
from redash.query_runner import BaseQueryRunner, register
from redash.query_runner import (
TYPE_STRING,
Expand Down Expand Up @@ -100,6 +101,7 @@ def _get_connection(self):
account=account,
region=region,
host=host,
application="Redash/{} (Snowflake)".format(__version__.split("-")[0]),
)

return connection
Expand Down
2 changes: 1 addition & 1 deletion redash/tasks/queries/maintenance.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def refresh_queries():
query.data_source,
query.user_id,
scheduled_query=query,
metadata={"query_id": query.id, "Username": "Scheduled"},
metadata={"query_id": query.id, "Username": query.user.get_actual_user()},
)
enqueued.append(query)
except Exception as e:
Expand Down
8 changes: 4 additions & 4 deletions tests/tasks/test_refresh_queries.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ def test_enqueues_outdated_queries_for_sqlquery(self):
query1.data_source,
query1.user_id,
scheduled_query=query1,
metadata={"query_id": query1.id, "Username": "Scheduled"},
metadata={"query_id": query1.id, "Username": query1.user.get_actual_user()},
),
call(
"select 42 LIMIT 1000",
query2.data_source,
query2.user_id,
scheduled_query=query2,
metadata={"query_id": query2.id, "Username": "Scheduled"},
metadata={"query_id": query2.id, "Username": query2.user.get_actual_user()},
),
],
any_order=True,
Expand Down Expand Up @@ -71,14 +71,14 @@ def test_enqueues_outdated_queries_for_non_sqlquery(self):
query1.data_source,
query1.user_id,
scheduled_query=query1,
metadata={"query_id": query1.id, "Username": "Scheduled"},
metadata={"query_id": query1.id, "Username": query1.user.get_actual_user()},
),
call(
query2.query_text,
query2.data_source,
query2.user_id,
scheduled_query=query2,
metadata={"query_id": query2.id, "Username": "Scheduled"},
metadata={"query_id": query2.id, "Username": query2.user.get_actual_user()},
),
],
any_order=True,
Expand Down
Loading