sqlspec 0.41.0__tar.gz → 0.41.1__tar.gz

{sqlspec-0.41.0 → sqlspec-0.41.1}/.pre-commit-config.yaml

@@ -17,7 +17,7 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.15.6"
+    rev: "v0.15.7"
     hooks:
       - id: ruff
         args: ["--fix"]

{sqlspec-0.41.0 → sqlspec-0.41.1}/Makefile

@@ -260,7 +260,7 @@ docs-serve: docs-clean                             ## Serve documentation locall
 .PHONY: docs
 docs: docs-clean                                   ## Build documentation
 	@echo "${INFO} Building documentation... 📝"
-	@PYTHONWARNINGS="ignore::FutureWarning" uv run sphinx-build -M html docs docs/_build/ -E -a -j 1 -W --keep-going
+	@PYTHONWARNINGS="ignore::FutureWarning" uv run sphinx-build -M html docs docs/_build/ -E -a -j 1 -W
 	@echo "${OK} Documentation built successfully"
 
 .PHONY: docs-linkcheck

{sqlspec-0.41.0 → sqlspec-0.41.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlspec
-Version: 0.41.0
+Version: 0.41.1
 Summary: SQL Experiments in Python
 Project-URL: Discord, https://discord.gg/litestar
 Project-URL: Issue, https://github.com/litestar-org/sqlspec/issues/

{sqlspec-0.41.0 → sqlspec-0.41.1}/pyproject.toml

@@ -24,7 +24,7 @@ maintainers = [{ name = "Litestar Developers", email = "hello@litestar.dev" }]
 name = "sqlspec"
 readme = "README.md"
 requires-python = ">=3.10, <4.0"
-version = "0.41.0"
+version = "0.41.1"
 
 [project.urls]
 Discord = "https://discord.gg/litestar"
@@ -250,7 +250,7 @@ opt_level = "3"   # Maximum optimization (0-3)
 allow_dirty = true
 commit = false
 commit_args = "--no-verify"
-current_version = "0.41.0"
+current_version = "0.41.1"
 ignore_missing_files = false
 ignore_missing_version = false
 message = "chore(release): bump to v{new_version}"

{sqlspec-0.41.0 → sqlspec-0.41.1}/sqlspec/storage/registry.py

@@ -113,7 +113,7 @@ class StorageRegistry:
             raise ImproperConfigurationError(msg)
 
         if isinstance(uri_or_alias, Path):
-            uri_or_alias = f"file://{uri_or_alias.resolve()}"
+            uri_or_alias = f"file://{uri_or_alias.parent}" if uri_or_alias.is_file() else f"file://{uri_or_alias}"
 
         cache_params = dict(kwargs)
         if backend:
@@ -125,7 +125,8 @@ class StorageRegistry:
         scheme = self._get_scheme(uri_or_alias)
         if not scheme and is_local_path(uri_or_alias):
             scheme = "file"
-            uri_or_alias = f"file://{uri_or_alias}"
+            local_path = Path(uri_or_alias)
+            uri_or_alias = f"file://{local_path.parent}" if local_path.is_file() else f"file://{uri_or_alias}"
 
         if scheme:
             instance = self._resolve_from_uri(uri_or_alias, backend_override=backend, **kwargs)

sqlspec-0.41.1/tests/unit/storage/test_registry_file_resolution.py

@@ -0,0 +1,82 @@
+"""Tests for StorageRegistry.get() file path resolution.
+
+Verifies fix for: LocalStore being rooted at a file path instead of its parent directory,
+and .resolve() causing symlink mismatches on macOS (/var vs /private/var).
+"""
+
+import tempfile
+from pathlib import Path
+
+from sqlspec import SQLSpec
+from sqlspec.storage.backends.obstore import ObStoreBackend
+
+
+class TestStorageRegistryFilePathResolution:
+    """Test that StorageRegistry.get() correctly roots LocalStore at the parent directory."""
+
+    def test_load_single_file_by_str_path(self) -> None:
+        """Loading a single SQL file by its string path should work."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            sql_file = Path(tmpdir) / "hello.sql"
+            sql_file.write_text("-- name: hello_world\nSELECT 1;\n")
+
+            s = SQLSpec()
+            s.load_sql_files(str(sql_file))
+
+            result = s.get_sql("hello_world")
+            assert result is not None
+            assert "SELECT 1" in str(result)
+
+    def test_load_single_file_by_path_object(self) -> None:
+        """Loading a single SQL file by Path object should work."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            sql_file = Path(tmpdir) / "hello.sql"
+            sql_file.write_text("-- name: hello_world\nSELECT 1;\n")
+
+            s = SQLSpec()
+            s.load_sql_files(sql_file)
+
+            result = s.get_sql("hello_world")
+            assert result is not None
+            assert "SELECT 1" in str(result)
+
+    def test_load_from_directory(self) -> None:
+        """Loading SQL files from a directory should work."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            sql_file = Path(tmpdir) / "hello.sql"
+            sql_file.write_text("-- name: hello_world\nSELECT 1;\n")
+
+            s = SQLSpec()
+            s.load_sql_files(tmpdir)
+
+            result = s.get_sql("hello_world")
+            assert result is not None
+            assert "SELECT 1" in str(result)
+
+    def test_load_multiple_files_from_directory(self) -> None:
+        """Loading multiple SQL files from a directory should find all queries."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            Path(tmpdir, "a.sql").write_text("-- name: query_a\nSELECT 'a';\n")
+            Path(tmpdir, "b.sql").write_text("-- name: query_b\nSELECT 'b';\n")
+
+            s = SQLSpec()
+            s.load_sql_files(tmpdir)
+
+            assert s.get_sql("query_a") is not None
+            assert s.get_sql("query_b") is not None
+
+    def test_file_and_directory_share_same_backend(self) -> None:
+        """A file path and its parent directory should resolve to a backend with the same store root."""
+        with tempfile.TemporaryDirectory() as tmpdir:
+            sql_file = Path(tmpdir) / "hello.sql"
+            sql_file.write_text("-- name: hello_world\nSELECT 1;\n")
+
+            s = SQLSpec()
+            loader = s._ensure_sql_loader()
+
+            backend_from_file = loader.storage_registry.get(str(sql_file))
+            backend_from_dir = loader.storage_registry.get(tmpdir)
+
+            assert isinstance(backend_from_file, ObStoreBackend)
+            assert isinstance(backend_from_dir, ObStoreBackend)
+            assert backend_from_file._local_store_root == backend_from_dir._local_store_root