Fix: sorting queries by schedule was resulting in a wrong order

redash/handlers/queries.py

@@ -37,8 +37,8 @@
     "-name": "-lowercase_name",
     "created_at": "created_at",
     "-created_at": "-created_at",
-    "schedule": "schedule",
-    "-schedule": "-schedule",
+    "schedule": "interval",
+    "-schedule": "-interval",
     "runtime": "query_results-runtime",
     "-runtime": "-query_results-runtime",
     "executed_at": "query_results-retrieved_at",

redash/models/__init__.py

@@ -52,6 +52,7 @@
     MutableDict,
     MutableList,
     PseudoJSON,
+    pseudo_json_cast_property
 )
 from .users import AccessPermission, AnonymousUser, ApiUser, Group, User  # noqa
 
@@ -488,6 +489,7 @@ class Query(ChangeTrackingMixin, TimestampMixin, BelongsToOrgMixin, db.Model):
     is_archived = Column(db.Boolean, default=False, index=True)
     is_draft = Column(db.Boolean, default=True, index=True)
     schedule = Column(MutableDict.as_mutable(PseudoJSON), nullable=True)
+    interval = pseudo_json_cast_property(db.Integer, "schedule", "interval", default=0)
     schedule_failures = Column(db.Integer, default=0)
     visualizations = db.relationship("Visualization", cascade="all, delete-orphan")
     options = Column(MutableDict.as_mutable(PseudoJSON), default={})

redash/models/types.py

@@ -3,6 +3,8 @@
 from sqlalchemy.ext.indexable import index_property
 from sqlalchemy.ext.mutable import Mutable
 from sqlalchemy_utils import EncryptedType
+from sqlalchemy import cast
+from sqlalchemy.dialects.postgresql import JSON
 
 from redash.utils import json_dumps, json_loads
 from redash.utils.configuration import ConfigurationContainer
@@ -108,3 +110,17 @@ def __init__(self, cast_type, *args, **kwargs):
     def expr(self, model):
         expr = super(json_cast_property, self).expr(model)
         return expr.astext.cast(self.cast_type)
+
+
+class pseudo_json_cast_property(index_property):
+    """
+    A SQLAlchemy index property that is able to cast the
+    entity attribute as the specified cast type. Useful
+    for JSON and JSONB colums for easier querying/filtering.
+    """
+    def __init__(self, cast_type, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.cast_type = cast_type
+    def expr(self, model):
+        expr = cast(getattr(model, self.attr_name), JSON)[self.index]
+        return expr.astext.cast(self.cast_type)