eschutho commented on code in PR #20149:
URL: https://github.com/apache/superset/pull/20149#discussion_r890647378
##########
superset/security/manager.py:
##########
@@ -471,23 +470,25 @@ def get_user_datasources(self) -> List["BaseDatasource"]:
user_perms = self.user_view_menu_names("datasource_access")
schema_perms = self.user_view_menu_names("schema_access")
user_datasources = set()
- for datasource_class in ConnectorRegistry.sources.values():
- user_datasources.update(
- self.get_session.query(datasource_class)
- .filter(
- or_(
- datasource_class.perm.in_(user_perms),
- datasource_class.schema_perm.in_(schema_perms),
- )
+
+ # pylint: disable=import-outside-toplevel
+ from superset.connectors.sqla.models import SqlaTable
+
+ user_datasources.update(
+ self.get_session.query(SqlaTable)
+ .filter(
+ or_(
+ SqlaTable.perm.in_(user_perms),
+ SqlaTable.schema_perm.in_(schema_perms),
)
- .all()
)
+ .all()
+ )
# group all datasources by database
- all_datasources =
ConnectorRegistry.get_all_datasources(self.get_session)
- datasources_by_database: Dict["Database", Set["BaseDatasource"]] =
defaultdict(
- set
- )
+ session = self.get_session
+ all_datasources = SqlaTable.get_all_sqlatables_datasources(session)
Review Comment:
nit, but any reason why you wouldn't name this method `get_all_datasources`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
