Skip to content

fix: preserve base_url in database query redirects #2699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cloudyun888 wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −1
Open

fix: preserve base_url in database query redirects #2699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion datasette/views/database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ async def get(self, request, datasette):

sql = (request.args.get("sql") or "").strip()
if sql:
redirect_url = "/" + request.url_vars.get("database") + "/-/query"
redirect_url = datasette.urls.database(database) + "/-/query"
if request.url_vars.get("format"):
redirect_url += "." + request.url_vars.get("format")
redirect_url += "?" + request.query_string
Expand Down
6 changes: 6 additions & 0 deletions tests/test_html.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,6 +929,12 @@ def test_base_url_affects_filter_redirects(app_client_base_url_prefix):
)


def test_base_url_affects_database_query_redirects(app_client_base_url_prefix):
response = app_client_base_url_prefix.get("/fixtures?sql=select+1")
assert response.status_code == 302
assert response.headers["location"] == "/prefix/fixtures/-/query?sql=select+1"


def test_base_url_affects_metadata_extra_css_urls(app_client_base_url_prefix):
html = app_client_base_url_prefix.get("/").text
assert '<link rel="stylesheet" href="/prefix/static/extra-css-urls.css">' in html
Expand Down
Loading