sqlspec 0.15.0__py3-none-any.whl → 0.16.1__py3-none-any.whl

sqlspec/core/statement.py

@@ -220,13 +220,20 @@ class SQL:
         if "is_script" in kwargs:
             self._is_script = bool(kwargs.pop("is_script"))
 
-        filters = [p for p in parameters if is_statement_filter(p)]
-        actual_params = [p for p in parameters if not is_statement_filter(p)]
+        # Optimize parameter filtering with direct iteration
+        filters: list[StatementFilter] = []
+        actual_params: list[Any] = []
+        for p in parameters:
+            if is_statement_filter(p):
+                filters.append(p)
+            else:
+                actual_params.append(p)
 
         self._filters.extend(filters)
 
         if actual_params:
-            if len(actual_params) == 1:
+            param_count = len(actual_params)
+            if param_count == 1:
                 param = actual_params[0]
                 if isinstance(param, dict):
                     self._named_parameters.update(param)
@@ -339,10 +346,11 @@ class SQL:
         """Explicitly compile the SQL statement."""
         if self._processed_state is Empty:
             try:
-                current_parameters = self._named_parameters or self._positional_parameters
+                # Avoid unnecessary variable assignment
                 processor = SQLProcessor(self._statement_config)
-
-                compiled_result = processor.compile(self._raw_sql, current_parameters, is_many=self._is_many)
+                compiled_result = processor.compile(
+                    self._raw_sql, self._named_parameters or self._positional_parameters, is_many=self._is_many
+                )
 
                 self._processed_state = ProcessedState(
                     compiled_sql=compiled_result.compiled_sql,
@@ -368,6 +376,10 @@ class SQL:
         new_sql = SQL(
             self._raw_sql, *self._original_parameters, statement_config=self._statement_config, is_many=self._is_many
         )
+        # Preserve accumulated parameters when marking as script
+        new_sql._named_parameters.update(self._named_parameters)
+        new_sql._positional_parameters = self._positional_parameters.copy()
+        new_sql._filters = self._filters.copy()
         new_sql._is_script = True
         return new_sql
 
@@ -375,13 +387,19 @@ class SQL:
         self, statement: "Optional[Union[str, exp.Expression]]" = None, parameters: Optional[Any] = None, **kwargs: Any
     ) -> "SQL":
         """Create copy with modifications."""
-        return SQL(
+        new_sql = SQL(
             statement or self._raw_sql,
             *(parameters if parameters is not None else self._original_parameters),
             statement_config=self._statement_config,
             is_many=self._is_many,
             **kwargs,
         )
+        # Only preserve accumulated parameters when no explicit parameters are provided
+        if parameters is None:
+            new_sql._named_parameters.update(self._named_parameters)
+            new_sql._positional_parameters = self._positional_parameters.copy()
+        new_sql._filters = self._filters.copy()
+        return new_sql
 
     def add_named_parameter(self, name: str, value: Any) -> "SQL":
         """Add a named parameter and return a new SQL instance.
@@ -411,6 +429,7 @@ class SQL:
         Returns:
             New SQL instance with the WHERE condition applied
         """
+        # Parse current SQL with copy=False optimization
         current_expr = None
         with contextlib.suppress(ParseError):
             current_expr = sqlglot.parse_one(self._raw_sql, dialect=self._dialect)
@@ -419,8 +438,11 @@ class SQL:
             try:
                 current_expr = sqlglot.parse_one(self._raw_sql, dialect=self._dialect)
             except ParseError:
-                current_expr = sqlglot.parse_one(f"SELECT * FROM ({self._raw_sql}) AS subquery", dialect=self._dialect)
+                # Use f-string optimization and copy=False
+                subquery_sql = f"SELECT * FROM ({self._raw_sql}) AS subquery"
+                current_expr = sqlglot.parse_one(subquery_sql, dialect=self._dialect)
 
+        # Parse condition with copy=False optimization
         condition_expr: exp.Expression
         if isinstance(condition, str):
             try:
@@ -430,29 +452,32 @@ class SQL:
         else:
             condition_expr = condition
 
+        # Apply WHERE clause
         if isinstance(current_expr, exp.Select) or supports_where(current_expr):
-            new_expr = current_expr.where(condition_expr)
+            new_expr = current_expr.where(condition_expr, copy=False)
         else:
-            new_expr = exp.Select().from_(current_expr).where(condition_expr)
+            new_expr = exp.Select().from_(current_expr).where(condition_expr, copy=False)
 
+        # Generate SQL and create new instance
         new_sql_text = new_expr.sql(dialect=self._dialect)
-
-        return SQL(
+        new_sql = SQL(
             new_sql_text, *self._original_parameters, statement_config=self._statement_config, is_many=self._is_many
         )
 
+        # Preserve state efficiently
+        new_sql._named_parameters.update(self._named_parameters)
+        new_sql._positional_parameters = self._positional_parameters.copy()
+        new_sql._filters = self._filters.copy()
+        return new_sql
+
     def __hash__(self) -> int:
-        """Hash value."""
+        """Hash value with optimized computation."""
         if self._hash is None:
-            self._hash = hash(
-                (
-                    self._raw_sql,
-                    tuple(self._positional_parameters),
-                    tuple(sorted(self._named_parameters.items())),
-                    self._is_many,
-                    self._is_script,
-                )
-            )
+            # Pre-compute tuple components to avoid multiple tuple() calls
+            positional_tuple = tuple(self._positional_parameters)
+            named_tuple = tuple(sorted(self._named_parameters.items())) if self._named_parameters else ()
+
+            self._hash = hash((self._raw_sql, positional_tuple, named_tuple, self._is_many, self._is_script))
         return self._hash
 
     def __eq__(self, other: object) -> bool:

sqlspec/driver/_async.py

@@ -5,7 +5,7 @@ including connection management, transaction support, and result processing.
 """
 
 from abc import abstractmethod
-from typing import TYPE_CHECKING, Any, Optional, Union, cast, overload
+from typing import TYPE_CHECKING, Any, Final, NoReturn, Optional, Union, cast, overload
 
 from sqlspec.core import SQL, Statement
 from sqlspec.driver._common import CommonDriverAttributesMixin, ExecutionResult
@@ -20,14 +20,15 @@ if TYPE_CHECKING:
 
     from sqlspec.builder import QueryBuilder
     from sqlspec.core import SQLResult, StatementConfig, StatementFilter
-    from sqlspec.typing import ModelDTOT, ModelT, RowT, StatementParameters
+    from sqlspec.typing import ModelDTOT, StatementParameters
 
-logger = get_logger("sqlspec")
+_LOGGER_NAME: Final[str] = "sqlspec"
+logger = get_logger(_LOGGER_NAME)
 
 __all__ = ("AsyncDriverAdapterBase",)
 
 
-EMPTY_FILTERS: "list[StatementFilter]" = []
+EMPTY_FILTERS: Final["list[StatementFilter]"] = []
 
 
 class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, ToSchemaMixin):
@@ -128,12 +129,16 @@ class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, To
         sql, prepared_parameters = self._get_compiled_sql(statement, self.statement_config)
         statements = self.split_script_statements(sql, self.statement_config, strip_trailing_semicolon=True)
 
+        statement_count: int = len(statements)
+        successful_count: int = 0
+
         for stmt in statements:
             single_stmt = statement.copy(statement=stmt, parameters=prepared_parameters)
             await self._execute_statement(cursor, single_stmt)
+            successful_count += 1
 
         return self.create_execution_result(
-            cursor, statement_count=len(statements), successful_statements=len(statements), is_script_result=True
+            cursor, statement_count=statement_count, successful_statements=successful_count, is_script_result=True
         )
 
     @abstractmethod
@@ -214,8 +219,8 @@ class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, To
         By default, validates each statement and logs warnings for dangerous
         operations. Use suppress_warnings=True for migrations and admin scripts.
         """
-        script_config = statement_config or self.statement_config
-        sql_statement = self.prepare_statement(statement, parameters, statement_config=script_config, kwargs=kwargs)
+        config = statement_config or self.statement_config
+        sql_statement = self.prepare_statement(statement, parameters, statement_config=config, kwargs=kwargs)
 
         return await self.dispatch_statement_execution(statement=sql_statement.as_script(), connection=self.connection)
 
@@ -239,7 +244,7 @@ class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, To
         schema_type: None = None,
         statement_config: "Optional[StatementConfig]" = None,
         **kwargs: Any,
-    ) -> "Union[ModelT, RowT, dict[str, Any]]": ...  # pyright: ignore[reportInvalidTypeVarUse]
+    ) -> "dict[str, Any]": ...
 
     async def select_one(
         self,
@@ -249,23 +254,20 @@ class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, To
         schema_type: "Optional[type[ModelDTOT]]" = None,
         statement_config: "Optional[StatementConfig]" = None,
         **kwargs: Any,
-    ) -> "Union[ModelT, RowT,ModelDTOT]":  # pyright: ignore[reportInvalidTypeVarUse]
+    ) -> "Union[dict[str, Any], ModelDTOT]":
         """Execute a select statement and return exactly one row.
 
         Raises an exception if no rows or more than one row is returned.
         """
         result = await self.execute(statement, *parameters, statement_config=statement_config, **kwargs)
         data = result.get_data()
-        if not data:
-            msg = "No rows found"
-            raise NotFoundError(msg)
-        if len(data) > 1:
-            msg = f"Expected exactly one row, found {len(data)}"
-            raise ValueError(msg)
-        return cast(
-            "Union[ModelT, RowT, ModelDTOT]",
-            self.to_schema(data[0], schema_type=schema_type) if schema_type else data[0],
-        )
+        data_len: int = len(data)
+        if data_len == 0:
+            self._raise_no_rows_found()
+        if data_len > 1:
+            self._raise_expected_one_row(data_len)
+        first_row = data[0]
+        return self.to_schema(first_row, schema_type=schema_type) if schema_type else first_row
 
     @overload
     async def select_one_or_none(
@@ -287,7 +289,7 @@ class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, To
         schema_type: None = None,
         statement_config: "Optional[StatementConfig]" = None,
         **kwargs: Any,
-    ) -> "Optional[ModelT]": ...  # pyright: ignore[reportInvalidTypeVarUse]
+    ) -> "Optional[dict[str, Any]]": ...
 
     async def select_one_or_none(
         self,
@@ -297,7 +299,7 @@ class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, To
         schema_type: "Optional[type[ModelDTOT]]" = None,
         statement_config: "Optional[StatementConfig]" = None,
         **kwargs: Any,
-    ) -> "Optional[Union[ModelT, ModelDTOT]]":  # pyright: ignore[reportInvalidTypeVarUse]
+    ) -> "Optional[Union[dict[str, Any], ModelDTOT]]":
         """Execute a select statement and return at most one row.
 
         Returns None if no rows are found.
@@ -305,12 +307,16 @@ class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, To
         """
         result = await self.execute(statement, *parameters, statement_config=statement_config, **kwargs)
         data = result.get_data()
-        if not data:
+        data_len: int = len(data)
+        if data_len == 0:
             return None
-        if len(data) > 1:
-            msg = f"Expected at most one row, found {len(data)}"
-            raise ValueError(msg)
-        return cast("Optional[Union[ModelT, ModelDTOT]]", self.to_schema(data[0], schema_type=schema_type))
+        if data_len > 1:
+            self._raise_expected_at_most_one_row(data_len)
+        first_row = data[0]
+        return cast(
+            "Optional[Union[dict[str, Any], ModelDTOT]]",
+            self.to_schema(first_row, schema_type=schema_type) if schema_type else first_row,
+        )
 
     @overload
     async def select(
@@ -332,7 +338,8 @@ class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, To
         schema_type: None = None,
         statement_config: "Optional[StatementConfig]" = None,
         **kwargs: Any,
-    ) -> "list[ModelT]": ...  # pyright: ignore[reportInvalidTypeVarUse]
+    ) -> "list[dict[str, Any]]": ...
+
     async def select(
         self,
         statement: "Union[Statement, QueryBuilder]",
@@ -341,12 +348,11 @@ class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, To
         schema_type: "Optional[type[ModelDTOT]]" = None,
         statement_config: "Optional[StatementConfig]" = None,
         **kwargs: Any,
-    ) -> "Union[list[ModelT], list[ModelDTOT]]":  # pyright: ignore[reportInvalidTypeVarUse]
+    ) -> "Union[list[dict[str, Any]], list[ModelDTOT]]":
         """Execute a select statement and return all rows."""
         result = await self.execute(statement, *parameters, statement_config=statement_config, **kwargs)
         return cast(
-            "Union[list[ModelT], list[ModelDTOT]]",
-            self.to_schema(cast("list[ModelT]", result.get_data()), schema_type=schema_type),
+            "Union[list[dict[str, Any]], list[ModelDTOT]]", self.to_schema(result.get_data(), schema_type=schema_type)
         )
 
     async def select_value(
@@ -366,23 +372,19 @@ class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, To
         try:
             row = result.one()
         except ValueError as e:
-            msg = "No rows found"
-            raise NotFoundError(msg) from e
+            self._raise_no_rows_found_from_exception(e)
         if not row:
-            msg = "No rows found"
-            raise NotFoundError(msg)
+            self._raise_no_rows_found()
         if is_dict_row(row):
             if not row:
-                msg = "Row has no columns"
-                raise ValueError(msg)
+                self._raise_row_no_columns()
             return next(iter(row.values()))
         if is_indexable_row(row):
             if not row:
-                msg = "Row has no columns"
-                raise ValueError(msg)
+                self._raise_row_no_columns()
             return row[0]
-        msg = f"Unexpected row type: {type(row)}"
-        raise ValueError(msg)
+        self._raise_unexpected_row_type(type(row))
+        return None
 
     async def select_value_or_none(
         self,
@@ -400,11 +402,11 @@ class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, To
         """
         result = await self.execute(statement, *parameters, statement_config=statement_config, **kwargs)
         data = result.get_data()
-        if not data:
+        data_len: int = len(data)
+        if data_len == 0:
             return None
-        if len(data) > 1:
-            msg = f"Expected at most one row, found {len(data)}"
-            raise ValueError(msg)
+        if data_len > 1:
+            self._raise_expected_at_most_one_row(data_len)
         row = data[0]
         if is_dict_row(row):
             if not row:
@@ -412,8 +414,8 @@ class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, To
             return next(iter(row.values()))
         if is_indexable_row(row):
             return row[0]
-        msg = f"Cannot extract value from row type {type(row).__name__}"
-        raise TypeError(msg)
+        self._raise_cannot_extract_value_from_row_type(type(row).__name__)
+        return None
 
     @overload
     async def select_with_total(
@@ -470,3 +472,31 @@ class AsyncDriverAdapterBase(CommonDriverAttributesMixin, SQLTranslatorMixin, To
         select_result = await self.execute(sql_statement)
 
         return (self.to_schema(select_result.get_data(), schema_type=schema_type), count_result.scalar())
+
+    def _raise_no_rows_found(self) -> NoReturn:
+        msg = "No rows found"
+        raise NotFoundError(msg)
+
+    def _raise_no_rows_found_from_exception(self, e: ValueError) -> NoReturn:
+        msg = "No rows found"
+        raise NotFoundError(msg) from e
+
+    def _raise_expected_one_row(self, data_len: int) -> NoReturn:
+        msg = f"Expected exactly one row, found {data_len}"
+        raise ValueError(msg)
+
+    def _raise_expected_at_most_one_row(self, data_len: int) -> NoReturn:
+        msg = f"Expected at most one row, found {data_len}"
+        raise ValueError(msg)
+
+    def _raise_row_no_columns(self) -> NoReturn:
+        msg = "Row has no columns"
+        raise ValueError(msg)
+
+    def _raise_unexpected_row_type(self, row_type: type) -> NoReturn:
+        msg = f"Unexpected row type: {row_type}"
+        raise ValueError(msg)
+
+    def _raise_cannot_extract_value_from_row_type(self, type_name: str) -> NoReturn:
+        msg = f"Cannot extract value from row type {type_name}"
+        raise TypeError(msg)

sqlspec/driver/_common.py

@@ -17,7 +17,9 @@ from sqlspec.exceptions import ImproperConfigurationError
 from sqlspec.utils.logging import get_logger
 
 if TYPE_CHECKING:
-    from sqlspec.core.filters import StatementFilter
+    from collections.abc import Sequence
+
+    from sqlspec.core.filters import FilterTypeT, StatementFilter
     from sqlspec.typing import StatementParameters
 
 
@@ -424,10 +426,9 @@ class CommonDriverAttributesMixin:
         if isinstance(parameters, dict):
             if not parameters:
                 return []
-            if (
-                statement_config.parameter_config.supported_execution_parameter_styles
-                and ParameterStyle.NAMED_PYFORMAT
-                in statement_config.parameter_config.supported_execution_parameter_styles
+            if statement_config.parameter_config.supported_execution_parameter_styles and (
+                ParameterStyle.NAMED_PYFORMAT in statement_config.parameter_config.supported_execution_parameter_styles
+                or ParameterStyle.NAMED_COLON in statement_config.parameter_config.supported_execution_parameter_styles
             ):
                 return {k: apply_type_coercion(v) for k, v in parameters.items()}
             if statement_config.parameter_config.default_parameter_style in {
@@ -577,6 +578,24 @@ class CommonDriverAttributesMixin:
 
         return max(style_counts.keys(), key=lambda style: (style_counts[style], -precedence.get(style, 99)))
 
+    @staticmethod
+    def find_filter(
+        filter_type: "type[FilterTypeT]",
+        filters: "Sequence[StatementFilter | StatementParameters] | Sequence[StatementFilter]",
+    ) -> "FilterTypeT | None":
+        """Get the filter specified by filter type from the filters.
+
+        Args:
+            filter_type: The type of filter to find.
+            filters: filter types to apply to the query
+
+        Returns:
+            The match filter instance or None
+        """
+        return next(
+            (cast("FilterTypeT | None", filter_) for filter_ in filters if isinstance(filter_, filter_type)), None
+        )
+
     def _create_count_query(self, original_sql: "SQL") -> "SQL":
         """Create a COUNT query from the original SQL statement.
 
@@ -586,7 +605,7 @@ class CommonDriverAttributesMixin:
         if not original_sql.expression:
             msg = "Cannot create COUNT query from empty SQL expression"
             raise ImproperConfigurationError(msg)
-        expr = original_sql.expression.copy()
+        expr = original_sql.expression
 
         if isinstance(expr, exp.Select):
             if expr.args.get("group"):