[GitHub] john-bodley closed pull request #5155: [migrations] Cleanup recent migrations

[GitBox <gi...@apache.org>]

john-bodley closed pull request #5155: [migrations] Cleanup recent migrations
URL: https://github.com/apache/incubator-superset/pull/5155
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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 @@
 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)
 
 


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@superset.apache.org
For additional commands, e-mail: notifications-help@superset.apache.org