sqlspec 0.11.1__py3-none-any.whl → 0.12.0__py3-none-any.whl

sqlspec/adapters/aiosqlite/__init__.py

@@ -1,8 +1,4 @@
-from sqlspec.adapters.aiosqlite.config import AiosqliteConfig
+from sqlspec.adapters.aiosqlite.config import CONNECTION_FIELDS, AiosqliteConfig
 from sqlspec.adapters.aiosqlite.driver import AiosqliteConnection, AiosqliteDriver
 
-__all__ = (
-    "AiosqliteConfig",
-    "AiosqliteConnection",
-    "AiosqliteDriver",
-)
+__all__ = ("CONNECTION_FIELDS", "AiosqliteConfig", "AiosqliteConnection", "AiosqliteDriver")

sqlspec/adapters/aiosqlite/config.py

@@ -1,87 +1,158 @@
+"""Aiosqlite database configuration with direct field-based configuration."""
+
+import logging
+from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
-from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Any, Optional, Union
+from dataclasses import replace
+from typing import TYPE_CHECKING, Any, ClassVar, Optional
 
 import aiosqlite
 
 from sqlspec.adapters.aiosqlite.driver import AiosqliteConnection, AiosqliteDriver
-from sqlspec.base import NoPoolAsyncConfig
+from sqlspec.config import AsyncDatabaseConfig
 from sqlspec.exceptions import ImproperConfigurationError
-from sqlspec.typing import Empty, EmptyType, dataclass_to_dict
+from sqlspec.statement.sql import SQLConfig
+from sqlspec.typing import DictRow, Empty
 
 if TYPE_CHECKING:
-    from collections.abc import AsyncGenerator
     from typing import Literal
 
+    from sqlglot.dialects.dialect import DialectType
+
 
-__all__ = ("AiosqliteConfig",)
+__all__ = ("CONNECTION_FIELDS", "AiosqliteConfig")
 
+logger = logging.getLogger(__name__)
 
-@dataclass
-class AiosqliteConfig(NoPoolAsyncConfig["AiosqliteConnection", "AiosqliteDriver"]):
-    """Configuration for Aiosqlite database connections.
+CONNECTION_FIELDS = frozenset(
+    {"database", "timeout", "detect_types", "isolation_level", "check_same_thread", "cached_statements", "uri"}
+)
 
-    This class provides configuration options for Aiosqlite database connections, wrapping all parameters
-    available to aiosqlite.connect().
 
-    For details see: https://github.com/omnilib/aiosqlite/blob/main/aiosqlite/__init__.pyi
+class AiosqliteConfig(AsyncDatabaseConfig[AiosqliteConnection, None, AiosqliteDriver]):
+    """Configuration for Aiosqlite database connections with direct field-based configuration.
+
+    Note: Aiosqlite doesn't support connection pooling, so pool_instance is always None.
     """
 
-    database: "Union[str, EmptyType]" = field(default=":memory:")
-    """The path to the database file to be opened. Pass ":memory:" to open a connection to a database that resides in RAM instead of on disk."""
-    timeout: "Union[float, EmptyType]" = field(default=Empty)
-    """How many seconds the connection should wait before raising an OperationalError when a table is locked. If another thread or process has acquired a shared lock, a wait for the specified timeout occurs."""
-    detect_types: "Union[int, EmptyType]" = field(default=Empty)
-    """Control whether and how data types are detected. It can be 0 (default) or a combination of PARSE_DECLTYPES and PARSE_COLNAMES."""
-    isolation_level: "Optional[Union[Literal['DEFERRED', 'IMMEDIATE', 'EXCLUSIVE'], EmptyType]]" = field(default=Empty)
-    """The isolation_level of the connection. This can be None for autocommit mode or one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE"."""
-    check_same_thread: "Union[bool, EmptyType]" = field(default=Empty)
-    """If True (default), ProgrammingError is raised if the database connection is used by a thread other than the one that created it. If False, the connection may be shared across multiple threads."""
-    cached_statements: "Union[int, EmptyType]" = field(default=Empty)
-    """The number of statements that SQLite will cache for this connection. The default is 128."""
-    uri: "Union[bool, EmptyType]" = field(default=Empty)
-    """If set to True, database is interpreted as a URI with supported options."""
-    connection_type: "type[AiosqliteConnection]" = field(init=False, default_factory=lambda: AiosqliteConnection)
-    """Type of the connection object"""
-    driver_type: "type[AiosqliteDriver]" = field(init=False, default_factory=lambda: AiosqliteDriver)  # type: ignore[type-abstract,unused-ignore]
-    """Type of the driver object"""
+    __slots__ = (
+        "_dialect",
+        "cached_statements",
+        "check_same_thread",
+        "database",
+        "default_row_type",
+        "detect_types",
+        "extras",
+        "isolation_level",
+        "pool_instance",
+        "statement_config",
+        "timeout",
+        "uri",
+    )
+
+    is_async: ClassVar[bool] = True
+    supports_connection_pooling: ClassVar[bool] = False
+
+    driver_type: type[AiosqliteDriver] = AiosqliteDriver
+    connection_type: type[AiosqliteConnection] = AiosqliteConnection
+
+    # Parameter style support information
+    supported_parameter_styles: ClassVar[tuple[str, ...]] = ("qmark", "named_colon")
+    """AIOSQLite supports ? (qmark) and :name (named_colon) parameter styles."""
+
+    preferred_parameter_style: ClassVar[str] = "qmark"
+    """AIOSQLite's native parameter style is ? (qmark)."""
+
+    def __init__(
+        self,
+        database: str = ":memory:",
+        statement_config: Optional[SQLConfig] = None,
+        default_row_type: type[DictRow] = DictRow,
+        # Connection parameters
+        timeout: Optional[float] = None,
+        detect_types: Optional[int] = None,
+        isolation_level: Optional["Optional[Literal['DEFERRED', 'IMMEDIATE', 'EXCLUSIVE']]"] = None,
+        check_same_thread: Optional[bool] = None,
+        cached_statements: Optional[int] = None,
+        uri: Optional[bool] = None,
+        **kwargs: Any,
+    ) -> None:
+        """Initialize Aiosqlite configuration.
+
+        Args:
+            database: The path to the database file to be opened. Pass ":memory:" for in-memory database
+            statement_config: Default SQL statement configuration
+            default_row_type: Default row type for results
+            timeout: How many seconds the connection should wait before raising an OperationalError when a table is locked
+            detect_types: Control whether and how data types are detected. It can be 0 (default) or a combination of PARSE_DECLTYPES and PARSE_COLNAMES
+            isolation_level: The isolation_level of the connection. This can be None for autocommit mode or one of "DEFERRED", "IMMEDIATE" or "EXCLUSIVE"
+            check_same_thread: If True (default), ProgrammingError is raised if the database connection is used by a thread other than the one that created it
+            cached_statements: The number of statements that SQLite will cache for this connection. The default is 128
+            uri: If set to True, database is interpreted as a URI with supported options
+            **kwargs: Additional parameters (stored in extras)
+        """
+        # Store connection parameters as instance attributes
+        self.database = database
+        self.timeout = timeout
+        self.detect_types = detect_types
+        self.isolation_level = isolation_level
+        self.check_same_thread = check_same_thread
+        self.cached_statements = cached_statements
+        self.uri = uri
+        self.extras = kwargs or {}
+        # Store other config
+        self.statement_config = statement_config or SQLConfig()
+        self.default_row_type = default_row_type
+        self._dialect: DialectType = None
+
+        super().__init__()
 
     @property
-    def connection_config_dict(self) -> "dict[str, Any]":
-        """Return the connection configuration as a dict.
+    def connection_config_dict(self) -> dict[str, Any]:
+        """Return the connection configuration as a dict for aiosqlite.connect()."""
+        # Gather non-None connection parameters
+        config = {
+            field: getattr(self, field)
+            for field in CONNECTION_FIELDS
+            if getattr(self, field, None) is not None and getattr(self, field) is not Empty
+        }
 
-        Returns:
-            A string keyed dict of config kwargs for the aiosqlite.connect() function.
-        """
-        return dataclass_to_dict(
-            self,
-            exclude_empty=True,
-            convert_nested=False,
-            exclude={"pool_instance", "connection_type", "driver_type"},
-        )
+        # Merge extras parameters
+        config.update(self.extras)
 
-    async def create_connection(self) -> "AiosqliteConnection":
-        """Create and return a new database connection.
+        return config
 
-        Returns:
-            A new Aiosqlite connection instance.
+    async def _create_pool(self) -> None:
+        """Aiosqlite doesn't support pooling."""
+        return
+
+    async def _close_pool(self) -> None:
+        """Aiosqlite doesn't support pooling."""
+        return
 
-        Raises:
-            ImproperConfigurationError: If the connection could not be established.
+    async def create_connection(self) -> AiosqliteConnection:
+        """Create a single async connection.
+
+        Returns:
+            An Aiosqlite connection instance.
         """
         try:
-            return await aiosqlite.connect(**self.connection_config_dict)
+            config = self.connection_config_dict
+            return await aiosqlite.connect(**config)
         except Exception as e:
             msg = f"Could not configure the Aiosqlite connection. Error: {e!s}"
             raise ImproperConfigurationError(msg) from e
 
     @asynccontextmanager
-    async def provide_connection(self, *args: "Any", **kwargs: "Any") -> "AsyncGenerator[AiosqliteConnection, None]":
-        """Create and provide a database connection.
+    async def provide_connection(self, *args: Any, **kwargs: Any) -> AsyncGenerator[AiosqliteConnection, None]:
+        """Provide an async connection context manager.
+
+        Args:
+            *args: Additional arguments.
+            **kwargs: Additional keyword arguments.
 
         Yields:
             An Aiosqlite connection instance.
-
         """
         connection = await self.create_connection()
         try:
@@ -90,13 +161,28 @@ class AiosqliteConfig(NoPoolAsyncConfig["AiosqliteConnection", "AiosqliteDriver"
             await connection.close()
 
     @asynccontextmanager
-    async def provide_session(self, *args: Any, **kwargs: Any) -> "AsyncGenerator[AiosqliteDriver, None]":
-        """Create and provide a database connection.
-
-        Yields:
-            A Aiosqlite driver instance.
+    async def provide_session(self, *args: Any, **kwargs: Any) -> AsyncGenerator[AiosqliteDriver, None]:
+        """Provide an async driver session context manager.
 
+        Args:
+            *args: Additional arguments.
+            **kwargs: Additional keyword arguments.
 
+        Yields:
+            An AiosqliteDriver instance.
         """
         async with self.provide_connection(*args, **kwargs) as connection:
-            yield self.driver_type(connection)
+            # Create statement config with parameter style info if not already set
+            statement_config = self.statement_config
+            if statement_config.allowed_parameter_styles is None:
+                statement_config = replace(
+                    statement_config,
+                    allowed_parameter_styles=self.supported_parameter_styles,
+                    target_parameter_style=self.preferred_parameter_style,
+                )
+
+            yield self.driver_type(connection=connection, config=statement_config)
+
+    async def provide_pool(self, *args: Any, **kwargs: Any) -> None:
+        """Aiosqlite doesn't support pooling."""
+        return