From 52a933ffb8bb1df672ddfb104daf288a89342fb1 Mon Sep 17 00:00:00 2001
From: John Bodley <4567245+john-bodley@users.noreply.github.com>
Date: Tue, 12 Jun 2018 12:10:41 -0700
Subject: [PATCH] [migrations] Cleanup recent migrations (#5155)

---
 .../migrations/versions/130915240929_is_sqllab_viz_flow.py    | 2 +-
 superset/migrations/versions/c5756bec8b47_time_grain_sqla.py  | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/superset/migrations/versions/130915240929_is_sqllab_viz_flow.py b/superset/migrations/versions/130915240929_is_sqllab_viz_flow.py
index be17c50c02..4d8554cc36 100644
--- a/superset/migrations/versions/130915240929_is_sqllab_viz_flow.py
+++ b/superset/migrations/versions/130915240929_is_sqllab_viz_flow.py
@@ -45,7 +45,7 @@ def upgrade():
     for tbl in session.query(Table).all():
         if tbl.sql:
             tbl.is_sqllab_view = True
-            session.merge(tbl)
+
     session.commit()
     db.session.close()
 
diff --git a/superset/migrations/versions/c5756bec8b47_time_grain_sqla.py b/superset/migrations/versions/c5756bec8b47_time_grain_sqla.py
index 06ce632de3..3d8754fed7 100644
--- a/superset/migrations/versions/c5756bec8b47_time_grain_sqla.py
+++ b/superset/migrations/versions/c5756bec8b47_time_grain_sqla.py
@@ -13,7 +13,7 @@ down_revision = 'e502db2af7be'
 from alembic import op
 import json
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy import Column, Integer, String, Text
+from sqlalchemy import Column, Integer, Text
 
 from superset import db
 
@@ -24,8 +24,6 @@ class Slice(Base):
     __tablename__ = 'slices'
 
     id = Column(Integer, primary_key=True)
-    datasource_type = Column(String(200))
-    slice_name = Column(String(250))
     params = Column(Text)