Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ extras = [
"adbc_driver_postgresql",
"adbc_driver_flightsql",
"adbc_driver_bigquery",
"dishka ; python_version >= \"3.10\"",
]
lint = [
"mypy>=1.13.0",
Expand Down Expand Up @@ -162,11 +163,11 @@ include = [
"sqlspec/loader.py", # Loader module

# === ADAPTER TYPE CONVERTERS ===
"sqlspec/adapters/adbc/type_converter.py", # ADBC type converter
"sqlspec/adapters/bigquery/type_converter.py", # BigQuery type converter
"sqlspec/adapters/duckdb/type_converter.py", # DuckDB type converter
"sqlspec/adapters/oracledb/type_converter.py", # Oracle type converter
"sqlspec/adapters/psqlpy/type_converter.py", # Psqlpy type converter
"sqlspec/adapters/adbc/type_converter.py", # ADBC type converter
"sqlspec/adapters/bigquery/type_converter.py", # BigQuery type converter
"sqlspec/adapters/duckdb/type_converter.py", # DuckDB type converter
"sqlspec/adapters/oracledb/type_converter.py", # Oracle type converter
"sqlspec/adapters/psqlpy/type_converter.py", # Psqlpy type converter

# === UTILITY MODULES ===
"sqlspec/utils/text.py", # Text utilities
Expand Down
3 changes: 3 additions & 0 deletions sqlspec/adapters/adbc/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ def __init__(
migration_config: Optional[dict[str, Any]] = None,
statement_config: Optional[StatementConfig] = None,
driver_features: Optional[dict[str, Any]] = None,
bind_key: Optional[str] = None,
) -> None:
"""Initialize configuration.

Expand All @@ -85,6 +86,7 @@ def __init__(
migration_config: Migration configuration
statement_config: Default SQL statement configuration
driver_features: Driver feature configuration
bind_key: Optional unique identifier for this configuration
"""
if connection_config is None:
connection_config = {}
Expand All @@ -104,6 +106,7 @@ def __init__(
migration_config=migration_config,
statement_config=statement_config,
driver_features=driver_features or {},
bind_key=bind_key,
)

def _resolve_driver_name(self) -> str:
Expand Down
3 changes: 3 additions & 0 deletions sqlspec/adapters/aiosqlite/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ def __init__(
migration_config: "Optional[dict[str, Any]]" = None,
statement_config: "Optional[StatementConfig]" = None,
driver_features: "Optional[dict[str, Any]]" = None,
bind_key: "Optional[str]" = None,
) -> None:
"""Initialize AioSQLite configuration.

Expand All @@ -71,6 +72,7 @@ def __init__(
migration_config: Optional migration configuration.
statement_config: Optional statement configuration.
driver_features: Optional driver feature configuration.
bind_key: Optional unique identifier for this configuration.
"""
config_dict = dict(pool_config) if pool_config else {}

Expand All @@ -84,6 +86,7 @@ def __init__(
migration_config=migration_config,
statement_config=statement_config or aiosqlite_statement_config,
driver_features=driver_features or {},
bind_key=bind_key,
)

def _get_pool_config_dict(self) -> "dict[str, Any]":
Expand Down
3 changes: 3 additions & 0 deletions sqlspec/adapters/asyncmy/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ def __init__(
migration_config: Optional[dict[str, Any]] = None,
statement_config: "Optional[StatementConfig]" = None,
driver_features: "Optional[dict[str, Any]]" = None,
bind_key: "Optional[str]" = None,
) -> None:
"""Initialize Asyncmy configuration.

Expand All @@ -80,6 +81,7 @@ def __init__(
migration_config: Migration configuration
statement_config: Statement configuration override
driver_features: Driver feature configuration
bind_key: Optional unique identifier for this configuration
"""
processed_pool_config: dict[str, Any] = dict(pool_config) if pool_config else {}
if "extra" in processed_pool_config:
Expand All @@ -100,6 +102,7 @@ def __init__(
migration_config=migration_config,
statement_config=statement_config,
driver_features=driver_features or {},
bind_key=bind_key,
)

async def _create_pool(self) -> "AsyncmyPool": # pyright: ignore
Expand Down
4 changes: 2 additions & 2 deletions sqlspec/adapters/asyncmy/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
from typing import TYPE_CHECKING, Any, Optional, Union

import asyncmy
import asyncmy.errors
from asyncmy.cursors import Cursor, DictCursor
import asyncmy.errors # pyright: ignore
from asyncmy.cursors import Cursor, DictCursor # pyright: ignore

from sqlspec.core.cache import get_cache_config
from sqlspec.core.parameters import ParameterStyle, ParameterStyleConfig
Expand Down
3 changes: 3 additions & 0 deletions sqlspec/adapters/asyncpg/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ def __init__(
migration_config: "Optional[dict[str, Any]]" = None,
statement_config: "Optional[StatementConfig]" = None,
driver_features: "Optional[Union[AsyncpgDriverFeatures, dict[str, Any]]]" = None,
bind_key: "Optional[str]" = None,
) -> None:
"""Initialize AsyncPG configuration.

Expand All @@ -93,6 +94,7 @@ def __init__(
migration_config: Migration configuration
statement_config: Statement configuration override
driver_features: Driver features configuration (TypedDict or dict)
bind_key: Optional unique identifier for this configuration
"""
features_dict: dict[str, Any] = dict(driver_features) if driver_features else {}

Expand All @@ -106,6 +108,7 @@ def __init__(
migration_config=migration_config,
statement_config=statement_config or asyncpg_statement_config,
driver_features=features_dict,
bind_key=bind_key,
)

def _get_pool_config_dict(self) -> "dict[str, Any]":
Expand Down
3 changes: 3 additions & 0 deletions sqlspec/adapters/bigquery/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ def __init__(
migration_config: Optional[dict[str, Any]] = None,
statement_config: "Optional[StatementConfig]" = None,
driver_features: "Optional[Union[BigQueryDriverFeatures, dict[str, Any]]]" = None,
bind_key: "Optional[str]" = None,
) -> None:
"""Initialize BigQuery configuration.

Expand All @@ -102,6 +103,7 @@ def __init__(
migration_config: Migration configuration
statement_config: Statement configuration override
driver_features: BigQuery-specific driver features
bind_key: Optional unique identifier for this configuration
"""

self.connection_config: dict[str, Any] = dict(connection_config) if connection_config else {}
Expand All @@ -124,6 +126,7 @@ def __init__(
migration_config=migration_config,
statement_config=statement_config,
driver_features=self.driver_features,
bind_key=bind_key,
)

def _setup_default_job_config(self) -> None:
Expand Down
2 changes: 2 additions & 0 deletions sqlspec/adapters/duckdb/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ def __init__(
migration_config: Optional[dict[str, Any]] = None,
statement_config: "Optional[StatementConfig]" = None,
driver_features: "Optional[Union[DuckDBDriverFeatures, dict[str, Any]]]" = None,
bind_key: "Optional[str]" = None,
) -> None:
"""Initialize DuckDB configuration."""
if pool_config is None:
Expand All @@ -160,6 +161,7 @@ def __init__(
pool_config["database"] = ":memory:shared_db"

super().__init__(
bind_key=bind_key,
pool_config=dict(pool_config),
pool_instance=pool_instance,
migration_config=migration_config,
Expand Down
6 changes: 6 additions & 0 deletions sqlspec/adapters/oracledb/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ def __init__(
migration_config: Optional[dict[str, Any]] = None,
statement_config: "Optional[StatementConfig]" = None,
driver_features: "Optional[dict[str, Any]]" = None,
bind_key: "Optional[str]" = None,
) -> None:
"""Initialize Oracle synchronous configuration.

Expand All @@ -103,6 +104,7 @@ def __init__(
migration_config: Migration configuration
statement_config: Default SQL statement configuration
driver_features: Optional driver feature configuration
bind_key: Optional unique identifier for this configuration
"""

processed_pool_config: dict[str, Any] = dict(pool_config) if pool_config else {}
Expand All @@ -116,6 +118,7 @@ def __init__(
migration_config=migration_config,
statement_config=statement_config,
driver_features=driver_features or {},
bind_key=bind_key,
)

def _create_pool(self) -> "OracleSyncConnectionPool":
Expand Down Expand Up @@ -220,6 +223,7 @@ def __init__(
migration_config: Optional[dict[str, Any]] = None,
statement_config: "Optional[StatementConfig]" = None,
driver_features: "Optional[dict[str, Any]]" = None,
bind_key: "Optional[str]" = None,
) -> None:
"""Initialize Oracle asynchronous configuration.

Expand All @@ -229,6 +233,7 @@ def __init__(
migration_config: Migration configuration
statement_config: Default SQL statement configuration
driver_features: Optional driver feature configuration
bind_key: Optional unique identifier for this configuration
"""

processed_pool_config: dict[str, Any] = dict(pool_config) if pool_config else {}
Expand All @@ -242,6 +247,7 @@ def __init__(
migration_config=migration_config,
statement_config=statement_config or oracledb_statement_config,
driver_features=driver_features or {},
bind_key=bind_key,
)

async def _create_pool(self) -> "OracleAsyncConnectionPool":
Expand Down
3 changes: 3 additions & 0 deletions sqlspec/adapters/psqlpy/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def __init__(
migration_config: Optional[dict[str, Any]] = None,
statement_config: Optional[StatementConfig] = None,
driver_features: Optional[dict[str, Any]] = None,
bind_key: Optional[str] = None,
) -> None:
"""Initialize Psqlpy configuration.

Expand All @@ -99,6 +100,7 @@ def __init__(
migration_config: Migration configuration
statement_config: SQL statement configuration
driver_features: Driver feature configuration
bind_key: Optional unique identifier for this configuration
"""
processed_pool_config: dict[str, Any] = dict(pool_config) if pool_config else {}
if "extra" in processed_pool_config:
Expand All @@ -110,6 +112,7 @@ def __init__(
migration_config=migration_config,
statement_config=statement_config or psqlpy_statement_config,
driver_features=driver_features or {},
bind_key=bind_key,
)

def _get_pool_config_dict(self) -> dict[str, Any]:
Expand Down
6 changes: 6 additions & 0 deletions sqlspec/adapters/psycopg/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ def __init__(
migration_config: Optional[dict[str, Any]] = None,
statement_config: "Optional[StatementConfig]" = None,
driver_features: "Optional[dict[str, Any]]" = None,
bind_key: "Optional[str]" = None,
) -> None:
"""Initialize Psycopg synchronous configuration.

Expand All @@ -97,6 +98,7 @@ def __init__(
migration_config: Migration configuration
statement_config: Default SQL statement configuration
driver_features: Optional driver feature configuration
bind_key: Optional unique identifier for this configuration
"""
processed_pool_config: dict[str, Any] = dict(pool_config) if pool_config else {}
if "extra" in processed_pool_config:
Expand All @@ -109,6 +111,7 @@ def __init__(
migration_config=migration_config,
statement_config=statement_config or psycopg_statement_config,
driver_features=driver_features or {},
bind_key=bind_key,
)

def _create_pool(self) -> "ConnectionPool":
Expand Down Expand Up @@ -270,6 +273,7 @@ def __init__(
migration_config: "Optional[dict[str, Any]]" = None,
statement_config: "Optional[StatementConfig]" = None,
driver_features: "Optional[dict[str, Any]]" = None,
bind_key: "Optional[str]" = None,
) -> None:
"""Initialize Psycopg asynchronous configuration.

Expand All @@ -279,6 +283,7 @@ def __init__(
migration_config: Migration configuration
statement_config: Default SQL statement configuration
driver_features: Optional driver feature configuration
bind_key: Optional unique identifier for this configuration
"""
processed_pool_config: dict[str, Any] = dict(pool_config) if pool_config else {}
if "extra" in processed_pool_config:
Expand All @@ -291,6 +296,7 @@ def __init__(
migration_config=migration_config,
statement_config=statement_config or psycopg_statement_config,
driver_features=driver_features or {},
bind_key=bind_key,
)

async def _create_pool(self) -> "AsyncConnectionPool":
Expand Down
3 changes: 3 additions & 0 deletions sqlspec/adapters/sqlite/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ def __init__(
migration_config: "Optional[dict[str, Any]]" = None,
statement_config: "Optional[StatementConfig]" = None,
driver_features: "Optional[dict[str, Any]]" = None,
bind_key: "Optional[str]" = None,
) -> None:
"""Initialize SQLite configuration.

Expand All @@ -56,6 +57,7 @@ def __init__(
migration_config: Migration configuration
statement_config: Default SQL statement configuration
driver_features: Optional driver feature configuration
bind_key: Optional bind key for the configuration
"""
if pool_config is None:
pool_config = {}
Expand All @@ -64,6 +66,7 @@ def __init__(
pool_config["uri"] = True

super().__init__(
bind_key=bind_key,
pool_instance=pool_instance,
pool_config=cast("dict[str, Any]", pool_config),
migration_config=migration_config,
Expand Down
Loading