datasette-edit-schema 0.8a1__py3-none-any.whl → 0.8a2__py3-none-any.whl

datasette_edit_schema/__init__.py

@@ -1,7 +1,7 @@
 from datasette import hookimpl
 from datasette.events import CreateTableEvent, AlterTableEvent, DropTableEvent
 from datasette.utils.asgi import Response, NotFound, Forbidden
-from datasette.utils import sqlite3
+from datasette.utils import sqlite3, tilde_decode, tilde_encode
 from urllib.parse import quote_plus, unquote_plus
 import sqlite_utils
 import textwrap
@@ -40,7 +40,7 @@ def table_actions(datasette, actor, database, table):
         return [
             {
                 "href": datasette.urls.path(
-                    "/-/edit-schema/{}/{}".format(database, quote_plus(table))
+                    "/-/edit-schema/{}/{}".format(database, tilde_encode(table))
                 ),
                 "label": "Edit table schema",
                 "description": "Rename the table, add and remove columns...",
@@ -216,6 +216,7 @@ async def edit_schema_database(request, datasette):
             {
                 "database": database,
                 "tables": tables,
+                "tilde_encode": tilde_encode,
             },
             request=request,
         )
@@ -307,7 +308,7 @@ async def edit_schema_create_table(request, datasette):
 
 
 async def edit_schema_table(request, datasette):
-    table = unquote_plus(request.url_vars["table"])
+    table = tilde_decode(request.url_vars["table"])
     databases = get_databases(datasette)
     database_name = request.url_vars["database"]
 
@@ -548,16 +549,14 @@ async def edit_schema_table(request, datasette):
                         info["foreign_key"].other_column,
                     ),
                     "value": "{}.{}".format(
-                        info["foreign_key"].other_table,
-                        info["foreign_key"].other_column,
+                        tilde_encode(info["foreign_key"].other_table),
+                        tilde_encode(info["foreign_key"].other_column),
                     ),
                     "selected": True,
                 }
             )
             seen.add(
-                "{}:{}".format(
-                    info["foreign_key"].other_table, info["foreign_key"].other_column
-                )
+                (info["foreign_key"].other_table, info["foreign_key"].other_column)
             )
         # Now add suggestions
         for suggested_table, suggested_column in info["suggestions"]:
@@ -570,19 +569,24 @@ async def edit_schema_table(request, datasette):
                         "name": "{}.{} (suggested)".format(
                             suggested_table, suggested_column
                         ),
-                        "value": "{}.{}".format(suggested_table, suggested_column),
+                        "value": "{}.{}".format(
+                            tilde_encode(suggested_table),
+                            tilde_encode(suggested_column),
+                        ),
                         "selected": False,
                     }
                 )
-                seen.add("{}:{}".format(suggested_table, suggested_column))
+                seen.add((suggested_table, suggested_column))
                 info["suggested"] = "{}.{}".format(suggested_table, suggested_column)
         # And the rest
         for rest_table, rest_column in info["options"]:
-            if "{}:{}".format(rest_table, rest_column) not in seen:
+            if (rest_table, rest_column) not in seen:
                 options.append(
                     {
                         "name": "{}.{}".format(rest_table, rest_column),
-                        "value": "{}.{}".format(rest_table, rest_column),
+                        "value": "{}.{}".format(
+                            tilde_encode(rest_table), tilde_encode(rest_column)
+                        ),
                         "selected": False,
                     }
                 )
@@ -619,6 +623,7 @@ async def edit_schema_table(request, datasette):
                 "can_rename_table": await can_rename_table(
                     datasette, request.actor, database_name, table
                 ),
+                "tilde_encode": tilde_encode,
             },
             request=request,
         )
@@ -782,8 +787,8 @@ async def update_foreign_keys(request, datasette, database, table, formdata):
         fks.append(
             (
                 column,
-                split[0],
-                split[1],
+                tilde_decode(split[0]),
+                tilde_decode(split[1]),
             )
         )
 

datasette_edit_schema/templates/edit_schema_database.html

@@ -10,7 +10,7 @@
 <h1>Edit tables in {{ database.name }}.db</h1>
 
 {% for table in tables %}
-    <h2><a href="/-/edit-schema/{{ database.name|quote_plus }}/{{ table.name|quote_plus }}">{{ table.name }}</a></h2>
+    <h2><a href="/-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table.name) }}">{{ table.name }}</a></h2>
     <p>{% for column in table.columns %}{{ column.name }}{% if not loop.last %}, {% endif %}{% endfor %}</p>
 {% endfor %}
 

datasette_edit_schema/templates/edit_schema_table.html

@@ -86,12 +86,12 @@ html body label {
 {% endblock %}
 
 {% block content %}
-<h1>Edit table <a href="{{ base_url }}{{ database.name|quote_plus }}/{{ table|quote_plus }}">{{ database.name }}/{{ table }}</a></h1>
+<h1>Edit table <a href="{{ base_url }}{{ database.name|quote_plus }}/{{ tilde_encode(table) }}">{{ database.name }}/{{ table }}</a></h1>
 
 {% if can_rename_table %}
 <h2>Rename table</h2>
 
-<form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ table|quote_plus }}" method="post">
+<form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
     <input type="hidden" name="csrftoken" value="{{ csrftoken() }}">
     <p><label>New name&nbsp; <input type="text" name="name"></label>
     <input type="hidden" name="rename_table" value="1">
@@ -99,7 +99,7 @@ html body label {
 </form>
 {% endif %}
 
-<form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ table|quote_plus }}" method="post">
+<form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
 <h2>Change existing columns</h2>
 <ul class="sortable-columns">
 {% for column in columns %}
@@ -134,7 +134,7 @@ html body label {
 
 <h2>Add a column</h2>
 
-<form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ table|quote_plus }}" method="post">
+<form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
     <input type="hidden" name="csrftoken" value="{{ csrftoken() }}">
     <input type="hidden" name="add_column" value="1">
     <p><label>Name &nbsp;<input type="text" name="name"></label>
@@ -156,7 +156,7 @@ table.foreign-key-options td {
 }
 </style>
 
-<form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ table|quote_plus }}" method="post">
+<form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
     <input type="hidden" name="csrftoken" value="{{ csrftoken() }}">
     <input type="hidden" name="action" value="update_foreign_keys">
     <table class="foreign-key-options">
@@ -180,7 +180,7 @@ table.foreign-key-options td {
 
     <p>The primary key column uniquely identifies each row in the table.</p>
 
-    <form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ table|quote_plus }}" method="post">
+    <form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
         <input type="hidden" name="csrftoken" value="{{ csrftoken() }}">
         <input type="hidden" name="action" value="update_primary_key">
         <label for="primary_key">Primary key column &nbsp;</label>
@@ -201,7 +201,7 @@ table.foreign-key-options td {
 
     <p>Indexes can speed up filter and sort operations against indexed columns.</p>
 
-    <form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ table|quote_plus }}" method="post">
+    <form action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
         <input type="hidden" name="csrftoken" value="{{ csrftoken() }}">
         {% if non_primary_key_columns %}
             <p><label for="id_add_index_column">
@@ -233,7 +233,7 @@ table.foreign-key-options td {
 {% if can_drop_table %}
     <h2>Drop table</h2>
 
-    <form id="drop-table-form" action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ table|quote_plus }}" method="post">
+    <form id="drop-table-form" action="{{ base_url }}-/edit-schema/{{ database.name|quote_plus }}/{{ tilde_encode(table) }}" method="post">
         <input type="hidden" name="csrftoken" value="{{ csrftoken() }}">
         <input type="hidden" name="drop_table" value="1">
         <input type="submit" class="button-red" value="Drop this table">

{datasette_edit_schema-0.8a1.dist-info → datasette_edit_schema-0.8a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datasette-edit-schema
-Version: 0.8a1
+Version: 0.8a2
 Summary: Datasette plugin for modifying table schemas
 Author: Simon Willison
 License: Apache-2.0

{datasette_edit_schema-0.8a1.dist-info → datasette_edit_schema-0.8a2.dist-info}/RECORD

@@ -1,14 +1,14 @@
-datasette_edit_schema/__init__.py,sha256=CrqDxy8kEGPv2zHiQtMr5ZpUu0ufgNN3VBn0JQKKVK8,30707
+datasette_edit_schema/__init__.py,sha256=ImGK6H3TZQLDg3awi8csyN9qaT5zTu6enNOuEogQSgc,30998
 datasette_edit_schema/utils.py,sha256=PURr7eOLOcZ7MQTCkZ_fDyeB39-MDhwIbBA-YeXSods,4388
 datasette_edit_schema/static/draggable.1.0.0-beta.11.bundle.js,sha256=rpTEfd8N7sSY5n_mi6mwGz2f-dRXOgknFBuUXmwFnpY,202242
 datasette_edit_schema/static/draggable.1.0.0-beta.11.bundle.min.js,sha256=JlHRb54CUGfor6ENxVjMq9rd_QRrRLoVJf-j3V_c52U,119723
 datasette_edit_schema/templates/edit_schema_create_table.html,sha256=cUiS_LucrtvwpD_Nfb6ER4uZyhzTtPMzl3vkqhx9iGQ,3777
-datasette_edit_schema/templates/edit_schema_database.html,sha256=0fo_n0w5JQRvc5UmlDkECpUIXxlwVI0IhTFQ55C6orY,540
+datasette_edit_schema/templates/edit_schema_database.html,sha256=gPPBVgTzdAWg4JgwrTfwHWdGBb89cObeqWneng4wQTk,543
 datasette_edit_schema/templates/edit_schema_index.html,sha256=eNSOFFwv1gsOYP3fNQqcPh0gU5Ny5sDnngVZT5XiUNA,474
-datasette_edit_schema/templates/edit_schema_table.html,sha256=dmJLMA8Revb5sdryv9NUfR4Kw6TOPQtW97oByR-pE3k,9382
-datasette_edit_schema-0.8a1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-datasette_edit_schema-0.8a1.dist-info/METADATA,sha256=DsF29608AXw15hHeTlHcOKC41gL9uiMfBifXDIBU58A,5150
-datasette_edit_schema-0.8a1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-datasette_edit_schema-0.8a1.dist-info/entry_points.txt,sha256=1-FeujFVTui7tFNBdz3hN5x4vRoanaAydYF5ljYsvp8,48
-datasette_edit_schema-0.8a1.dist-info/top_level.txt,sha256=Cbx3sgneHtcDDxV5SVL8IyU8JvsSdXgpmZqw4oDuOzM,22
-datasette_edit_schema-0.8a1.dist-info/RECORD,,
+datasette_edit_schema/templates/edit_schema_table.html,sha256=8Sd8GjtTYhNXCQAWQuLdCg_awUZmCJD82qyM0RXkkK4,9406
+datasette_edit_schema-0.8a2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+datasette_edit_schema-0.8a2.dist-info/METADATA,sha256=nukoMkEvm9sf1Pt60nLvKVi4m64VWZLkE1Un_F4qUc0,5150
+datasette_edit_schema-0.8a2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+datasette_edit_schema-0.8a2.dist-info/entry_points.txt,sha256=1-FeujFVTui7tFNBdz3hN5x4vRoanaAydYF5ljYsvp8,48
+datasette_edit_schema-0.8a2.dist-info/top_level.txt,sha256=Cbx3sgneHtcDDxV5SVL8IyU8JvsSdXgpmZqw4oDuOzM,22
+datasette_edit_schema-0.8a2.dist-info/RECORD,,