QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-07-20 21:55:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: begin transaction to automatically commit (#41979)

Browse Source 
Co-authored-by: Evan Rusackas <evan@preset.io>
This commit is contained in:
Hans Yu
2026-07-14 07:45:40 +02:00
committed by GitHub
parent 8afad27c84
commit e165762bb7
7 changed files with 102 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
tests/unit_tests/extensions/test_sqlalchemy.py
View File

@@ -63,16 +63,17 @@ def database1(session: Session) -> Iterator["Database"]:
@pytest.fixture
def table1(session: Session, database1: "Database") -> Iterator[None]:
with database1.get_sqla_engine() as engine:
conn = engine.connect()
conn.execute(
text("CREATE TABLE table1 (a INTEGER NOT NULL PRIMARY KEY, b INTEGER)")
)
conn.execute(text("INSERT INTO table1 (a, b) VALUES (1, 10), (2, 20)"))
with engine.begin() as conn:
conn.execute(
text("CREATE TABLE table1 (a INTEGER NOT NULL PRIMARY KEY, b INTEGER)")
)
conn.execute(text("INSERT INTO table1 (a, b) VALUES (1, 10), (2, 20)"))
db.session.commit()
yield
conn.execute(text("DROP TABLE table1"))
with engine.begin() as conn:
conn.execute(text("DROP TABLE table1"))
db.session.commit()
@@ -99,16 +100,19 @@ def database2(session: Session) -> Iterator["Database"]:
@pytest.fixture
def table2(session: Session, database2: "Database") -> Iterator[None]:
with database2.get_sqla_engine() as engine:
conn = engine.connect()
conn.execute(
text("CREATE TABLE table2 (a INTEGER NOT NULL PRIMARY KEY, b TEXT)")
)
conn.execute(text("INSERT INTO table2 (a, b) VALUES (1, 'ten'), (2, 'twenty')"))
with engine.begin() as conn:
conn.execute(
text("CREATE TABLE table2 (a INTEGER NOT NULL PRIMARY KEY, b TEXT)")
)
conn.execute(
text("INSERT INTO table2 (a, b) VALUES (1, 'ten'), (2, 'twenty')")
)
db.session.commit()
yield
conn.execute(text("DROP TABLE table2"))
with engine.begin() as conn:
conn.execute(text("DROP TABLE table2"))
db.session.commit()
@@ -137,9 +141,9 @@ def test_superset(mocker: MockerFixture, app_context: None, table1: None) -> Non
# Skip test if superset:// dialect can't be loaded (common in Docker)
pytest.skip(f"Superset dialect not available: {e}")
conn = engine.connect()
results = conn.execute(text('SELECT * FROM "database1.table1"'))
assert list(results) == [(1, 10), (2, 20)]
with engine.connect() as conn:
results = conn.execute(text('SELECT * FROM "database1.table1"'))
assert list(results) == [(1, 10), (2, 20)]
@with_config(
@@ -178,9 +182,9 @@ def test_superset_limit(mocker: MockerFixture, app_context: None, table1: None)
# Skip test if superset:// dialect can't be loaded (common in Docker)
pytest.skip(f"Superset dialect not available: {e}")
conn = engine.connect()
results = conn.execute(text('SELECT * FROM "database1.table1"'))
assert list(results) == [(1, 10)]
with engine.connect() as conn:
results = conn.execute(text('SELECT * FROM "database1.table1"'))
assert list(results) == [(1, 10)]
@with_feature_flags(ENABLE_SUPERSET_META_DB=True)
@@ -213,16 +217,16 @@ def test_superset_joins(
# Skip test if superset:// dialect can't be loaded (common in Docker)
pytest.skip(f"Superset dialect not available: {e}")
conn = engine.connect()
results = conn.execute(
text("""
SELECT t1.b, t2.b
FROM "database1.table1" AS t1
JOIN "database2.table2" AS t2
ON t1.a = t2.a
""")
)
assert list(results) == [(10, "ten"), (20, "twenty")]
with engine.connect() as conn:
results = conn.execute(
text("""
SELECT t1.b, t2.b
FROM "database1.table1" AS t1
JOIN "database2.table2" AS t2
ON t1.a = t2.a
""")
)
assert list(results) == [(10, "ten"), (20, "twenty")]
@with_feature_flags(ENABLE_SUPERSET_META_DB=True)
@@ -257,22 +261,27 @@ def test_dml(
# Skip test if superset:// dialect can't be loaded (common in Docker)
pytest.skip(f"Superset dialect not available: {e}")
conn = engine.connect()
with engine.begin() as conn:
conn.execute(text('INSERT INTO "database1.table1" (a, b) VALUES (3, 30)'))
with engine.connect() as conn:
results = conn.execute(text('SELECT * FROM "database1.table1"'))
assert list(results) == [(1, 10), (2, 20), (3, 30)]
with engine.begin() as conn:
conn.execute(text('UPDATE "database1.table1" SET b=35 WHERE a=3'))
with engine.connect() as conn:
results = conn.execute(text('SELECT * FROM "database1.table1"'))
assert list(results) == [(1, 10), (2, 20), (3, 35)]
with engine.begin() as conn:
conn.execute(text('DELETE FROM "database1.table1" WHERE b>20'))
with engine.connect() as conn:
results = conn.execute(text('SELECT * FROM "database1.table1"'))
assert list(results) == [(1, 10), (2, 20)]
conn.execute(text('INSERT INTO "database1.table1" (a, b) VALUES (3, 30)'))
results = conn.execute(text('SELECT * FROM "database1.table1"'))
assert list(results) == [(1, 10), (2, 20), (3, 30)]
conn.execute(text('UPDATE "database1.table1" SET b=35 WHERE a=3'))
results = conn.execute(text('SELECT * FROM "database1.table1"'))
assert list(results) == [(1, 10), (2, 20), (3, 35)]
conn.execute(text('DELETE FROM "database1.table1" WHERE b>20'))
results = conn.execute(text('SELECT * FROM "database1.table1"'))
assert list(results) == [(1, 10), (2, 20)]
with pytest.raises(ProgrammingError) as excinfo:
conn.execute(
text("""INSERT INTO "database2.table2" (a, b) VALUES (3, 'thirty')""")
)
with engine.begin() as conn:
with pytest.raises(ProgrammingError) as excinfo:
conn.execute(
text("""INSERT INTO "database2.table2" (a, b) VALUES (3, 'thirty')""")
)
assert str(excinfo.value).strip() == (
"(shillelagh.exceptions.ProgrammingError) DML not enabled in database "
'"database2"\n[SQL: INSERT INTO "database2.table2" (a, b) '
@@ -324,9 +333,9 @@ def test_security_manager(
# Skip test if superset:// dialect can't be loaded (common in Docker)
pytest.skip(f"Superset dialect not available: {e}")
conn = engine.connect()
with pytest.raises(SupersetSecurityException) as excinfo:
conn.execute(text('SELECT * FROM "database1.table1"'))
with engine.connect() as conn:
with pytest.raises(SupersetSecurityException) as excinfo:
conn.execute(text('SELECT * FROM "database1.table1"'))
assert str(excinfo.value) == (
"You need access to the following tables: `table1`,\n "
"`all_database_access` or `all_datasource_access` permission"
@@ -358,13 +367,13 @@ def test_allowed_dbs(mocker: MockerFixture, app_context: None, table1: None) ->
# Skip test if superset:// dialect can't be loaded (common in Docker)
pytest.skip(f"Superset dialect not available: {e}")
conn = engine.connect()
with engine.connect() as conn:
results = conn.execute(text('SELECT * FROM "database1.table1"'))
assert list(results) == [(1, 10), (2, 20)]
results = conn.execute(text('SELECT * FROM "database1.table1"'))
assert list(results) == [(1, 10), (2, 20)]
with pytest.raises(ProgrammingError) as excinfo:
conn.execute(text('SELECT * FROM "database2.table2"'))
with engine.connect() as conn:
with pytest.raises(ProgrammingError) as excinfo:
conn.execute(text('SELECT * FROM "database2.table2"'))
assert str(excinfo.value) == (
"""
(shillelagh.exceptions.ProgrammingError) Unsupported table: database2.table2