From 2baceddbf16f087ae9247406f23579a6c6664fb6 Mon Sep 17 00:00:00 2001
From: Ville Brofeldt <33317356+villebro@users.noreply.github.com>
Date: Fri, 25 Feb 2022 20:50:55 +0200
Subject: [PATCH] fix(dataset): handle missing database in migration (#18948)

---
 .../migrations/versions/b8d3a24d9131_new_dataset_models.py    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/superset/migrations/versions/b8d3a24d9131_new_dataset_models.py b/superset/migrations/versions/b8d3a24d9131_new_dataset_models.py
index e6d4537272..1e139dd6a3 100644
--- a/superset/migrations/versions/b8d3a24d9131_new_dataset_models.py
+++ b/superset/migrations/versions/b8d3a24d9131_new_dataset_models.py
@@ -321,8 +321,10 @@ def after_insert(target: SqlaTable) -> None:  # pylint: disable=too-many-locals
     # table names
     database = (
         target.database
-        or session.query(Database).filter_by(id=target.database_id).one()
+        or session.query(Database).filter_by(id=target.database_id).first()
     )
+    if not database:
+        return
     engine = database.get_sqla_engine(schema=target.schema)
     conditional_quote = engine.dialect.identifier_preparer.quote