This is an automated email from the ASF dual-hosted git repository. hugh pushed a commit to branch test-ssh-tunnel-1 in repository https://gitbox.apache.org/repos/asf/superset.git
commit 027844f1778ebadcf8e365de5d5f7b9eedc89322 Merge: 70bafd38b5 8c6d6e46a6 Author: hughhhh <[email protected]> AuthorDate: Wed Nov 30 11:51:50 2022 -0500 fix merge conflicts superset/config.py | 38 +++++++ superset/databases/ssh_tunnel/commands/create.py | 14 ++- superset/databases/ssh_tunnel/commands/update.py | 7 ++ superset/models/core.py | 5 +- tests/unit_tests/config_test.py | 125 +++++++++++++++++++++++ 5 files changed, 184 insertions(+), 5 deletions(-) diff --cc superset/models/core.py index d94372577c,48c0649c28..d81a6801cc --- a/superset/models/core.py +++ b/superset/models/core.py @@@ -394,8 -393,8 +396,7 @@@ class Database source=source, ssh_tunnel_server=server, ) - else: - # do look up in table for using database_id yield self._get_sqla_engine(schema=schema, nullpool=nullpool, source=source) def _get_sqla_engine(
