Skip to content

Commit 628aff5

Browse files
committed
Update tests to handle sqlean-py.
1 parent e21f17b commit 628aff5

File tree

4 files changed

+52
-17
lines changed

4 files changed

+52
-17
lines changed

pyproject.toml

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ dev = [
4444
"tox>=4.8.0",
4545
"pdbpp>=0.10.3",
4646
"llm>=0.19.0",
47-
"sqlean-py>=3.47.0",
4847
]
4948

5049
[tool.setuptools.packages.find]

tests/test_dbspecial.py

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
1-
from litecli.packages.completion_engine import suggest_type
21
from test_completion_engine import sorted_dicts
3-
from litecli.packages.special.utils import format_uptime
4-
from litecli.packages.special.utils import check_if_sqlitedotcommand
5-
from utils import run, dbtest, assert_result_equal
2+
from utils import assert_result_equal, dbtest, run
3+
4+
from litecli.packages.completion_engine import suggest_type
5+
from litecli.packages.special.utils import check_if_sqlitedotcommand, format_uptime
6+
7+
try:
8+
import sqlean as sqlite3
9+
except ImportError:
10+
import sqlite3
611

712

813
def test_import_first_argument():
@@ -96,8 +101,11 @@ def test_special_d(executor):
96101
run(executor, """create table tst_tbl1(a text)""")
97102
results = run(executor, """\\d""")
98103

99-
# 'sqlean_define' is a table created by sqlean. Details: https://github.com/nalgeon/sqlean/blob/main/docs/define.md?plain=1#L3
100-
assert_result_equal(results, headers=["name"], rows=[("sqlean_define",), ("tst_tbl1",)], status="")
104+
if "sqlean" in sqlite3.__file__:
105+
# 'sqlean_define' is a table created by sqlean. Details: https://github.com/nalgeon/sqlean/blob/main/docs/define.md?plain=1#L3
106+
assert_result_equal(results, headers=["name"], rows=[("sqlean_define",), ("tst_tbl1",)], status="")
107+
else:
108+
assert_result_equal(results, headers=["name"], rows=[("tst_tbl1",)], status="")
101109

102110

103111
@dbtest

tests/test_sqlexecute.py

+31-9
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
from utils import run, dbtest, set_expanded_output, is_expanded_output, assert_result_equal
88

99
try:
10+
import sqlean as sqlite3
1011
from sqlean import OperationalError, ProgrammingError
1112
except ImportError:
13+
import sqlite3
1214
from sqlite3 import OperationalError, ProgrammingError
1315

1416

@@ -41,20 +43,40 @@ def test_binary(executor):
4143
assert_result_equal(results, headers=["blb"], rows=[(expected,)])
4244

4345

44-
## Failing in Travis for some unknown reason.
4546
@dbtest
46-
def test_table_and_columns_query(executor):
47+
def test_table_and_columns_query_w_sqlean(executor):
4748
run(executor, "create table a(x text, y text)")
4849
run(executor, "create table b(z text)")
4950
run(executor, "create table t(t text)")
5051

51-
assert set(executor.tables()) == set([("sqlean_define",), ("a",), ("b",), ("t",)])
52-
assert set(executor.table_columns()) == set(
53-
[("sqlean_define", "type"), ("sqlean_define", "body"), ("sqlean_define", "name"), ("a", "x"), ("a", "y"), ("b", "z"), ("t", "t")]
54-
)
55-
assert set(executor.table_columns()) == set(
56-
[("sqlean_define", "type"), ("sqlean_define", "body"), ("sqlean_define", "name"), ("a", "x"), ("a", "y"), ("b", "z"), ("t", "t")]
57-
)
52+
if "sqlean" in sqlite3.__file__:
53+
assert set(executor.tables()) == set([("sqlean_define",), ("a",), ("b",), ("t",)])
54+
assert set(executor.table_columns()) == set(
55+
[
56+
("sqlean_define", "type"),
57+
("sqlean_define", "body"),
58+
("sqlean_define", "name"),
59+
("a", "x"),
60+
("a", "y"),
61+
("b", "z"),
62+
("t", "t"),
63+
]
64+
)
65+
assert set(executor.table_columns()) == set(
66+
[
67+
("sqlean_define", "type"),
68+
("sqlean_define", "body"),
69+
("sqlean_define", "name"),
70+
("a", "x"),
71+
("a", "y"),
72+
("b", "z"),
73+
("t", "t"),
74+
]
75+
)
76+
else:
77+
assert set(executor.tables()) == set([("a",), ("b",), ("t",)])
78+
assert set(executor.table_columns()) == set([("a", "x"), ("a", "y"), ("b", "z"), ("t", "t")])
79+
assert set(executor.table_columns()) == set([("a", "x"), ("a", "y"), ("b", "z"), ("t", "t")])
5880

5981

6082
@dbtest

tox.ini

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
[tox]
2-
envlist = py,style
2+
envlist = py,style,sqlean
33

44
[testenv]
55
deps = uv
66
commands = uv pip install -e .[dev]
77
coverage run -m pytest -v tests
88
coverage report -m
99

10+
[testenv:sqlean]
11+
deps = uv
12+
commands = uv pip install -e .[dev,sqlean]
13+
coverage run -m pytest -v tests
14+
coverage report -m
15+
1016
[testenv:style]
1117
skip_install = true
1218
deps = ruff

0 commit comments

Comments
 (0)