Skip to content

Commit b2e07a9

Browse files
MaxteabagMaxteabag
committed
Fix tests
1 parent cbf0737 commit b2e07a9

File tree

2 files changed

+296
-95
lines changed

2 files changed

+296
-95
lines changed

‎tests/unit/test_flight_adapter.py‎

Lines changed: 21 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,19 @@
44

55
from unittest.mock import MagicMock, patch
66

7-
from sqlit.config import ConnectionConfig
7+
from tests.helpers import ConnectionConfig
88

99

1010
class TestFlightSQLAdapter:
1111
"""Test Flight SQL adapter operations."""
1212

13-
def test_badge_label(self):
14-
"""Test badge label for Flight SQL."""
15-
with patch.dict(
16-
"sys.modules",
17-
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
18-
):
19-
from sqlit.db.adapters.flight import FlightSQLAdapter
20-
21-
adapter = FlightSQLAdapter()
22-
assert adapter.badge_label() == "Flight"
23-
24-
def test_url_schemes(self):
25-
"""Test URL schemes for Flight SQL."""
26-
with patch.dict(
27-
"sys.modules",
28-
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
29-
):
30-
from sqlit.db.adapters.flight import FlightSQLAdapter
31-
32-
schemes = FlightSQLAdapter.url_schemes()
33-
assert "flight" in schemes
34-
assert "grpc" in schemes
35-
assert "grpc+tls" in schemes
36-
3713
def test_name(self):
3814
"""Test adapter name."""
3915
with patch.dict(
4016
"sys.modules",
4117
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
4218
):
43-
from sqlit.db.adapters.flight import FlightSQLAdapter
19+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
4420

4521
adapter = FlightSQLAdapter()
4622
assert adapter.name == "Arrow Flight SQL"
@@ -51,7 +27,7 @@ def test_install_info(self):
5127
"sys.modules",
5228
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
5329
):
54-
from sqlit.db.adapters.flight import FlightSQLAdapter
30+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
5531

5632
adapter = FlightSQLAdapter()
5733
assert adapter.install_extra == "flight"
@@ -63,7 +39,7 @@ def test_driver_import_names(self):
6339
"sys.modules",
6440
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
6541
):
66-
from sqlit.db.adapters.flight import FlightSQLAdapter
42+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
6743

6844
adapter = FlightSQLAdapter()
6945
assert adapter.driver_import_names == ("adbc_driver_flightsql",)
@@ -74,7 +50,7 @@ def test_quote_identifier(self):
7450
"sys.modules",
7551
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
7652
):
77-
from sqlit.db.adapters.flight import FlightSQLAdapter
53+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
7854

7955
adapter = FlightSQLAdapter()
8056
assert adapter.quote_identifier("table") == '"table"'
@@ -87,7 +63,7 @@ def test_build_select_query_without_schema(self):
8763
"sys.modules",
8864
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
8965
):
90-
from sqlit.db.adapters.flight import FlightSQLAdapter
66+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
9167

9268
adapter = FlightSQLAdapter()
9369
query = adapter.build_select_query("users", 100)
@@ -99,7 +75,7 @@ def test_build_select_query_with_schema(self):
9975
"sys.modules",
10076
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
10177
):
102-
from sqlit.db.adapters.flight import FlightSQLAdapter
78+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
10379

10480
adapter = FlightSQLAdapter()
10581
query = adapter.build_select_query("users", 100, schema="public")
@@ -111,7 +87,7 @@ def test_supports_properties(self):
11187
"sys.modules",
11288
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
11389
):
114-
from sqlit.db.adapters.flight import FlightSQLAdapter
90+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
11591

11692
adapter = FlightSQLAdapter()
11793
assert adapter.supports_multiple_databases is True
@@ -126,7 +102,7 @@ def test_arrow_table_to_tuples(self):
126102
"sys.modules",
127103
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
128104
):
129-
from sqlit.db.adapters.flight import FlightSQLAdapter
105+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
130106

131107
adapter = FlightSQLAdapter()
132108

@@ -153,7 +129,7 @@ def test_arrow_table_to_tuples_empty(self):
153129
"sys.modules",
154130
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
155131
):
156-
from sqlit.db.adapters.flight import FlightSQLAdapter
132+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
157133

158134
adapter = FlightSQLAdapter()
159135

@@ -172,7 +148,7 @@ def test_arrow_table_to_tuples_none(self):
172148
"sys.modules",
173149
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
174150
):
175-
from sqlit.db.adapters.flight import FlightSQLAdapter
151+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
176152

177153
adapter = FlightSQLAdapter()
178154

@@ -187,7 +163,7 @@ def test_get_procedures_empty(self):
187163
"sys.modules",
188164
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
189165
):
190-
from sqlit.db.adapters.flight import FlightSQLAdapter
166+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
191167

192168
adapter = FlightSQLAdapter()
193169
assert adapter.get_procedures(MagicMock()) == []
@@ -198,7 +174,7 @@ def test_get_indexes_empty(self):
198174
"sys.modules",
199175
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
200176
):
201-
from sqlit.db.adapters.flight import FlightSQLAdapter
177+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
202178

203179
adapter = FlightSQLAdapter()
204180
assert adapter.get_indexes(MagicMock()) == []
@@ -209,7 +185,7 @@ def test_get_triggers_empty(self):
209185
"sys.modules",
210186
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
211187
):
212-
from sqlit.db.adapters.flight import FlightSQLAdapter
188+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
213189

214190
adapter = FlightSQLAdapter()
215191
assert adapter.get_triggers(MagicMock()) == []
@@ -220,58 +196,11 @@ def test_get_sequences_empty(self):
220196
"sys.modules",
221197
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
222198
):
223-
from sqlit.db.adapters.flight import FlightSQLAdapter
199+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
224200

225201
adapter = FlightSQLAdapter()
226202
assert adapter.get_sequences(MagicMock()) == []
227203

228-
def test_docker_image_patterns(self):
229-
"""Test docker image patterns for Flight SQL."""
230-
with patch.dict(
231-
"sys.modules",
232-
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
233-
):
234-
from sqlit.db.adapters.flight import FlightSQLAdapter
235-
236-
patterns = FlightSQLAdapter.docker_image_patterns()
237-
assert "sqlflite" in patterns
238-
assert "flight-sql" in patterns
239-
assert "flightsql" in patterns
240-
241-
def test_docker_env_vars(self):
242-
"""Test docker environment variable mappings."""
243-
with patch.dict(
244-
"sys.modules",
245-
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
246-
):
247-
from sqlit.db.adapters.flight import FlightSQLAdapter
248-
249-
env_vars = FlightSQLAdapter.docker_env_vars()
250-
assert "user" in env_vars
251-
assert "password" in env_vars
252-
assert "database" in env_vars
253-
assert "SQLFLITE_PASSWORD" in env_vars["password"]
254-
255-
def test_docker_default_user(self):
256-
"""Test docker default username."""
257-
with patch.dict(
258-
"sys.modules",
259-
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
260-
):
261-
from sqlit.db.adapters.flight import FlightSQLAdapter
262-
263-
assert FlightSQLAdapter.docker_default_user() == ""
264-
265-
def test_docker_default_port(self):
266-
"""Test docker default port."""
267-
with patch.dict(
268-
"sys.modules",
269-
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
270-
):
271-
from sqlit.db.adapters.flight import FlightSQLAdapter
272-
273-
assert FlightSQLAdapter.docker_default_port() == 31337
274-
275204

276205
class TestFlightSQLAdapterConnect:
277206
"""Test Flight SQL connection logic."""
@@ -280,7 +209,7 @@ def _run_connect_test(self, config, expected_uri, expected_db_kwargs):
280209
"""Helper to run a connect test with mocked modules."""
281210
import sys
282211

283-
from sqlit.db.adapters.flight import FlightSQLAdapter
212+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
284213

285214
mock_conn = MagicMock()
286215
mock_dbapi = MagicMock()
@@ -480,7 +409,7 @@ def test_execute_test_query(self):
480409
"sys.modules",
481410
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
482411
):
483-
from sqlit.db.adapters.flight import FlightSQLAdapter
412+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
484413

485414
adapter = FlightSQLAdapter()
486415

@@ -500,7 +429,7 @@ def test_execute_query_with_arrow_table(self):
500429
"sys.modules",
501430
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
502431
):
503-
from sqlit.db.adapters.flight import FlightSQLAdapter
432+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
504433

505434
adapter = FlightSQLAdapter()
506435

@@ -534,7 +463,7 @@ def test_execute_query_with_max_rows(self):
534463
"sys.modules",
535464
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
536465
):
537-
from sqlit.db.adapters.flight import FlightSQLAdapter
466+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
538467

539468
adapter = FlightSQLAdapter()
540469

@@ -566,7 +495,7 @@ def test_execute_non_query(self):
566495
"sys.modules",
567496
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
568497
):
569-
from sqlit.db.adapters.flight import FlightSQLAdapter
498+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
570499

571500
adapter = FlightSQLAdapter()
572501

@@ -588,7 +517,7 @@ def test_execute_non_query_no_rowcount(self):
588517
"sys.modules",
589518
{"adbc_driver_flightsql": MagicMock(), "adbc_driver_flightsql.dbapi": MagicMock()},
590519
):
591-
from sqlit.db.adapters.flight import FlightSQLAdapter
520+
from sqlit.domains.connections.providers.flight.adapter import FlightSQLAdapter
592521

593522
adapter = FlightSQLAdapter()
594523

0 commit comments

Comments
 (0)