Merge 551a1173b8 into a947dc6739

sqlite_utils/db.py

@@ -805,12 +805,8 @@ class Database:
         :param alias: Alias name to use
         :param filepath: Path to SQLite database file on disk
         """
-        attach_sql = """
-            ATTACH DATABASE '{}' AS {};
-        """.format(
-            str(pathlib.Path(filepath).resolve()), quote_identifier(alias)
-        ).strip()
-        self.execute(attach_sql)
+        attach_sql = "ATTACH DATABASE ? AS {};".format(quote_identifier(alias))
+        self.execute(attach_sql, [str(pathlib.Path(filepath).resolve())])
 
     def query(
         self, sql: str, params: Optional[Union[Sequence, Dict[str, Any]]] = None

tests/test_attach.py

@@ -14,3 +14,20 @@ def test_attach(tmpdir):
     assert db.execute(
         "select * from foo union all select * from bar.bar"
     ).fetchall() == [(1, "foo"), (1, "bar")]
+
+
+def test_attach_filepath_with_apostrophe(tmpdir):
+    foo_path = str(tmpdir / "foo.db")
+    bar_dir = tmpdir / "has'apostrophe"
+    bar_dir.mkdir()
+    bar_path = str(bar_dir / "bar.db")
+    db = Database(foo_path)
+    with db.conn:
+        db["foo"].insert({"id": 1, "text": "foo"})
+    db2 = Database(bar_path)
+    with db2.conn:
+        db2["bar"].insert({"id": 1, "text": "bar"})
+    db.attach("bar", bar_path)
+    assert db.execute(
+        "select * from foo union all select * from bar.bar"
+    ).fetchall() == [(1, "foo"), (1, "bar")]

tests/test_cli.py

@@ -2503,6 +2503,30 @@ def test_attach(tmpdir):
     ]
 
 
+def test_attach_filepath_with_apostrophe(tmpdir):
+    foo_path = str(tmpdir / "foo.db")
+    bar_dir = tmpdir / "has'apostrophe"
+    bar_dir.mkdir()
+    bar_path = str(bar_dir / "bar.db")
+    db = Database(foo_path)
+    with db.conn:
+        db["foo"].insert({"id": 1, "text": "foo"})
+    db2 = Database(bar_path)
+    with db2.conn:
+        db2["bar"].insert({"id": 1, "text": "bar"})
+    db.attach("bar", bar_path)
+    sql = "select * from foo union all select * from bar.bar"
+    result = CliRunner().invoke(
+        cli.cli,
+        [foo_path, "--attach", "bar", bar_path, sql],
+        catch_exceptions=False,
+    )
+    assert json.loads(result.output) == [
+        {"id": 1, "text": "foo"},
+        {"id": 1, "text": "bar"},
+    ]
+
+
 def test_csv_insert_bom(tmpdir):
     db_path = str(tmpdir / "test.db")
     bom_csv_path = str(tmpdir / "bom.csv")