From eb508665479236e1ce5e057057bfde723b24150f Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Tue, 5 Apr 2022 10:10:29 +0300
Subject: [PATCH] chore: postpone timerange endpoint removal (#19513)

---
 ...9d86e695_deprecate_time_range_endpoints.py | 27 +--------
 ...074e4_deprecate_time_range_endpoints_v2.py | 59 +++++++++++++++++++
 2 files changed, 60 insertions(+), 26 deletions(-)
 create mode 100644 superset/migrations/versions/b0d0249074e4_deprecate_time_range_endpoints_v2.py

diff --git a/superset/migrations/versions/ab9a9d86e695_deprecate_time_range_endpoints.py b/superset/migrations/versions/ab9a9d86e695_deprecate_time_range_endpoints.py
index 2bd65996140d7..148804d2588df 100644
--- a/superset/migrations/versions/ab9a9d86e695_deprecate_time_range_endpoints.py
+++ b/superset/migrations/versions/ab9a9d86e695_deprecate_time_range_endpoints.py
@@ -21,38 +21,13 @@
 Create Date: 2022-02-25 08:06:14.835094
 
 """
-import json
-
-from alembic import op
-from sqlalchemy import Column, Integer, Text
-from sqlalchemy.ext.declarative import declarative_base
-
-from superset import db
-
 # revision identifiers, used by Alembic.
 revision = "ab9a9d86e695"
 down_revision = "b5a422d8e252"
 
-Base = declarative_base()
-
-
-class Slice(Base):
-    __tablename__ = "slices"
-    id = Column(Integer, primary_key=True)
-    params = Column(Text)
-
 
 def upgrade():
-    bind = op.get_bind()
-    session = db.Session(bind=bind)
-
-    for slc in session.query(Slice).filter(Slice.params.like("%time_range_endpoints%")):
-        params = json.loads(slc.params)
-        params.pop("time_range_endpoints", None)
-        slc.params = json.dumps(params)
-
-    session.commit()
-    session.close()
+    pass
 
 
 def downgrade():
diff --git a/superset/migrations/versions/b0d0249074e4_deprecate_time_range_endpoints_v2.py b/superset/migrations/versions/b0d0249074e4_deprecate_time_range_endpoints_v2.py
new file mode 100644
index 0000000000000..90ee62d3f70d9
--- /dev/null
+++ b/superset/migrations/versions/b0d0249074e4_deprecate_time_range_endpoints_v2.py
@@ -0,0 +1,59 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+"""deprecate time_range_endpoints v2
+
+Revision ID: b0d0249074e4
+Revises: 2ed890b36b94
+Create Date: 2022-04-04 15:04:05.606340
+
+"""
+import json
+
+from alembic import op
+from sqlalchemy import Column, Integer, Text
+from sqlalchemy.ext.declarative import declarative_base
+
+from superset import db
+
+# revision identifiers, used by Alembic.
+revision = "b0d0249074e4"
+down_revision = "2ed890b36b94"
+
+Base = declarative_base()
+
+
+class Slice(Base):
+    __tablename__ = "slices"
+    id = Column(Integer, primary_key=True)
+    params = Column(Text)
+
+
+def upgrade():
+    bind = op.get_bind()
+    session = db.Session(bind=bind)
+
+    for slc in session.query(Slice).filter(Slice.params.like("%time_range_endpoints%")):
+        params = json.loads(slc.params)
+        params.pop("time_range_endpoints", None)
+        slc.params = json.dumps(params)
+
+    session.commit()
+    session.close()
+
+
+def downgrade():
+    pass