Fixing tests .

superset/models/sql_lab.py

@@ -69,7 +69,10 @@ class Query(Model):
     start_running_time = Column(Numeric(precision=3))
     end_time = Column(Numeric(precision=3))
     changed_on = Column(
-        DateTime, default=datetime.utcnow, onupdate=datetime.utcnow, nullable=True)
+        DateTime,
+        default=datetime.utcnow,
+        onupdate=datetime.utcnow,
+        nullable=True)
 
     database = relationship(
         'Database',
@@ -121,7 +124,11 @@ def name(self):
         """Name property"""
         ts = datetime.now().isoformat()
         ts = ts.replace('-', '').replace(':', '').split('.')[0]
-        tab = self.tab_name.replace(' ', '_').lower() if self.tab_name else 'notab'
+        tab = (
+            self.tab_name.replace(' ', '_').lower()
+            if self.tab_name
+            else 'notab'
+        )
         tab = re.sub(r'\W+', '', tab)
         return "sqllab_{tab}_{ts}".format(**locals())
 

superset/templates/superset/basic.html

@@ -38,7 +38,7 @@
       <div id="app" data-bootstrap="{{ bootstrap_data }}" >
         <img src="/static/assets/images/loading.gif" style="width: 50px; margin: 10px;">
       </div>
-      {{ csrf_token() }}
+      {{ csrf_token() if csrf_token else None }}
     {% endblock %}
 
     <!-- Modal for misc messages / alerts  -->

superset/views/sql_lab.py

@@ -26,12 +26,14 @@ class QueryView(SupersetModelView):
 class SavedQueryView(SupersetModelView, DeleteMixin):
     datamodel = SQLAInterface(SavedQuery)
     list_columns = [
-        'label', 'user', 'database', 'schema', 'description', 'pop_tab_link']
+        'label', 'user', 'database', 'schema', 'description',
+        'modified', 'pop_tab_link']
     show_columns = [
         'id', 'label', 'user', 'database',
         'description', 'sql', 'pop_tab_link']
     add_columns = ['label', 'database', 'description', 'sql']
     edit_columns = add_columns
+    base_order = ('changed_on', 'desc')
 
     def pre_add(self, obj):
         obj.user = g.user

tests/celery_tests.py

@@ -16,6 +16,7 @@
 from superset import app, appbuilder, cli, db, dataframe
 from superset.models import core as models
 from superset.models.helpers import QueryStatus
+from superset.models.sql_lab import Query
 from superset.security import sync_role_definitions
 from superset.sql_parse import SupersetQuery
 
@@ -73,13 +74,13 @@ def __init__(self, *args, **kwargs):
 
     def get_query_by_name(self, sql):
         session = db.session
-        query = session.query(models.Query).filter_by(sql=sql).first()
+        query = session.query(Query).filter_by(sql=sql).first()
         session.close()
         return query
 
     def get_query_by_id(self, id):
         session = db.session
-        query = session.query(models.Query).filter_by(id=id).first()
+        query = session.query(Query).filter_by(id=id).first()
         session.close()
         return query
 

tests/sqllab_tests.py

@@ -10,7 +10,7 @@
 
 from flask_appbuilder.security.sqla import models as ab_models
 from superset import db, utils, appbuilder, sm
-from superset.models.sql_lab import core as Query
+from superset.models.sql_lab import Query
 
 from .base_tests import SupersetTestCase