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

Merge remote-tracking branch 'origin/main' into fix/convert-dryrun-quote-identifier

Browse source 
# Conflicts:
#	sqlite_utils/cli.py
This commit is contained in:
Simon Willison 2026-08-12 14:07:24 -07:00
commit fc2dcfca36
71 changed files with 4489 additions and 2191 deletions
Download patch file Download diff file Expand all files Collapse all files

19
sqlite_utils/cli.py
View file

@ -1093,7 +1093,7 @@ def insert_upsert_implementation(
column_type_overrides = {column: ctype.upper() for column, ctype in (types or [])}
def _insert_docs(docs, tracker=None):
extra_kwargs = {
extra_kwargs: dict[str, Any] = {
"ignore": ignore,
"replace": replace,
"truncate": truncate,
@ -2478,6 +2478,8 @@ def rows(
if limit:
sql += f" limit {limit}"
if offset:
if not limit:
sql += " limit -1"
sql += f" offset {offset}"
ctx.invoke(
query,
@ -3273,15 +3275,10 @@ def convert(
raise click.ClickException(str(e))
if dry_run:
# Pull first 20 values for first column and preview them
if multi:
def preview(v):
def preview(v):
if multi:
return json.dumps(fn(v), default=repr, ensure_ascii=False) if v else v
else:
def preview(v):
return fn(v) if v else v
return fn(v) if v else v
db.conn.create_function("preview_transform", 1, preview)
col_quoted = quote_identifier(columns[0])
@ -3788,12 +3785,12 @@ def _rows_from_code(code):
code = pathlib.Path(code).read_text()
except FileNotFoundError:
raise click.ClickException(f"File not found: {code}")
namespace = {}
namespace: dict[str, Any] = {}
try:
exec(code, namespace) # noqa: S102
except SyntaxError as ex:
raise click.ClickException(f"Error in --code: {ex}")
rows = namespace.get("rows")
rows: Any = namespace.get("rows")
if callable(rows):
rows = rows()
if isinstance(rows, dict):