pr comments

redash/handlers/queries.py

@@ -150,7 +150,14 @@ def get(self):
         page = request.args.get("page", 1, type=int)
         per_page = request.args.get("per_page", 25, type=int)
 
-        results = paginate(ordered_results, page=page, per_page=per_page, serializer=QuerySerializer)
+        results = paginate(
+            ordered_results,
+            page=page,
+            per_page=per_page,
+            serializer=QuerySerializer,
+            with_stats=True,
+            with_last_modified_by=False,
+        )
 
         if search_term:
             self.record_event({"action": "search", "object_type": "query", "term": search_term})
@@ -290,7 +297,14 @@ def get(self):
 
         page = request.args.get("page", 1, type=int)
         per_page = request.args.get("per_page", 25, type=int)
-        return paginate(ordered_results, page=page, per_page=per_page, serializer=QuerySerializer)
+        return paginate(
+            ordered_results,
+            page=page,
+            per_page=per_page,
+            serializer=QuerySerializer,
+            with_stats=True,
+            with_last_modified_by=False,
+        )
 
 
 class QueryResource(BaseResource):
@@ -483,7 +497,14 @@ def get(self):
 
         page = request.args.get("page", 1, type=int)
         per_page = request.args.get("per_page", 25, type=int)
-        results = paginate(ordered_favorites, page=page, per_page=per_page, serializer=QuerySerializer)
+        results = paginate(
+            ordered_favorites,
+            page=page,
+            per_page=per_page,
+            serializer=QuerySerializer,
+            with_stats=True,
+            with_last_modified_by=False,
+        )
 
         self.record_event(
             {

redash/tasks/queries/execution.py

@@ -165,6 +165,7 @@ def __init__(self, query, data_source_id, user_id, is_api_key, metadata, is_sche
         self.query_hash = gen_query_hash(self.query)
         self.is_scheduled_query = is_scheduled_query
         if self.is_scheduled_query:
+            self.query_model = models.db.session.merge(self.query_model, load=False)
             # Load existing tracker or create a new one if the job was created before code update:
             models.scheduled_queries_executions.update(self.query_model.id)
 

tests/test_authentication.py

@@ -443,11 +443,11 @@ def tearDown(self):
         org_settings["auth_jwt_auth_audience"] = ""
         org_settings["auth_jwt_auth_header_name"] = ""
 
-    def jwt_no_token(self):
+    def test_jwt_no_token(self):
         response = self.get_request("/data_sources", org=self.factory.org)
         self.assertEqual(response.status_code, 302)
 
-    def jwt_from_pem_file(self):
+    def test_jwt_from_pem_file(self):
         user = self.factory.create_user()
 
         issued_at_timestamp = time.time()
@@ -468,7 +468,7 @@ def jwt_from_pem_file(self):
         self.assertEqual(response.status_code, 200)
 
     @patch.object(requests, "get")
-    def jwk_decode(self, mock_get):
+    def test_jwk_decode(self, mock_get):
         with open(self.rsa_public_key, "rb") as keyfile:
             public_key = jwcrypto.jwk.JWK.from_pem(keyfile.read())
             jwk_keys = {"keys": [json.loads(public_key.export())]}