remote/sqlite-utils
1
0
Fork 0
mirror of https://github.com/simonw/sqlite-utils.git synced 2026-07-24 18:04:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Default command now executes queries, --csv or --json

Browse source 
I replaced the following commands:

    sqlite-utils json db.db "select * from table"
    sqlite-utils csv db.db "select * from table"

With a unified 'query' command, which is now set as the default:

    sqlite-utils db.db "select * from table"
    sqlite-utils db.db "select * from table" --csv
This commit is contained in:
Simon Willison 2019-02-22 17:40:21 -08:00
commit f2ca48c0da
5 changed files with 76 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/test_cli.py
View file

@ -179,7 +179,7 @@ def test_upsert(db_path, tmpdir):
)
def test_csv(db_path):
def test_query_csv(db_path):
db = Database(db_path)
with db.conn:
db["dogs"].insert_all(
@ -189,13 +189,13 @@ def test_csv(db_path):
]
)
result = CliRunner().invoke(
cli.cli, ["csv", db_path, "select id, name, age from dogs"]
cli.cli, [db_path, "select id, name, age from dogs", "--csv"]
)
assert 0 == result.exit_code
assert "id,name,age\n1,Cleo,4\n2,Pancakes,2\n" == result.output
# Test the no-headers option:
result = CliRunner().invoke(
cli.cli, ["csv", db_path, "select id, name, age from dogs", "--no-headers"]
cli.cli, [db_path, "select id, name, age from dogs", "--no-headers", "--csv"]
)
assert "1,Cleo,4\n2,Pancakes,2\n" == result.output
@ -225,7 +225,7 @@ _one_query = "select id, name, age from dogs where id = 1"
(_one_query, ["--arrays", "--nl"], '[1, "Cleo", 4]'),
],
)
def test_json(db_path, sql, args, expected):
def test_query_json(db_path, sql, args, expected):
db = Database(db_path)
with db.conn:
db["dogs"].insert_all(
@ -234,5 +234,5 @@ def test_json(db_path, sql, args, expected):
{"id": 2, "age": 2, "name": "Pancakes"},
]
)
result = CliRunner().invoke(cli.cli, ["json", db_path, sql] + args)
result = CliRunner().invoke(cli.cli, [db_path, sql] + args)
assert expected == result.output.strip()