Use server_default

apache · Jan 21, 2022 · d8f6592 · d8f6592
1 parent d5cc55a
commit d8f6592
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 9 deletions.
diff --git a/superset/connectors/base/models.py b/superset/connectors/base/models.py
@@ -110,7 +110,7 @@ def name(self) -> str:
     params = Column(String(1000))
     perm = Column(String(1000))
     schema_perm = Column(String(1000))
-    is_managed_externally = Column(Boolean, default=False)
+    is_managed_externally = Column(Boolean, nullable=False, default=False)
     external_url = Column(Text, nullable=True)
 
     sql: Optional[str] = None

diff --git a/superset/migrations/versions/5fd49410a97a_add_columns_for_external_management.py b/superset/migrations/versions/5fd49410a97a_add_columns_for_external_management.py
@@ -33,31 +33,56 @@
 def upgrade():
     with op.batch_alter_table("dashboards") as batch_op:
         batch_op.add_column(
-            sa.Column("is_managed_externally", sa.Boolean(), nullable=True)
+            sa.Column(
+                "is_managed_externally",
+                sa.Boolean(),
+                nullable=False,
+                server_default=sa.false(),
+            )
         )
         batch_op.add_column(sa.Column("external_url", sa.Text(), nullable=True))
 
     with op.batch_alter_table("datasources") as batch_op:
         batch_op.add_column(
-            sa.Column("is_managed_externally", sa.Boolean(), nullable=True)
+            sa.Column(
+                "is_managed_externally",
+                sa.Boolean(),
+                nullable=False,
+                server_default=sa.false(),
+            )
         )
         batch_op.add_column(sa.Column("external_url", sa.Text(), nullable=True))
 
     with op.batch_alter_table("dbs") as batch_op:
         batch_op.add_column(
-            sa.Column("is_managed_externally", sa.Boolean(), nullable=True)
+            sa.Column(
+                "is_managed_externally",
+                sa.Boolean(),
+                nullable=False,
+                server_default=sa.false(),
+            )
         )
         batch_op.add_column(sa.Column("external_url", sa.Text(), nullable=True))
 
     with op.batch_alter_table("slices") as batch_op:
         batch_op.add_column(
-            sa.Column("is_managed_externally", sa.Boolean(), nullable=True)
+            sa.Column(
+                "is_managed_externally",
+                sa.Boolean(),
+                nullable=False,
+                server_default=sa.false(),
+            )
         )
         batch_op.add_column(sa.Column("external_url", sa.Text(), nullable=True))
 
     with op.batch_alter_table("tables") as batch_op:
         batch_op.add_column(
-            sa.Column("is_managed_externally", sa.Boolean(), nullable=True)
+            sa.Column(
+                "is_managed_externally",
+                sa.Boolean(),
+                nullable=False,
+                server_default=sa.false(),
+            )
         )
         batch_op.add_column(sa.Column("external_url", sa.Text(), nullable=True))
 

diff --git a/superset/models/core.py b/superset/models/core.py
@@ -151,7 +151,7 @@ class Database(
     encrypted_extra = Column(encrypted_field_factory.create(Text), nullable=True)
     impersonate_user = Column(Boolean, default=False)
     server_cert = Column(encrypted_field_factory.create(Text), nullable=True)
-    is_managed_externally = Column(Boolean, default=False)
+    is_managed_externally = Column(Boolean, nullable=False, default=False)
     external_url = Column(Text, nullable=True)
 
     export_fields = [

diff --git a/superset/models/dashboard.py b/superset/models/dashboard.py
@@ -149,7 +149,7 @@ class Dashboard(Model, AuditMixinNullable, ImportExportMixin):
     slices = relationship(Slice, secondary=dashboard_slices, backref="dashboards")
     owners = relationship(security_manager.user_model, secondary=dashboard_user)
     published = Column(Boolean, default=False)
-    is_managed_externally = Column(Boolean, default=False)
+    is_managed_externally = Column(Boolean, nullable=False, default=False)
     external_url = Column(Text, nullable=True)
     roles = relationship(security_manager.role_model, secondary=DashboardRoles)
     _filter_sets = relationship(

diff --git a/superset/models/slice.py b/superset/models/slice.py
@@ -92,7 +92,7 @@ class Slice(  # pylint: disable=too-many-public-methods
     last_saved_by_fk = Column(Integer, ForeignKey("ab_user.id"), nullable=True)
     certified_by = Column(Text)
     certification_details = Column(Text)
-    is_managed_externally = Column(Boolean, default=False)
+    is_managed_externally = Column(Boolean, nullable=False, default=False)
     external_url = Column(Text, nullable=True)
     last_saved_by = relationship(
         security_manager.user_model, foreign_keys=[last_saved_by_fk]