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

order= is now order_by=, refs #197

Browse source
This commit is contained in:
Simon Willison 2020-11-06 16:43:33 -08:00
commit bce1872109
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sqlite_utils/cli.py
View file

@ -1033,7 +1033,7 @@ def search(
raise click.ClickException(
"Table '{}' has no column '{}".format(dbtable, c)
)
sql = table_obj.search_sql(columns=column, order=order, limit=limit)
sql = table_obj.search_sql(columns=column, order_by=order, limit=limit)
if show_sql:
click.echo(sql)
return

17
sqlite_utils/db.py
View file

@ -1321,7 +1321,7 @@ class Table(Queryable):
)
return self
def search_sql(self, columns=None, order=None, limit=None):
def search_sql(self, columns=None, order_by=None, limit=None):
# Pick names for table and rank column that don't clash
original = "original_" if self.name == "original" else "original"
rank = "rank"
@ -1352,7 +1352,7 @@ class Table(Queryable):
where
[{fts_table}] match :query
order by
{order}
{order_by}
{limit}
"""
).strip()
@ -1370,12 +1370,19 @@ class Table(Queryable):
rank=rank,
rank_implementation=rank_implementation,
fts_table=fts_table,
order=order or rank,
order_by=order_by or rank,
limit="limit {}".format(limit) if limit else "",
).strip()
def search(self, q, order=None):
cursor = self.db.execute(self.search_sql(order=order), {"query": q})
def search(self, q, order_by=None, columns=None, limit=None):
cursor = self.db.execute(
self.search_sql(
order_by=order_by,
columns=columns,
limit=limit,
),
{"query": q},
)
columns = [c[0] for c in cursor.description]
for row in cursor:
yield dict(zip(columns, row))