Skip to content

feat: implement sqlglot query parsing #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cofin merged 2 commits into from
Apr 20, 2025
Merged

feat: implement sqlglot query parsing #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec5c45f
feat: move to sqlglot
cofin Apr 19, 2025
2e64179
fix: more
cofin Apr 20, 2025
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
275 changes: 155 additions & 120 deletions sqlspec/adapters/adbc/driver.py
View file
Open in desktop

Large diffs are not rendered by default.

67 changes: 28 additions & 39 deletions sqlspec/adapters/aiosqlite/driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class AiosqliteDriver(AsyncDriverAdapterProtocol["Connection"]):
"""SQLite Async Driver Adapter."""

connection: "Connection"
dialect: str = "sqlite"

def __init__(self, connection: "Connection") -> None:
self.connection = connection
Expand All @@ -33,50 +34,23 @@ async def _with_cursor(self, connection: "Connection") -> "AsyncGenerator[Cursor
finally:
await cursor.close()

def _process_sql_params(
self, sql: str, parameters: "Optional[StatementParameterType]" = None
) -> "tuple[str, Optional[Union[tuple[Any, ...], list[Any], dict[str, Any]]]]":
"""Process SQL query and parameters for DB-API execution.

Converts named parameters (:name) to positional parameters (?) for SQLite.

Args:
sql: The SQL query string.
parameters: The parameters for the query (dict, tuple, list, or None).

Returns:
A tuple containing the processed SQL string and the processed parameters.
"""
if not isinstance(parameters, dict) or not parameters:
# If parameters are not a dict, or empty dict, assume positional/no params
# Let the underlying driver handle tuples/lists directly
return sql, parameters

# Convert named parameters to positional parameters
processed_sql = sql
processed_params: list[Any] = []
for key, value in parameters.items():
# Replace :key with ? in the SQL
processed_sql = processed_sql.replace(f":{key}", "?")
processed_params.append(value)

return processed_sql, tuple(processed_params)

async def select(
self,
sql: str,
parameters: Optional["StatementParameterType"] = None,
/,
*,
connection: Optional["Connection"] = None,
schema_type: "Optional[type[ModelDTOT]]" = None,
**kwargs: Any,
) -> "list[Union[ModelDTOT, dict[str, Any]]]":
"""Fetch data from the database.

Returns:
List of row data as either model instances or dictionaries.
"""
connection = self._connection(connection)
sql, parameters = self._process_sql_params(sql, parameters)
sql, parameters = self._process_sql_params(sql, parameters, **kwargs)
async with self._with_cursor(connection) as cursor:
await cursor.execute(sql, parameters) # pyright: ignore[reportUnknownMemberType]
results = await cursor.fetchall() # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]
Expand All @@ -92,16 +66,18 @@ async def select_one(
sql: str,
parameters: Optional["StatementParameterType"] = None,
/,
*,
connection: Optional["Connection"] = None,
schema_type: "Optional[type[ModelDTOT]]" = None,
**kwargs: Any,
) -> "Union[ModelDTOT, dict[str, Any]]":
"""Fetch one row from the database.

Returns:
The first row of the query results.
"""
connection = self._connection(connection)
sql, parameters = self._process_sql_params(sql, parameters)
sql, parameters = self._process_sql_params(sql, parameters, **kwargs)
async with self._with_cursor(connection) as cursor:
await cursor.execute(sql, parameters) # pyright: ignore[reportUnknownMemberType]
result = await cursor.fetchone() # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]
Expand All @@ -116,16 +92,18 @@ async def select_one_or_none(
sql: str,
parameters: Optional["StatementParameterType"] = None,
/,
*,
connection: Optional["Connection"] = None,
schema_type: "Optional[type[ModelDTOT]]" = None,
**kwargs: Any,
) -> "Optional[Union[ModelDTOT, dict[str, Any]]]":
"""Fetch one row from the database.

Returns:
The first row of the query results.
"""
connection = self._connection(connection)
sql, parameters = self._process_sql_params(sql, parameters)
sql, parameters = self._process_sql_params(sql, parameters, **kwargs)
async with self._with_cursor(connection) as cursor:
await cursor.execute(sql, parameters) # pyright: ignore[reportUnknownMemberType]
result = await cursor.fetchone() # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType]
Expand All @@ -141,16 +119,18 @@ async def select_value(
sql: str,
parameters: "Optional[StatementParameterType]" = None,
/,
*,
connection: "Optional[Connection]" = None,
schema_type: "Optional[type[T]]" = None,
**kwargs: Any,
) -> "Union[T, Any]":
"""Fetch a single value from the database.

Returns:
The first value from the first row of results, or None if no results.
"""
connection = self._connection(connection)
sql, parameters = self._process_sql_params(sql, parameters)
sql, parameters = self._process_sql_params(sql, parameters, **kwargs)
async with self._with_cursor(connection) as cursor:
await cursor.execute(sql, parameters) # pyright: ignore[reportUnknownMemberType]
result = await cursor.fetchone() # pyright: ignore[reportUnknownMemberType]
Expand All @@ -164,17 +144,18 @@ async def select_value_or_none(
sql: str,
parameters: "Optional[StatementParameterType]" = None,
/,
*,
connection: "Optional[Connection]" = None,
schema_type: "Optional[type[T]]" = None,
**kwargs: Any,
) -> "Optional[Union[T, Any]]":
"""Fetch a single value from the database.

Returns:
The first value from the first row of results, or None if no results.
"""
connection = self._connection(connection)
sql, parameters = self._process_sql_params(sql, parameters)

sql, parameters = self._process_sql_params(sql, parameters, **kwargs)
async with self._with_cursor(connection) as cursor:
await cursor.execute(sql, parameters) # pyright: ignore[reportUnknownMemberType]
result = await cursor.fetchone() # pyright: ignore[reportUnknownMemberType]
Expand All @@ -189,15 +170,17 @@ async def insert_update_delete(
sql: str,
parameters: Optional["StatementParameterType"] = None,
/,
*,
connection: Optional["Connection"] = None,
**kwargs: Any,
) -> int:
"""Insert, update, or delete data from the database.

Returns:
Row count affected by the operation.
"""
connection = self._connection(connection)
sql, parameters = self._process_sql_params(sql, parameters)
sql, parameters = self._process_sql_params(sql, parameters, **kwargs)

async with self._with_cursor(connection) as cursor:
await cursor.execute(sql, parameters) # pyright: ignore[reportUnknownMemberType]
Expand All @@ -208,16 +191,18 @@ async def insert_update_delete_returning(
sql: str,
parameters: Optional["StatementParameterType"] = None,
/,
*,
connection: Optional["Connection"] = None,
schema_type: "Optional[type[ModelDTOT]]" = None,
**kwargs: Any,
) -> "Optional[Union[dict[str, Any], ModelDTOT]]":
"""Insert, update, or delete data from the database and return result.

Returns:
The first row of results.
"""
connection = self._connection(connection)
sql, parameters = self._process_sql_params(sql, parameters)
sql, parameters = self._process_sql_params(sql, parameters, **kwargs)

async with self._with_cursor(connection) as cursor:
await cursor.execute(sql, parameters) # pyright: ignore[reportUnknownMemberType]
Expand All @@ -234,15 +219,17 @@ async def execute_script(
sql: str,
parameters: Optional["StatementParameterType"] = None,
/,
*,
connection: Optional["Connection"] = None,
**kwargs: Any,
) -> str:
"""Execute a script.

Returns:
Status message for the operation.
"""
connection = self._connection(connection)
sql, parameters = self._process_sql_params(sql, parameters)
sql, parameters = self._process_sql_params(sql, parameters, **kwargs)

async with self._with_cursor(connection) as cursor:
await cursor.execute(sql, parameters) # pyright: ignore[reportUnknownMemberType]
Expand All @@ -253,16 +240,18 @@ async def execute_script_returning(
sql: str,
parameters: Optional["StatementParameterType"] = None,
/,
*,
connection: Optional["Connection"] = None,
schema_type: "Optional[type[ModelDTOT]]" = None,
**kwargs: Any,
) -> "Optional[Union[dict[str, Any], ModelDTOT]]":
"""Execute a script and return result.

Returns:
The first row of results.
"""
connection = self._connection(connection)
sql, parameters = self._process_sql_params(sql, parameters)
sql, parameters = self._process_sql_params(sql, parameters, **kwargs)

async with self._with_cursor(connection) as cursor:
await cursor.execute(sql, parameters) # pyright: ignore[reportUnknownMemberType]
Expand Down
Loading