Skip to content

Commit

Permalink
Revert "feat: allow assets to be managed externally (apache#18093)"
Browse files Browse the repository at this point in the history
This reverts commit 1c0b141.
  • Loading branch information
sadpandajoe committed Jan 31, 2022
1 parent 341d855 commit 02699b3
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 125 deletions.
2 changes: 0 additions & 2 deletions superset/connectors/base/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,6 @@ def name(self) -> str:
params = Column(String(1000))
perm = Column(String(1000))
schema_perm = Column(String(1000))
is_managed_externally = Column(Boolean, nullable=False, default=False)
external_url = Column(Text, nullable=True)

sql: Optional[str] = None
owners: List[User]
Expand Down

This file was deleted.

3 changes: 0 additions & 3 deletions superset/models/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,6 @@ 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, nullable=False, default=False)
external_url = Column(Text, nullable=True)

export_fields = [
"database_name",
"sqlalchemy_uri",
Expand Down
2 changes: 0 additions & 2 deletions superset/models/dashboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@ 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, nullable=False, default=False)
external_url = Column(Text, nullable=True)
roles = relationship(security_manager.role_model, secondary=DashboardRoles)
_filter_sets = relationship(
"FilterSet", back_populates="dashboard", cascade="all, delete"
Expand Down
2 changes: 1 addition & 1 deletion superset/models/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ def remove_params(self, param_to_remove: str) -> None:
self.params = json.dumps(params)

def reset_ownership(self) -> None:
"""object will belong to the user the current user"""
""" object will belong to the user the current user """
# make sure the object doesn't have relations to a user
# it will be filled by appbuilder on save
self.created_by = None
Expand Down
13 changes: 1 addition & 12 deletions superset/models/slice.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,7 @@
from flask_appbuilder import Model
from flask_appbuilder.models.decorators import renders
from markupsafe import escape, Markup
from sqlalchemy import (
Boolean,
Column,
DateTime,
ForeignKey,
Integer,
String,
Table,
Text,
)
from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, Table, Text
from sqlalchemy.engine.base import Connection
from sqlalchemy.orm import relationship
from sqlalchemy.orm.mapper import Mapper
Expand Down Expand Up @@ -92,8 +83,6 @@ 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, nullable=False, default=False)
external_url = Column(Text, nullable=True)
last_saved_by = relationship(
security_manager.user_model, foreign_keys=[last_saved_by_fk]
)
Expand Down

0 comments on commit 02699b3

Please sign in to comment.