You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@superset.apache.org by hu...@apache.org on 2022/11/30 17:03:16 UTC

[superset] 09/10: fix merge conflicts

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 70bafd38b50091122585749e64a9f3fa51c0d562
Merge: bb7805592d f4ab29d5b5
Author: hughhhh <hu...@gmail.com>
AuthorDate: Wed Nov 30 11:50:24 2022 -0500

    fix merge conflicts

 superset/constants.py                          |   1 +
 superset/databases/api.py                      |  61 ++++++
 superset/databases/commands/create.py          |  11 ++
 superset/databases/commands/update.py          |  27 ++-
 superset/databases/schemas.py                  |  17 ++
 tests/integration_tests/databases/api_tests.py | 258 +++++++++++++++++++++++++
 tests/unit_tests/databases/api_test.py         | 144 ++++++++++++++
 7 files changed, 518 insertions(+), 1 deletion(-)