Fix for foreign keys with strange characters, closes #62

simonw · Apr 24, 2024 · 1bd4555 · 1bd4555
1 parent 06c26bc
commit 1bd4555
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 8 deletions.
diff --git a/datasette_edit_schema/__init__.py b/datasette_edit_schema/__init__.py
@@ -549,8 +549,8 @@ def get_columns_and_schema_and_fks_and_pks_and_indexes(conn):
                         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,
                 }
@@ -569,7 +569,10 @@ def get_columns_and_schema_and_fks_and_pks_and_indexes(conn):
                         "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,
                     }
                 )
@@ -581,7 +584,9 @@ def get_columns_and_schema_and_fks_and_pks_and_indexes(conn):
                 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,
                     }
                 )
@@ -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]),
             )
         )
 

diff --git a/tests/test_edit_schema.py b/tests/test_edit_schema.py
@@ -820,6 +820,24 @@ async def test_edit_form_for_empty_table(db_path):
             ["id"],
             "Foreign keys updated to distraction_id → cities.id",
         ),
+        # Same again for tables with weird characters in their names
+        (
+            "animal.name/with/slashes",
+            {
+                "action": "update_foreign_keys",
+                "fk.species": "table~2Ename~2Fwith~2Fslashes~2Ecategories.id",
+            },
+            [
+                (
+                    "animal.name/with/slashes",
+                    "species",
+                    "table.name/with/slashes.categories",
+                    "id",
+                )
+            ],
+            ["id"],
+            "Foreign keys updated to species → table.name/with/slashes.categories.id",
+        ),
         # Change primary key in a way that works
         (
             "museums",
@@ -845,13 +863,13 @@ async def test_edit_keys(
     # Grab a csrftoken
     cookies = {"ds_actor": ds.sign({"a": {"id": "root"}}, "actor")}
     csrftoken_r = await ds.client.get(
-        "/-/edit-schema/data/{}".format(table), cookies=cookies
+        "/-/edit-schema/data/{}".format(tilde_encode(table)), cookies=cookies
     )
     csrftoken = csrftoken_r.cookies["ds_csrftoken"]
     cookies["ds_csrftoken"] = csrftoken
     post_data["csrftoken"] = csrftoken
     response = await ds.client.post(
-        "/-/edit-schema/data/{}".format(table),
+        "/-/edit-schema/data/{}".format(tilde_encode(table)),
         data=post_data,
         cookies=cookies,
     )