fix: driver parameter normalization (#333)

Corrected a few issues with the driver normalization configs and functions.

Author: cofin

sqlspec/adapters/asyncmy/core.py

@@ -125,7 +125,7 @@ def build_profile() -> "DriverParameterProfile":
     return DriverParameterProfile(
         name="AsyncMy",
         default_style=ParameterStyle.QMARK,
-        supported_styles={ParameterStyle.QMARK, ParameterStyle.POSITIONAL_PYFORMAT},
+        supported_styles={ParameterStyle.QMARK},
         default_execution_style=ParameterStyle.POSITIONAL_PYFORMAT,
         supported_execution_styles={ParameterStyle.POSITIONAL_PYFORMAT},
         has_native_list_expansion=False,

sqlspec/adapters/asyncpg/core.py

@@ -121,7 +121,7 @@ def build_profile() -> "DriverParameterProfile":
     return DriverParameterProfile(
         name="AsyncPG",
         default_style=ParameterStyle.NUMERIC,
-        supported_styles={ParameterStyle.NUMERIC, ParameterStyle.POSITIONAL_PYFORMAT},
+        supported_styles={ParameterStyle.NUMERIC, ParameterStyle.NAMED_COLON},
         default_execution_style=ParameterStyle.NUMERIC,
         supported_execution_styles={ParameterStyle.NUMERIC},
         has_native_list_expansion=True,

sqlspec/adapters/bigquery/core.py

@@ -18,6 +18,7 @@
     ParameterProfile,
     ParameterStyle,
     StatementConfig,
+    build_null_pruning_transform,
     build_statement_config_from_profile,
 )
 from sqlspec.exceptions import (
@@ -612,6 +613,7 @@ def build_profile() -> "DriverParameterProfile":
             list: _identity,
             type(None): _return_none,
         },
+        default_ast_transformer=build_null_pruning_transform(dialect="bigquery"),
         extras={"json_tuple_strategy": "tuple", "type_coercion_overrides": {list: _identity, tuple: _tuple_to_list}},
         default_dialect="bigquery",
     )

sqlspec/adapters/duckdb/core.py

@@ -145,7 +145,7 @@ def build_profile() -> "DriverParameterProfile":
         default_style=ParameterStyle.QMARK,
         supported_styles={ParameterStyle.QMARK, ParameterStyle.NUMERIC, ParameterStyle.NAMED_DOLLAR},
         default_execution_style=ParameterStyle.QMARK,
-        supported_execution_styles={ParameterStyle.QMARK},
+        supported_execution_styles={ParameterStyle.QMARK, ParameterStyle.NUMERIC},
         has_native_list_expansion=True,
         preserve_parameter_format=True,
         needs_static_script_compilation=False,

sqlspec/adapters/mysqlconnector/core.py

@@ -108,7 +108,7 @@ def build_profile() -> "DriverParameterProfile":
     return DriverParameterProfile(
         name="mysql-connector",
         default_style=ParameterStyle.QMARK,
-        supported_styles={ParameterStyle.QMARK, ParameterStyle.POSITIONAL_PYFORMAT},
+        supported_styles={ParameterStyle.QMARK},
         default_execution_style=ParameterStyle.POSITIONAL_PYFORMAT,
         supported_execution_styles={ParameterStyle.POSITIONAL_PYFORMAT},
         has_native_list_expansion=False,

sqlspec/adapters/oracledb/core.py

@@ -531,8 +531,8 @@ def build_profile() -> "DriverParameterProfile":
     """Create the OracleDB driver parameter profile."""
     return DriverParameterProfile(
         name="OracleDB",
-        default_style=ParameterStyle.POSITIONAL_COLON,
-        supported_styles={ParameterStyle.NAMED_COLON, ParameterStyle.POSITIONAL_COLON, ParameterStyle.QMARK},
+        default_style=ParameterStyle.NAMED_COLON,
+        supported_styles={ParameterStyle.NAMED_COLON, ParameterStyle.NUMERIC, ParameterStyle.QMARK},
         default_execution_style=ParameterStyle.NAMED_COLON,
         supported_execution_styles={ParameterStyle.NAMED_COLON, ParameterStyle.POSITIONAL_COLON},
         has_native_list_expansion=False,

sqlspec/adapters/psycopg/core.py

@@ -160,13 +160,8 @@ def build_profile() -> "DriverParameterProfile":
 
     return DriverParameterProfile(
         name="Psycopg",
-        default_style=ParameterStyle.POSITIONAL_PYFORMAT,
-        supported_styles={
-            ParameterStyle.POSITIONAL_PYFORMAT,
-            ParameterStyle.NAMED_PYFORMAT,
-            ParameterStyle.NUMERIC,
-            ParameterStyle.QMARK,
-        },
+        default_style=ParameterStyle.NUMERIC,
+        supported_styles={ParameterStyle.NUMERIC, ParameterStyle.NAMED_COLON},
         default_execution_style=ParameterStyle.POSITIONAL_PYFORMAT,
         supported_execution_styles={ParameterStyle.POSITIONAL_PYFORMAT, ParameterStyle.NAMED_PYFORMAT},
         has_native_list_expansion=True,

sqlspec/adapters/pymysql/core.py

@@ -108,7 +108,7 @@ def build_profile() -> "DriverParameterProfile":
     return DriverParameterProfile(
         name="PyMySQL",
         default_style=ParameterStyle.QMARK,
-        supported_styles={ParameterStyle.QMARK, ParameterStyle.POSITIONAL_PYFORMAT},
+        supported_styles={ParameterStyle.QMARK},
         default_execution_style=ParameterStyle.POSITIONAL_PYFORMAT,
         supported_execution_styles={ParameterStyle.POSITIONAL_PYFORMAT},
         has_native_list_expansion=False,

sqlspec/adapters/spanner/config.py

@@ -272,6 +272,10 @@ def _create_pool(self) -> AbstractSessionPool:
     def _close_pool(self) -> None:
         if self.connection_instance and supports_close(self.connection_instance):
             self.connection_instance.close()
+        if self._client and supports_close(self._client):
+            self._client.close()
+        self._client = None
+        self._database = None
 
     def provide_connection(self, *args: Any, transaction: "bool" = False, **kwargs: Any) -> "SpannerConnectionContext":
         """Yield a Snapshot (default) or Transaction context from the configured pool.

sqlspec/core/parameters/_alignment.py

@@ -106,7 +106,17 @@ def collect_null_parameter_ordinals(parameters: Any, profile: "ParameterProfile"
 
 def _collect_expected_identifiers(parameter_profile: "ParameterProfile") -> "set[tuple[str, int | str]]":
     identifiers: set[tuple[str, int | str]] = set()
-    for parameter in parameter_profile.parameters:
+    parameters = parameter_profile.parameters
+    if not parameters:
+        return identifiers
+
+    # Check if we have mixed styles - if so, use ordinal-based counting for positional styles
+    styles = {p.style for p in parameters}
+    has_mixed_positional_styles = len(styles) > 1 and any(
+        s in styles for s in {ParameterStyle.QMARK, ParameterStyle.POSITIONAL_PYFORMAT}
+    )
+
+    for parameter in parameters:
         style = parameter.style
         name = parameter.name
         if style in {
@@ -117,7 +127,10 @@ def _collect_expected_identifiers(parameter_profile: "ParameterProfile") -> "set
         }:
             identifiers.add(("named", name or f"param_{parameter.ordinal}"))
         elif style in {ParameterStyle.NUMERIC, ParameterStyle.POSITIONAL_COLON}:
-            if name and name.isdigit():
+            # When mixed with ordinal styles (like QMARK), use ordinal instead of explicit index
+            if has_mixed_positional_styles:
+                identifiers.add(("index", parameter.ordinal))
+            elif name and name.isdigit():
                 identifiers.add(("index", int(name) - 1))
             else:
                 identifiers.add(("index", parameter.ordinal))