Merge branch 'main' into amjith/type-checking

Author: amjith

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Upcoming (TBD)
 
+### Features
+
+* Add support for opening 'file:' URIs with parameters. [(#234)](https://github.com/dbcli/litecli/pull/234)
+
 ### Bug Fixes
 
 * Avoid Click 8.1.* to prevent messing up the pager when the PAGER env var has a string with spaces.

litecli/sqlexecute.py

@@ -17,6 +17,7 @@
 
 import sqlparse
 import os.path
+from urllib.parse import urlparse
 
 from .packages import special
 
@@ -75,20 +76,27 @@ def connect(self, database: str | None = None) -> None:
             # Nothing to connect to.
             return
 
-        db_name = os.path.expanduser(db)
-        db_dir_name = os.path.dirname(os.path.abspath(db_name))
-        if not os.path.exists(db_dir_name):
-            raise Exception("Path does not exist: {}".format(db_dir_name))
+        location = urlparse(db)
+        if location.scheme and location.scheme == "file":
+            uri = True
+            db_name = db
+            db_filename = location.path
+        else:
+            uri = False
+            db_filename = db_name = os.path.expanduser(db)
+            db_dir_name = os.path.dirname(os.path.abspath(db_filename))
+            if not os.path.exists(db_dir_name):
+                raise Exception("Path does not exist: {}".format(db_dir_name))
 
-        conn = sqlite3.connect(database=db_name, isolation_level=None)
+        conn = sqlite3.connect(database=db_name, isolation_level=None, uri=uri)
         conn.text_factory = lambda x: x.decode("utf-8", "backslashreplace")
         if self.conn:
             self.conn.close()
 
         self.conn = conn
         # Update them after the connection is made to ensure that it was a
         # successful connection.
-        self.dbname = db
+        self.dbname = db_filename
 
     def run(self, statement: str) -> Iterable[tuple]:
         """Execute the sql in the database and return the results. The results

tests/test_main.py

@@ -8,11 +8,12 @@
 from unittest.mock import patch
 
 import click
+import pytest
 from click.testing import CliRunner
 
 from litecli.main import cli, LiteCli
 from litecli.packages.special.main import COMMANDS as SPECIAL_COMMANDS
-from utils import dbtest, run
+from utils import dbtest, run, create_db, db_connection
 
 test_dir = os.path.abspath(os.path.dirname(__file__))
 project_dir = os.path.dirname(test_dir)
@@ -332,3 +333,30 @@ def test_get_prompt(mock_datetime):
     # 12. Windows path
     lc.connect("C:\\Users\\litecli\\litecli_test.db")
     assert lc.get_prompt(r"\d") == "C:\\Users\\litecli\\litecli_test.db"
+
+
+@pytest.mark.parametrize(
+    "uri, expected_dbname",
+    [
+        ("file:{tmp_path}/test.db", "{tmp_path}/test.db"),
+        ("file:{tmp_path}/test.db?mode=ro", "{tmp_path}/test.db"),
+        ("file:{tmp_path}/test.db?mode=ro&cache=shared", "{tmp_path}/test.db"),
+    ],
+)
+def test_file_uri(tmp_path, uri, expected_dbname):
+    """
+    Test that `file:` URIs are correctly handled
+    ref:
+        https://docs.python.org/3/library/sqlite3.html#sqlite3-uri-tricks
+        https://www.sqlite.org/c3ref/open.html#urifilenameexamples
+    """
+    # - ensure db exists
+    db_path = tmp_path / "test.db"
+    create_db(db_path)
+    db_connection(db_path)
+    uri = uri.format(tmp_path=tmp_path)
+
+    lc = LiteCli()
+    lc.connect(uri)
+
+    assert lc.get_prompt(r"\d") == expected_dbname.format(tmp_path=tmp_path)