mirror of
https://github.com/simonw/datasette.git
synced 2026-11-22 18:09:37 +01:00
Rename insert-query to store-query
Also queries/insert to queries/store Refs https://github.com/simonw/datasette/pull/2741#issuecomment-4549103663
This commit is contained in:
parent
180a6a86fd
commit
24887004cf
7 changed files with 47 additions and 40 deletions
|
|
@ -54,9 +54,9 @@ from .views.database import (
|
|||
QueryDeleteView,
|
||||
QueryDefinitionView,
|
||||
GlobalQueryListView,
|
||||
QueryInsertView,
|
||||
QueryListView,
|
||||
QueryParametersView,
|
||||
QueryStoreView,
|
||||
QueryUpdateView,
|
||||
)
|
||||
from .views.index import IndexView
|
||||
|
|
@ -2824,8 +2824,8 @@ class Datasette:
|
|||
r"/(?P<database>[^\/\.]+)/-/queries/analyze$",
|
||||
)
|
||||
add_route(
|
||||
QueryInsertView.as_view(self),
|
||||
r"/(?P<database>[^\/\.]+)/-/queries/insert$",
|
||||
QueryStoreView.as_view(self),
|
||||
r"/(?P<database>[^\/\.]+)/-/queries/store$",
|
||||
)
|
||||
add_route(
|
||||
ExecuteWriteAnalyzeView.as_view(self),
|
||||
|
|
|
|||
|
|
@ -62,9 +62,9 @@ def register_actions():
|
|||
resource_class=DatabaseResource,
|
||||
),
|
||||
Action(
|
||||
name="insert-query",
|
||||
abbr="iq",
|
||||
description="Create saved queries",
|
||||
name="store-query",
|
||||
abbr="sq",
|
||||
description="Create stored queries",
|
||||
resource_class=DatabaseResource,
|
||||
also_requires="execute-sql",
|
||||
),
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ form.sql .query-create-sql textarea#sql-editor {
|
|||
|
||||
<h1 style="padding-left: 10px; border-left: 10px solid #{{ database_color }}">Create query</h1>
|
||||
|
||||
<form class="sql core query-create-form" action="{{ urls.database(database) }}/-/queries/insert" method="post" data-analyze-url="{{ urls.database(database) }}/-/queries/analyze">
|
||||
<form class="sql core query-create-form" action="{{ urls.database(database) }}/-/queries/store" method="post" data-analyze-url="{{ urls.database(database) }}/-/queries/analyze">
|
||||
<div class="query-create-fields">
|
||||
<p class="query-create-field"><label for="query-title">Title</label> <input id="query-title" name="title" type="text" value="{{ title or "" }}"></p>
|
||||
<p class="query-create-field"><label for="query-url-slug">URL</label> <span class="query-create-url-control"><span class="query-create-url-prefix">{{ urls.database(database) }}/</span><input id="query-url-slug" name="name" type="text" value="{{ name or "" }}"></span></p>
|
||||
|
|
|
|||
|
|
@ -1419,7 +1419,7 @@ class QueryCreateView(BaseView):
|
|||
actor=request.actor,
|
||||
)
|
||||
await self.ds.ensure_permission(
|
||||
action="insert-query",
|
||||
action="store-query",
|
||||
resource=DatabaseResource(db.name),
|
||||
actor=request.actor,
|
||||
)
|
||||
|
|
@ -1440,11 +1440,11 @@ class QueryCreateAnalyzeView(BaseView):
|
|||
):
|
||||
return _block_framing(_error(["Permission denied: need execute-sql"], 403))
|
||||
if not await self.ds.allowed(
|
||||
action="insert-query",
|
||||
action="store-query",
|
||||
resource=DatabaseResource(db.name),
|
||||
actor=request.actor,
|
||||
):
|
||||
return _block_framing(_error(["Permission denied: need insert-query"], 403))
|
||||
return _block_framing(_error(["Permission denied: need store-query"], 403))
|
||||
|
||||
invalid_keys = set(request.args) - {"sql"}
|
||||
if invalid_keys:
|
||||
|
|
@ -1462,8 +1462,8 @@ class QueryCreateAnalyzeView(BaseView):
|
|||
)
|
||||
|
||||
|
||||
class QueryInsertView(QueryCreateView):
|
||||
name = "query-insert"
|
||||
class QueryStoreView(QueryCreateView):
|
||||
name = "query-store"
|
||||
|
||||
async def _error_response(self, request, db, query_data, message, status):
|
||||
message = _query_create_form_error_message(message)
|
||||
|
|
@ -1488,11 +1488,11 @@ class QueryInsertView(QueryCreateView):
|
|||
):
|
||||
return _error(["Permission denied: need execute-sql"], 403)
|
||||
if not await self.ds.allowed(
|
||||
action="insert-query",
|
||||
action="store-query",
|
||||
resource=DatabaseResource(db.name),
|
||||
actor=request.actor,
|
||||
):
|
||||
return _error(["Permission denied: need insert-query"], 403)
|
||||
return _error(["Permission denied: need store-query"], 403)
|
||||
|
||||
is_json = False
|
||||
query_data = {}
|
||||
|
|
@ -1961,8 +1961,8 @@ class QueryView(View):
|
|||
resource=DatabaseResource(database=database),
|
||||
actor=request.actor,
|
||||
)
|
||||
allow_insert_query = await datasette.allowed(
|
||||
action="insert-query",
|
||||
allow_store_query = await datasette.allowed(
|
||||
action="store-query",
|
||||
resource=DatabaseResource(database=database),
|
||||
actor=request.actor,
|
||||
)
|
||||
|
|
@ -2020,13 +2020,13 @@ class QueryView(View):
|
|||
if (
|
||||
not canned_query
|
||||
and allow_execute_sql
|
||||
and allow_insert_query
|
||||
and allow_store_query
|
||||
and is_validated_sql
|
||||
and ":_" not in sql
|
||||
):
|
||||
save_query_url = (
|
||||
datasette.urls.database(database)
|
||||
+ "/-/queries/insert?"
|
||||
+ "/-/queries/store?"
|
||||
+ urlencode({"sql": sql})
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue