chore: Unset future flag in engines and sessions.

scripts/benchmark_migration.py

@@ -93,7 +93,7 @@ def find_models(module: ModuleType) -> list[type[Model]]:  # noqa: C901
     # where the current model is out-of-sync with the existing table after a
     # downgrade
     sqlalchemy_uri = current_app.config["SQLALCHEMY_DATABASE_URI"]
-    engine = create_engine(sqlalchemy_uri, future=True)
+    engine = create_engine(sqlalchemy_uri)
     Base = automap_base()  # noqa: N806
     Base.prepare(engine, reflect=True)
     seen = set()

superset/cli/test_db.py

@@ -280,9 +280,6 @@ def test_sqlalchemy_dialect(
     """
     Test the SQLAlchemy dialect, making sure it supports everything Superset needs.
     """
-    if "future" not in engine_kwargs:
-        engine_kwargs["future"] = True
-
     engine = create_engine(sqlalchemy_uri, **engine_kwargs)
     dialect = engine.dialect
 

superset/commands/streaming_export/base.py

@@ -227,7 +227,7 @@ def _execute_query_and_stream(
         delimiter = csv_export_config.get("sep", ",")
         decimal_separator = csv_export_config.get("decimal", ".")
 
-        with db.session(future=True) as session:
+        with db.session() as session:
             # Merge database to prevent DetachedInstanceError
             merged_database = session.merge(database)
 

superset/db_engine_specs/gsheets.py

@@ -389,7 +389,6 @@ def validate_parameters(
                     }
                 }
             },
-            future=True,
         )
         conn = engine.connect()
         idx = 0

superset/migrations/shared/catalogs.py

@@ -376,7 +376,7 @@ def upgrade_catalog_perms(engines: set[str] | None = None) -> None:
 
     """
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     # The Database model has an eager-loaded (``lazy="joined"``) ``ssh_tunnel``
     # backref. Eager-loading it here would SELECT every column on ``ssh_tunnels``,
@@ -581,7 +581,7 @@ def downgrade_catalog_perms(engines: set[str] | None = None) -> None:
     WARNING: models (datasets and charts) not in the default catalog are deleted!
     """
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     # See upgrade_catalog_perms: avoid eager-loading the ``ssh_tunnel`` backref so the
     # query stays schema-safe across migration revisions.

superset/migrations/versions/2016-04-25_08-54_c3a8f8611885_materializing_permission.py

@@ -51,7 +51,7 @@ class Slice(Base):
 def upgrade():
     bind = op.get_bind()
     op.add_column("slices", sa.Column("perm", sa.String(length=2000), nullable=True))
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     # Use Slice class defined here instead of models.Slice
     for slc in session.query(Slice).all():

superset/migrations/versions/2016-06-07_12-33_d8bc074f7aad_add_new_field_is_restricted_to_.py

@@ -59,7 +59,7 @@ def upgrade():
     )
 
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     # don't use models.DruidMetric
     # because it assumes the context is consistent with the application

superset/migrations/versions/2016-06-27_08-43_27ae655e4247_make_creator_owners.py

@@ -94,7 +94,7 @@ class Dashboard(AuditMixin, Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     objects = session.query(Slice).all()
     objects += session.query(Dashboard).all()

superset/migrations/versions/2016-09-07_23-50_33d996bcc382_update_slice_model.py

@@ -50,7 +50,7 @@ class Slice(Base):
 def upgrade():
     bind = op.get_bind()
     op.add_column("slices", sa.Column("datasource_id", sa.Integer()))
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for slc in session.query(Slice).all():
         if slc.druid_datasource_id:
@@ -63,7 +63,7 @@ def upgrade():
 
 def downgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
     for slc in session.query(Slice).all():
         if slc.datasource_type == "druid":
             slc.druid_datasource_id = slc.datasource_id

superset/migrations/versions/2016-09-22_11-31_eca4694defa7_sqllab_setting_defaults.py

@@ -45,7 +45,7 @@ class Database(Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for obj in session.query(Database).all():
         obj.allow_run_sync = True

superset/migrations/versions/2017-01-24_12-31_db0c65b146bd_update_slice_model_json.py

@@ -48,7 +48,7 @@ class Slice(Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     slices = session.query(Slice).all()
     slice_len = len(slices)

superset/migrations/versions/2017-02-08_14-16_a99f2f7c195a_rewriting_url_from_shortner_with_new_.py

@@ -61,7 +61,7 @@ class Url(Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     urls = session.query(Url).all()
     urls_len = len(urls)

superset/migrations/versions/2017-12-08_08-19_67a6ac9b727b_update_spatial_params.py

@@ -45,7 +45,7 @@ class Slice(Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for slc in session.query(Slice).filter(Slice.viz_type.like("deck_%")):
         params = json.loads(slc.params)

superset/migrations/versions/2017-12-17_11-06_21e88bc06c02_annotation_migration.py

@@ -45,7 +45,7 @@ class Slice(Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for slc in session.query(Slice).filter(
         or_(Slice.viz_type.like("line"), Slice.viz_type.like("bar"))
@@ -75,7 +75,7 @@ def upgrade():
 
 def downgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for slc in session.query(Slice).filter(
         or_(Slice.viz_type.like("line"), Slice.viz_type.like("bar"))

superset/migrations/versions/2018-02-13_08-07_e866bd2d4976_smaller_grid.py

@@ -46,7 +46,7 @@ class Dashboard(Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     dashboards = session.query(Dashboard).all()
     for i, dashboard in enumerate(dashboards):
@@ -68,7 +68,7 @@ def upgrade():
 
 def downgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     dashboards = session.query(Dashboard).all()
     for i, dashboard in enumerate(dashboards):

superset/migrations/versions/2018-04-03_08-19_130915240929_is_sqllab_viz_flow.py

@@ -57,7 +57,7 @@ def upgrade():
         ),
     )
 
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     # Use Slice class defined here instead of models.Slice
     for tbl in session.query(Table).all():

superset/migrations/versions/2018-04-10_11-19_bf706ae5eb46_cal_heatmap_metric_to_metrics.py

@@ -49,7 +49,7 @@ class Slice(Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     slices = session.query(Slice).filter_by(viz_type="cal_heatmap").all()
     slice_len = len(slices)

superset/migrations/versions/2018-06-04_11-12_c5756bec8b47_time_grain_sqla.py

@@ -45,7 +45,7 @@ class Slice(Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for slc in session.query(Slice).all():
         try:
@@ -63,7 +63,7 @@ def upgrade():
 
 def downgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for slc in session.query(Slice).all():
         try:

superset/migrations/versions/2018-06-07_09-52_afb7730f6a9c_remove_empty_filters.py

@@ -45,7 +45,7 @@ class Slice(Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for slc in session.query(Slice).all():
         try:

superset/migrations/versions/2018-06-13_10-20_4451805bbaa1_remove_double_percents.py

@@ -68,7 +68,7 @@ class Database(Base):
 
 
 def replace(source, target):
-    with db.Session(bind=op.get_bind(), future=True) as session:
+    with db.Session(bind=op.get_bind()) as session:
         with session.begin():
             query = (
                 session.query(Slice, Database)
@@ -80,7 +80,7 @@ def replace(source, target):
 
             for slc, database in query:
                 try:
-                    engine = create_engine(database.sqlalchemy_uri, future=True)
+                    engine = create_engine(database.sqlalchemy_uri)
 
                     if engine.dialect.identifier_preparer._double_percents:
                         params = json.loads(slc.params)

superset/migrations/versions/2018-06-13_14-54_bddc498dd179_adhoc_filters.py

@@ -50,7 +50,7 @@ class Slice(Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for slc in session.query(Slice).all():
         try:
@@ -66,7 +66,7 @@ def upgrade():
 
 def downgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for slc in session.query(Slice).all():
         try:

superset/migrations/versions/2018-06-14_14-31_80a67c5192fa_single_pie_chart_metric.py

@@ -47,7 +47,7 @@ class Slice(Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for slc in session.query(Slice).filter(Slice.viz_type == "pie").all():
         try:
@@ -68,7 +68,7 @@ def upgrade():
 
 def downgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for slc in session.query(Slice).filter(Slice.viz_type == "pie").all():
         try:

superset/migrations/versions/2018-07-05_15-19_3dda56f1c4c6_migrate_num_period_compare_and_period_.py

@@ -134,7 +134,7 @@ def compute_time_compare(granularity, periods):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for chart in session.query(Slice):
         params = json.loads(chart.params or "{}")
@@ -163,7 +163,7 @@ def upgrade():
 
 def downgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     for chart in session.query(Slice):
         params = json.loads(chart.params or "{}")

superset/migrations/versions/2018-07-19_23-41_c617da68de7d_form_nullable.py

@@ -159,7 +159,7 @@ class TableColumn(BaseColumnMixin, Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     tables = [
         Annotation,

superset/migrations/versions/2018-07-20_15-31_7f2635b51f5d_update_base_columns.py

@@ -59,7 +59,7 @@ class TableColumn(BaseColumnMixin, Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     # Delete the orphaned columns records.
     for record in session.query(DruidColumn).all():

superset/migrations/versions/2018-07-20_15-57_e9df189e5c7e_update_base_metrics.py

@@ -59,7 +59,7 @@ class SqlMetric(BaseMetricMixin, Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     # Delete the orphaned metrics records.
     for record in session.query(DruidMetric).all():

superset/migrations/versions/2018-07-22_11-59_bebcf3fed1fe_convert_dashboard_v1_positions.py

@@ -579,7 +579,7 @@ def scan_dashboard_positions_data(positions):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     dashboards = session.query(Dashboard).all()
     for i, dashboard in enumerate(dashboards):

superset/migrations/versions/2018-08-01_11-47_7fcdcde0761c_.py

@@ -55,7 +55,7 @@ def is_v2_dash(positions):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     dashboards = session.query(Dashboard).all()
     for i, dashboard in enumerate(dashboards):  # noqa: B007

superset/migrations/versions/2018-11-12_13-31_4ce8df208545_migrate_time_range_for_default_filters.py

@@ -46,7 +46,7 @@ class Dashboard(Base):
 
 def upgrade():  # noqa: C901
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     dashboards = session.query(Dashboard).all()
     for i, dashboard in enumerate(dashboards):

superset/migrations/versions/2018-12-11_22-03_fb13d49b72f9_better_filters.py

@@ -75,7 +75,7 @@ def upgrade_slice(slc):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     filter_box_slices = session.query(Slice).filter_by(viz_type="filter_box")
     for slc in filter_box_slices.all():
@@ -90,7 +90,7 @@ def upgrade():
 
 def downgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     filter_box_slices = session.query(Slice).filter_by(viz_type="filter_box")
     for slc in filter_box_slices.all():

superset/migrations/versions/2018-12-15_12-34_3e1b21cd94a4_change_owner_to_m2m_relation_on_.py

@@ -87,7 +87,7 @@ def upgrade():
 
     bind = op.get_bind()
     insp = sa.engine.reflection.Inspector.from_engine(bind)
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     tables = session.query(SqlaTable).all()
     for table in tables:

superset/migrations/versions/2019-03-21_10-22_d94d33dbe938_form_strip.py

@@ -159,7 +159,7 @@ class TableColumn(BaseColumnMixin, Base):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     tables = [
         Annotation,

superset/migrations/versions/2019-04-09_16-27_80aa3f04bc82_add_parent_ids_in_dashboard_layout.py

@@ -62,7 +62,7 @@ def add_parent_ids(node, layout):
 
 def upgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     dashboards = session.query(Dashboard).all()
     for i, dashboard in enumerate(dashboards):
@@ -88,7 +88,7 @@ def upgrade():
 
 def downgrade():
     bind = op.get_bind()
-    session = db.Session(bind=bind, future=True)
+    session = db.Session(bind=bind)
 
     dashboards = session.query(Dashboard).all()
     for i, dashboard in enumerate(dashboards):