From 3d8cd901bdcc1a94d627e4841cc1b8b9b3c26c34 Mon Sep 17 00:00:00 2001 From: Yongjie Zhao Date: Thu, 21 Jul 2022 18:10:57 +0800 Subject: [PATCH] support sqlite --- tests/integration_tests/conftest.py | 7 +++++++ tests/integration_tests/datasource_tests.py | 9 --------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/integration_tests/conftest.py b/tests/integration_tests/conftest.py index 5d7bf1acaf3d..6675509d6813 100644 --- a/tests/integration_tests/conftest.py +++ b/tests/integration_tests/conftest.py @@ -259,6 +259,7 @@ def physical_dataset(): example_database = get_example_database() engine = example_database.get_sqla_engine() + # sqlite can only execute one statement at a time engine.execute( """ CREATE TABLE IF NOT EXISTS physical_dataset( @@ -268,6 +269,10 @@ def physical_dataset(): col4 VARCHAR(255), col5 VARCHAR(255) ); + """ + ) + engine.execute( + """ INSERT INTO physical_dataset values (0, 'a', 1.0, NULL, '2000-01-01 00:00:00'), (1, 'b', 1.1, NULL, '2000-01-02 00:00:00'), @@ -293,6 +298,8 @@ def physical_dataset(): TableColumn(column_name="col5", type="VARCHAR(255)", table=dataset) SqlMetric(metric_name="count", expression="count(*)", table=dataset) db.session.merge(dataset) + if example_database.backend == "sqlite": + db.session.commit() yield dataset diff --git a/tests/integration_tests/datasource_tests.py b/tests/integration_tests/datasource_tests.py index 47166135d77c..ad4d625cc5ae 100644 --- a/tests/integration_tests/datasource_tests.py +++ b/tests/integration_tests/datasource_tests.py @@ -424,9 +424,6 @@ def test_get_samples(test_client, login_as_admin, virtual_dataset): """ Dataset API: Test get dataset samples """ - if backend() == "sqlite": - return - # 1. should cache data uri = ( f"/datasource/samples?datasource_id={virtual_dataset.id}&datasource_type=table" @@ -475,9 +472,6 @@ def test_get_samples(test_client, login_as_admin, virtual_dataset): def test_get_samples_with_incorrect_cc(test_client, login_as_admin, virtual_dataset): - if backend() == "sqlite": - return - TableColumn( column_name="DUMMY CC", type="VARCHAR(255)", @@ -499,9 +493,6 @@ def test_get_samples_with_incorrect_cc(test_client, login_as_admin, virtual_data def test_get_samples_on_physical_dataset(test_client, login_as_admin, physical_dataset): - if backend() == "sqlite": - return - uri = ( f"/datasource/samples?datasource_id={physical_dataset.id}&datasource_type=table" )