Fix bad rebase, get session from db.session.

apache · Aug 11, 2016 · 5688246 · 5688246
1 parent 5ffe1f7
commit 5688246
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/caravel/utils.py b/caravel/utils.py
@@ -308,7 +308,7 @@ def json_iso_dttm_ser(obj):
         return val
     if isinstance(obj, datetime):
         obj = obj.isoformat()
-    if isinstance(obj, date):
+    elif isinstance(obj, date):
         obj = obj.isoformat()
     else:
         raise TypeError(

diff --git a/caravel/views.py b/caravel/views.py
@@ -1358,6 +1358,8 @@ def sql_json(self):
         sql = request.form.get('sql')
         database_id = request.form.get('database_id')
         schema = request.form.get('schema')
+        session = db.session()
+        mydb = session.query(models.Database).filter_by(id=database_id).first()
 
         if not (self.can_access(
                 'all_datasource_access', 'all_datasource_access') or