Skip to content
Merged
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
5 changes: 1 addition & 4 deletions csp/adapters/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,10 +351,7 @@ def build_query(self, starttime, endtime):
elif self._rep._use_raw_user_query:
return db.text(self._rep._query)
else: # self._rep._query
if _SQLALCHEMY_2:
from_obj = db.text(f"({self._rep._query})")
else:
from_obj = db.text(f"({self._rep._query}) AS user_query")
from_obj = db.text(f"({self._rep._query}) AS user_query")

time_columns = self._rep._time_accessor.get_time_columns(self._rep._connection)
if time_columns:
Expand Down