remote/sqlite-utils
1
0
Fork 0
mirror of https://github.com/simonw/sqlite-utils.git synced 2026-09-27 12:24:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Turn SQL errors into click errors

Browse source
This commit is contained in:
Simon Willison 2021-06-15 21:40:28 -07:00
commit 287cdcae89
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sqlite_utils/cli.py
View file

@ -1088,7 +1088,10 @@ def query(
_load_extensions(db, load_extension) _load_extensions(db, load_extension)
db.register_fts4_bm25() db.register_fts4_bm25()
with db.conn: with db.conn:
cursor = db.execute(sql, dict(param)) try:
cursor = db.execute(sql, dict(param))
except sqlite3.OperationalError as e:
raise click.ClickException(str(e))
if cursor.description is None: if cursor.description is None:
# This was an update/insert # This was an update/insert
headers = ["rows_affected"] headers = ["rows_affected"]

2
tests/test_cli.py
View file

@ -1049,7 +1049,7 @@ def test_query_load_extension(use_spatialite_shortcut):
# Without --load-extension: # Without --load-extension:
result = CliRunner().invoke(cli.cli, [":memory:", "select spatialite_version()"]) result = CliRunner().invoke(cli.cli, [":memory:", "select spatialite_version()"])
assert result.exit_code == 1 assert result.exit_code == 1
assert "no such function: spatialite_version" in repr(result) assert "no such function: spatialite_version" in result.output
# With --load-extension: # With --load-extension:
if use_spatialite_shortcut: if use_spatialite_shortcut:
load_extension = "spatialite" load_extension = "spatialite"