github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename filtered_table_rows_count to count, refs #782

Browse source
This commit is contained in:
Simon Willison 2022-12-31 12:52:57 -08:00
commit 5bbe2bcc50
5 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
datasette/templates/table.html
View file

@ -1,6 +1,6 @@
{% extends "base.html" %}
{% block title %}{{ database }}: {{ table }}: {% if filtered_table_rows_count or filtered_table_rows_count == 0 %}{{ "{:,}".format(filtered_table_rows_count) }} row{% if filtered_table_rows_count == 1 %}{% else %}s{% endif %}{% endif %}{% if human_description_en %} {{ human_description_en }}{% endif %}{% endblock %}
{% block title %}{{ database }}: {{ table }}: {% if count or count == 0 %}{{ "{:,}".format(count) }} row{% if count == 1 %}{% else %}s{% endif %}{% endif %}{% if human_description_en %} {{ human_description_en }}{% endif %}{% endblock %}
{% block extra_head %}
{{- super() -}}
@ -55,8 +55,8 @@
</dl>
{% endif %}
{% if filtered_table_rows_count or human_description_en %}
<h3>{% if filtered_table_rows_count or filtered_table_rows_count == 0 %}{{ "{:,}".format(filtered_table_rows_count) }} row{% if filtered_table_rows_count == 1 %}{% else %}s{% endif %}{% endif %}
{% if count or human_description_en %}
<h3>{% if count or count == 0 %}{{ "{:,}".format(count) }} row{% if count == 1 %}{% else %}s{% endif %}{% endif %}
{% if human_description_en %}{{ human_description_en }}{% endif %}
</h3>
{% endif %}

12
datasette/views/table.py
View file

@ -539,7 +539,7 @@ class TableView(DataView):
results = await db.execute(sql, params, truncate=True, **extra_args)
# Calculate the total count for this query
filtered_table_rows_count = None
count = None
if (
not db.is_mutable
and self.ds.inspect_data
@ -547,17 +547,17 @@ class TableView(DataView):
):
# We can use a previously cached table row count
try:
filtered_table_rows_count = self.ds.inspect_data[database_name][
count = self.ds.inspect_data[database_name][
"tables"
][table_name]["count"]
except KeyError:
pass
# Otherwise run a select count(*) ...
if count_sql and filtered_table_rows_count is None and not nocount:
if count_sql and count is None and not nocount:
try:
count_rows = list(await db.execute(count_sql, from_sql_params))
filtered_table_rows_count = count_rows[0][0]
count = count_rows[0][0]
except QueryInterrupted:
pass
@ -584,7 +584,7 @@ class TableView(DataView):
params=params,
table=table_name,
metadata=table_metadata,
row_count=filtered_table_rows_count,
row_count=count,
)
)
@ -853,7 +853,7 @@ class TableView(DataView):
"human_description_en": human_description_en,
"rows": rows[:page_size],
"truncated": results.truncated,
"filtered_table_rows_count": filtered_table_rows_count,
"count": count,
"expanded_columns": expanded_columns,
"expandable_columns": expandable_columns,
"columns": columns,