mirror of
https://github.com/simonw/dclient.git
synced 2026-07-25 18:34:32 +02:00
3621f13263
Replace aliases.json with config.json storing instances with default_database. Instance resolution: -i flag → config default → DATASETTE_URL. Database resolution: -d flag → instance default_database → DATASETTE_DATABASE. Token resolution: --token → auth.json by alias → auth.json by URL → DATASETTE_TOKEN. Add click-default-group dependency for bare SQL shortcut support. Add DCLIENT_CONFIG_DIR env var to override config directory. Rewrite query, insert, get, and actor commands for v2 API where instance is always -i flag. Add upsert command sharing insert implementation. Add databases, tables, schema, plugins commands. Add default_query hidden command for bare SQL shortcut. Add alias default, alias default-db subcommands. Add auth status subcommand. refs #29 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
126 lines
3.9 KiB
Python
126 lines
3.9 KiB
Python
from click.testing import CliRunner
|
|
from dclient.cli import cli
|
|
import json
|
|
import pathlib
|
|
import pytest
|
|
|
|
|
|
def test_query_error(httpx_mock):
|
|
httpx_mock.add_response(
|
|
json={
|
|
"ok": False,
|
|
"error": "Statement must be a SELECT",
|
|
"status": 400,
|
|
"title": "Invalid SQL",
|
|
},
|
|
status_code=400,
|
|
)
|
|
runner = CliRunner()
|
|
result = runner.invoke(
|
|
cli, ["query", "content", "hello", "-i", "https://example.com"]
|
|
)
|
|
assert result.exit_code == 1
|
|
assert (
|
|
result.output
|
|
== "Error: 400 status code. Invalid SQL: Statement must be a SELECT\n"
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize("with_token", (False, True))
|
|
def test_query(httpx_mock, with_token):
|
|
httpx_mock.add_response(
|
|
json={
|
|
"ok": True,
|
|
"database": "fixtures",
|
|
"query_name": None,
|
|
"rows": [{"5 * 2": 10}],
|
|
"truncated": False,
|
|
"columns": ["5 * 2"],
|
|
"query": {"sql": "select 5 * 2", "params": {}},
|
|
"error": None,
|
|
"private": False,
|
|
"allow_execute_sql": True,
|
|
},
|
|
status_code=200,
|
|
)
|
|
runner = CliRunner()
|
|
args = ["query", "content", "hello", "-i", "https://example.com"]
|
|
if with_token:
|
|
args.extend(["--token", "xyz"])
|
|
result = runner.invoke(cli, args)
|
|
assert result.exit_code == 0
|
|
assert json.loads(result.output) == [{"5 * 2": 10}]
|
|
|
|
# Check the request
|
|
request = httpx_mock.get_request()
|
|
assert str(request.url) == "https://example.com/content.json?sql=hello&_shape=objects"
|
|
if with_token:
|
|
assert request.headers["authorization"] == "Bearer xyz"
|
|
else:
|
|
assert "authorization" not in request.headers
|
|
|
|
|
|
def test_aliases(mocker, tmpdir, httpx_mock):
|
|
mocker.patch("dclient.cli.get_config_dir", return_value=pathlib.Path(tmpdir))
|
|
runner = CliRunner()
|
|
result = runner.invoke(cli, ["alias", "list"])
|
|
assert result.exit_code == 0
|
|
assert result.output == ""
|
|
|
|
result = runner.invoke(
|
|
cli, ["alias", "add", "foo", "https://example.com"]
|
|
)
|
|
assert result.exit_code == 0
|
|
assert result.output == ""
|
|
|
|
result = runner.invoke(cli, ["alias", "list"])
|
|
assert result.exit_code == 0
|
|
assert "foo = https://example.com" in result.output
|
|
|
|
# --json mode:
|
|
result = runner.invoke(cli, ["alias", "list", "--json"])
|
|
assert result.exit_code == 0
|
|
data = json.loads(result.output)
|
|
assert data["instances"]["foo"]["url"] == "https://example.com"
|
|
|
|
# Check the config file
|
|
config_file = pathlib.Path(tmpdir) / "config.json"
|
|
config = json.loads(config_file.read_text())
|
|
assert config["instances"]["foo"]["url"] == "https://example.com"
|
|
|
|
# Try a query against that alias
|
|
httpx_mock.add_response(
|
|
json={
|
|
"ok": True,
|
|
"database": "mydb",
|
|
"query_name": None,
|
|
"rows": [{"11 * 3": 33}],
|
|
"truncated": False,
|
|
"columns": ["11 * 3"],
|
|
"query": {"sql": "select 11 * 3", "params": {}},
|
|
"error": None,
|
|
"private": False,
|
|
"allow_execute_sql": True,
|
|
},
|
|
status_code=200,
|
|
)
|
|
result = runner.invoke(cli, ["query", "mydb", "select 11 * 3", "-i", "foo"])
|
|
assert result.exit_code == 0
|
|
assert json.loads(result.output) == [{"11 * 3": 33}]
|
|
|
|
# Should have hit https://example.com/mydb.json
|
|
url = httpx_mock.get_request().url
|
|
assert url.host == "example.com"
|
|
assert url.path == "/mydb.json"
|
|
assert dict(url.params) == {"sql": "select 11 * 3", "_shape": "objects"}
|
|
|
|
# Remove alias
|
|
result = runner.invoke(cli, ["alias", "remove", "invalid"])
|
|
assert result.exit_code == 1
|
|
assert result.output == "Error: No such alias\n"
|
|
|
|
result = runner.invoke(cli, ["alias", "remove", "foo"])
|
|
assert result.exit_code == 0
|
|
assert result.output == ""
|
|
config = json.loads(config_file.read_text())
|
|
assert config["instances"] == {}
|