refactor: Ensure Flask framework leverages the Flask-SQLAlchemy session (Phase II) (#26909)

This commit is contained in:
John Bodley
2024-02-14 06:20:15 +13:00
committed by GitHub
parent 827864b939
commit 847ed3f5b0
96 changed files with 656 additions and 730 deletions

View File

@@ -35,7 +35,7 @@ def session_with_data(session: Session) -> Iterator[Session]:
engine = session.get_bind()
SqlaTable.metadata.create_all(engine) # pylint: disable=no-member
db = Database(database_name="my_database", sqlalchemy_uri="sqlite://")
database = Database(database_name="my_database", sqlalchemy_uri="sqlite://")
columns = [
TableColumn(column_name="a", type="INTEGER"),
@@ -45,12 +45,12 @@ def session_with_data(session: Session) -> Iterator[Session]:
table_name="my_sqla_table",
columns=columns,
metrics=[],
database=db,
database=database,
)
query_obj = Query(
client_id="foo",
database=db,
database=database,
tab_name="test_tab",
sql_editor_id="test_editor_id",
sql="select * from bar",
@@ -63,13 +63,13 @@ def session_with_data(session: Session) -> Iterator[Session]:
results_key="abc",
)
saved_query = SavedQuery(database=db, sql="select * from foo")
saved_query = SavedQuery(database=database, sql="select * from foo")
table = Table(
name="my_table",
schema="my_schema",
catalog="my_catalog",
database=db,
database=database,
columns=[],
)
@@ -93,7 +93,7 @@ FROM my_catalog.my_schema.my_table
session.add(table)
session.add(saved_query)
session.add(query_obj)
session.add(db)
session.add(database)
session.add(sqla_table)
session.flush()
yield session
@@ -190,7 +190,7 @@ def test_get_datasource_w_str_param(session_with_data: Session) -> None:
def test_get_all_datasources(session_with_data: Session) -> None:
from superset.connectors.sqla.models import SqlaTable
result = SqlaTable.get_all_datasources(session=session_with_data)
result = SqlaTable.get_all_datasources()
assert len(result) == 1