sqlspec 0.11.1__tar.gz → 0.16.2__tar.gz

{sqlspec-0.11.1 → sqlspec-0.16.2}/.gitignore

@@ -17,7 +17,9 @@ site/
 target/
 .idea/
 .vscode/
+.claude/
 .cursor/
+.zed/
 
 # files
 **/*.so
@@ -31,3 +33,31 @@ target/
 /docs/_build/
 coverage.*
 setup.py
+tmp/
+*.log
+.bugs
+.tmp
+.todos
+todo/
+CLAUDE.md
+CLAUDE.*.md
+TODO*
+.claudedocs
+.env
+GEMINI.md
+GEMINI.*.md
+.cursor/
+.cursorrules
+CLAUDE*.md
+*CLAUDE*.md
+requirements/*
+tools/*.json
+benchmarks/
+.benchmark
+*.db
+*.db-journal
+*.db-wal
+*.db-shm
+*.duckdb
+.crush
+CRUSH.md

{sqlspec-0.11.1 → sqlspec-0.16.2}/.pre-commit-config.yaml

@@ -7,7 +7,7 @@ repos:
       - id: conventional-pre-commit
         stages: [commit-msg]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-ast
       - id: check-case-conflict
@@ -17,7 +17,7 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.11.9"
+    rev: "v0.12.8"
     hooks:
       - id: ruff
         args: ["--fix"]
@@ -29,7 +29,7 @@ repos:
         additional_dependencies:
           - tomli
   - repo: https://github.com/python-formate/flake8-dunder-all
-    rev: v0.4.1
+    rev: v0.5.0
     hooks:
       - id: ensure-dunder-all
         exclude: "test*|tools"

{sqlspec-0.11.1 → sqlspec-0.16.2}/Makefile

@@ -48,6 +48,18 @@ install: destroy clean                              ## Install the project, depe
 	@uv sync --all-extras --dev
 	@echo "${OK} Installation complete! 🎉"
 
+.PHONY: install-compiled
+install-compiled: destroy clean                  ## Install with mypyc compilation for performance
+	@echo "${INFO} Starting fresh installation with mypyc compilation..."
+	@uv python pin 3.12 >/dev/null 2>&1
+	@uv venv >/dev/null 2>&1
+	@echo "${INFO} Installing in editable mode with mypyc compilation..."
+	@HATCH_BUILD_HOOKS_ENABLE=1 uv pip install -e .
+	@uv sync --all-extras --dev
+	@echo "${OK} Performance installation complete! 🚀"
+	@echo "${INFO} Verifying compilation..."
+	@find sqlspec -name "*.so" | wc -l | xargs -I {} echo "${OK} Compiled {} modules"
+
 .PHONY: destroy
 destroy:                                            ## Destroy the virtual environment
 	@echo "${INFO} Destroying virtual environment... 🗑️"
@@ -83,6 +95,22 @@ build:                                             ## Build the package
 	@uv build >/dev/null 2>&1
 	@echo "${OK} Package build complete"
 
+.PHONY: build-performance
+build-performance:                                 ## Build package with mypyc compilation
+	@echo "${INFO} Building package with mypyc compilation... 📦"
+	@HATCH_BUILD_HOOKS_ENABLE=1 uv build >/dev/null 2>&1
+	@echo "${OK} Performance package build complete 🚀"
+
+.PHONY: test-mypyc
+test-mypyc:                                        ## Test mypyc compilation on individual modules
+	@echo "${INFO} Testing mypyc compilation... 🔧"
+	@uv run mypyc --check-untyped-defs sqlspec/utils/statement_hashing.py
+	@uv run mypyc --check-untyped-defs sqlspec/utils/text.py
+	@uv run mypyc --check-untyped-defs sqlspec/utils/sync_tools.py
+	@uv run mypyc --check-untyped-defs sqlspec/statement/cache.py
+	@echo "${OK} Mypyc compilation tests passed ✨"
+
+
 .PHONY: release
 release:                                           ## Bump version and create release tag
 	@echo "${INFO} Preparing for release... 📦"
@@ -108,6 +136,8 @@ clean:                                              ## Cleanup temporary build a
 	@find . -name '*~' -exec rm -f {} + >/dev/null 2>&1
 	@find . -name '__pycache__' -exec rm -rf {} + >/dev/null 2>&1
 	@find . -name '.ipynb_checkpoints' -exec rm -rf {} + >/dev/null 2>&1
+	@find . -name '*.so' -exec rm -f {} + >/dev/null 2>&1
+	@find . -name '*.c' -exec rm -f {} + >/dev/null 2>&1
 	@echo "${OK} Working directory cleaned"
 	$(MAKE) docs-clean
 
@@ -215,6 +245,49 @@ docs-linkcheck-full:                               ## Run full documentation lin
 	@uv run sphinx-build -b linkcheck ./docs ./docs/_build -D linkcheck_anchors=0
 	@echo "${OK} Full link check complete"
 
+# =============================================================================
+# Development Infrastructure
+# =============================================================================
+
+.PHONY: infra-up
+infra-up:                                              ## Start development infrastructure (databases, storage)
+	@echo "${INFO} Starting development infrastructure..."
+	@./tools/local-infra.sh up
+	@echo "${OK} Development infrastructure ready ✨"
+
+.PHONY: infra-down
+infra-down:                                            ## Stop development infrastructure
+	@echo "${INFO} Stopping development infrastructure..."
+	@./tools/local-infra.sh down --quiet
+	@echo "${OK} Development infrastructure stopped"
+
+.PHONY: infra-status
+infra-status:                                          ## Show development infrastructure status
+	@./tools/local-infra.sh status
+
+.PHONY: infra-cleanup
+infra-cleanup:                                         ## Clean up development infrastructure
+	@echo "${WARN} This will remove all development containers and volumes"
+	@./tools/local-infra.sh cleanup
+
+.PHONY: infra-postgres
+infra-postgres:                                        ## Start only PostgreSQL
+	@echo "${INFO} Starting PostgreSQL..."
+	@./tools/local-infra.sh up postgres --quiet
+	@echo "${OK} PostgreSQL ready on port 5433"
+
+.PHONY: infra-oracle
+infra-oracle:                                          ## Start only Oracle
+	@echo "${INFO} Starting Oracle..."
+	@./tools/local-infra.sh up oracle --quiet
+	@echo "${OK} Oracle ready on port 1522"
+
+.PHONY: infra-mysql
+infra-mysql:                                           ## Start only MySQL
+	@echo "${INFO} Starting MySQL..."
+	@./tools/local-infra.sh up mysql --quiet
+	@echo "${OK} MySQL ready on port 3307"
+
 # =============================================================================
 # End of Makefile
 # =============================================================================

{sqlspec-0.11.1 → sqlspec-0.16.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlspec
-Version: 0.11.1
+Version: 0.16.2
 Summary: SQL Experiments in Python
 Project-URL: Discord, https://discord.gg/litestar
 Project-URL: Issue, https://github.com/litestar-org/sqlspec/issues/
@@ -12,43 +12,64 @@ License-File: LICENSE
 License-File: NOTICE
 Requires-Python: <4.0,>=3.9
 Requires-Dist: eval-type-backport; python_version < '3.10'
-Requires-Dist: sqlglot
+Requires-Dist: mypy-extensions
+Requires-Dist: rich-click
+Requires-Dist: sqlglot>=19.9.0
 Requires-Dist: typing-extensions
 Provides-Extra: adbc
 Requires-Dist: adbc-driver-manager; extra == 'adbc'
 Requires-Dist: pyarrow; extra == 'adbc'
 Provides-Extra: aioodbc
 Requires-Dist: aioodbc; extra == 'aioodbc'
+Provides-Extra: aiosql
+Requires-Dist: aiosql; extra == 'aiosql'
 Provides-Extra: aiosqlite
 Requires-Dist: aiosqlite; extra == 'aiosqlite'
 Provides-Extra: asyncmy
 Requires-Dist: asyncmy; extra == 'asyncmy'
 Provides-Extra: asyncpg
 Requires-Dist: asyncpg; extra == 'asyncpg'
+Provides-Extra: attrs
+Requires-Dist: attrs; extra == 'attrs'
+Requires-Dist: cattrs; extra == 'attrs'
 Provides-Extra: bigquery
 Requires-Dist: google-cloud-bigquery; extra == 'bigquery'
+Provides-Extra: cli
+Requires-Dist: rich-click; extra == 'cli'
 Provides-Extra: duckdb
 Requires-Dist: duckdb; extra == 'duckdb'
 Provides-Extra: fastapi
 Requires-Dist: fastapi; extra == 'fastapi'
 Provides-Extra: flask
 Requires-Dist: flask; extra == 'flask'
+Provides-Extra: fsspec
+Requires-Dist: fsspec; extra == 'fsspec'
 Provides-Extra: litestar
 Requires-Dist: litestar; extra == 'litestar'
 Provides-Extra: msgspec
 Requires-Dist: msgspec; extra == 'msgspec'
+Provides-Extra: mypyc
 Provides-Extra: nanoid
 Requires-Dist: fastnanoid>=0.4.1; extra == 'nanoid'
+Provides-Extra: obstore
+Requires-Dist: obstore; extra == 'obstore'
+Provides-Extra: opentelemetry
+Requires-Dist: opentelemetry-instrumentation; extra == 'opentelemetry'
 Provides-Extra: oracledb
 Requires-Dist: oracledb; extra == 'oracledb'
 Provides-Extra: orjson
 Requires-Dist: orjson; extra == 'orjson'
+Provides-Extra: pandas
+Requires-Dist: pandas; extra == 'pandas'
+Requires-Dist: pyarrow; extra == 'pandas'
 Provides-Extra: performance
 Requires-Dist: msgspec; extra == 'performance'
 Requires-Dist: sqlglot[rs]; extra == 'performance'
 Provides-Extra: polars
 Requires-Dist: polars; extra == 'polars'
 Requires-Dist: pyarrow; extra == 'polars'
+Provides-Extra: prometheus
+Requires-Dist: prometheus-client; extra == 'prometheus'
 Provides-Extra: psqlpy
 Requires-Dist: psqlpy; extra == 'psqlpy'
 Provides-Extra: psycopg
@@ -63,7 +84,7 @@ Requires-Dist: pymysql; extra == 'pymysql'
 Provides-Extra: spanner
 Requires-Dist: google-cloud-spanner; extra == 'spanner'
 Provides-Extra: uuid
-Requires-Dist: uuid-utils>=0.6.1; extra == 'uuid'
+Requires-Dist: uuid-utils; extra == 'uuid'
 Description-Content-Type: text/markdown
 
 # SQLSpec
@@ -72,18 +93,26 @@ Description-Content-Type: text/markdown
 
 SQLSpec is an experimental Python library designed to streamline and modernize your SQL interactions across a variety of database systems. While still in its early stages, SQLSpec aims to provide a flexible, typed, and extensible interface for working with SQL in Python.
 
-**Note**: SQLSpec is currently under active development and the API is subject to change.  It is not yet ready for production use.  Contributions are welcome!
+**Note**: SQLSpec is currently under active development and the API is subject to change. It is not yet ready for production use. Contributions are welcome!
 
-## Core Features (Planned but subject to change, removal or redesign)
+## Core Features (Current and Planned)
+
+### Currently Implemented
 
 - **Consistent Database Session Interface**: Provides a consistent connectivity interface for interacting with one or more database systems, including SQLite, Postgres, DuckDB, MySQL, Oracle, SQL Server, Spanner, BigQuery, and more.
-- **Emphasis on RAW SQL and Minimal Abstractions and Performance**: SQLSpec is a library for working with SQL in Python.  It's goals are to offer minimal abstractions between the user and the database.  It does not aim to be an ORM library.
+- **Emphasis on RAW SQL and Minimal Abstractions**: SQLSpec is a library for working with SQL in Python. Its goals are to offer minimal abstractions between the user and the database. It does not aim to be an ORM library.
 - **Type-Safe Queries**: Quickly map SQL queries to typed objects using libraries such as Pydantic, Msgspec, Attrs, etc.
-- **Extensible Design**: Easily add support for new database dialects or extend existing functionality to meet your specific needs.  Easily add support for async and sync database drivers.
-- **Minimal Dependencies**: SQLSpec is designed to be lightweight and can run on it's own or with other libraries such as `litestar`, `fastapi`, `flask` and more.  (Contributions welcome!)
-- **Dynamic Query Manipulation**: Easily apply filters to pre-defined queries with a fluent, Pythonic API. Safely manipulate queries without the risk of SQL injection.
-- **Dialect Validation and Conversion**: Use `sqlglot` to validate your SQL against specific dialects and seamlessly convert between them.
+- **Extensible Design**: Easily add support for new database dialects or extend existing functionality to meet your specific needs. Easily add support for async and sync database drivers.
+- **Minimal Dependencies**: SQLSpec is designed to be lightweight and can run on its own or with other libraries such as `litestar`, `fastapi`, `flask` and more. (Contributions welcome!)
 - **Support for Async and Sync Database Drivers**: SQLSpec supports both async and sync database drivers, allowing you to choose the style that best fits your application.
+
+### Experimental Features (API will change rapidly)
+
+- **SQL Builder API**: Type-safe query builder with method chaining (experimental and subject to significant changes)
+- **Dynamic Query Manipulation**: Apply filters to pre-defined queries with a fluent API. Safely manipulate queries without SQL injection risk.
+- **Dialect Validation and Conversion**: Use `sqlglot` to validate your SQL against specific dialects and seamlessly convert between them.
+- **Storage Operations**: Direct export to Parquet, CSV, JSON with Arrow integration
+- **Instrumentation**: OpenTelemetry and Prometheus metrics support
 - **Basic Migration Management**: A mechanism to generate empty migration files where you can add your own SQL and intelligently track which migrations have been applied.
 
 ## What SQLSpec Is Not (Yet)
@@ -94,16 +123,60 @@ SQLSpec is a work in progress. While it offers a solid foundation for modern SQL
 
 We've talked about what SQLSpec is not, so let's look at what it can do.
 
-These are just a few of the examples that demonstrate SQLSpec's flexibility and each of the bundled adapters offer the same config and driver interfaces.
+These are just a few examples that demonstrate SQLSpec's flexibility. Each of the bundled adapters offers the same config and driver interfaces.
+
+### Basic Usage
+
+```python
+from sqlspec import SQLSpec
+from sqlspec.adapters.sqlite import SqliteConfig
+from pydantic import BaseModel
+# Create SQLSpec instance and configure database
+sql = SQLSpec()
+config = sql.add_config(SqliteConfig(database=":memory:"))
+
+# Execute queries with automatic result mapping
+with sql.provide_session(config) as session:
+    # Simple query
+    result = session.execute("SELECT 'Hello, SQLSpec!' as message")
+    print(result.get_first())  # {'message': 'Hello, SQLSpec!'}
+```
+
+### SQL Builder Example (Experimental)
+
+**Warning**: The SQL Builder API is highly experimental and will change significantly.
+
+```python
+from sqlspec import sql
+
+# Build a simple query
+query = sql.select("id", "name", "email").from_("users").where("active = ?", True)
+print(query.build().sql)  # SELECT id, name, email FROM users WHERE active = ?
+
+# More complex example with joins
+query = (
+    sql.select("u.name", "COUNT(o.id) as order_count")
+    .from_("users u")
+    .left_join("orders o", "u.id = o.user_id")
+    .where("u.created_at > ?", "2024-01-01")
+    .group_by("u.name")
+    .having("COUNT(o.id) > ?", 5)
+    .order_by("order_count", desc=True)
+)
+
+# Execute the built query
+with sql.provide_session(config) as session:
+    results = session.execute(query.build())
+```
 
 ### DuckDB LLM
 
-This is a quick implementation using some of the built in Secret and Extension management features of SQLSpec's DuckDB integration.
+This is a quick implementation using some of the built-in Secret and Extension management features of SQLSpec's DuckDB integration.
 
-It allows you to communicate with any compatible OpenAPI conversations endpoint (such as Ollama).  This examples:
+It allows you to communicate with any compatible OpenAPI conversations endpoint (such as Ollama). This example:
 
 - auto installs the `open_prompt` DuckDB extensions
-- automatically creates the correct `open_prompt` comptaible secret required to use the extension
+- automatically creates the correct `open_prompt` compatible secret required to use the extension
 
 ```py
 # /// script
@@ -148,12 +221,12 @@ with sql.provide_session(etl_config) as session:
 
 ### DuckDB Gemini Embeddings
 
-In this example, we are again using DuckDB.  However, we are going to use the built in to call the Google Gemini embeddings service directly from the database.
+In this example, we are again using DuckDB. However, we are going to use the built-in to call the Google Gemini embeddings service directly from the database.
 
-This example will
+This example will:
 
 - auto installs the `http_client` and `vss` (vector similarity search) DuckDB extensions
-- when a connection is created, it ensures that the `generate_embeddings` macro exists in the DuckDB database.
+- when a connection is created, it ensures that the `generate_embeddings` macro exists in the DuckDB database
 - Execute a simple query to call the Google API
 
 ```py
@@ -199,8 +272,8 @@ etl_config = sql.add_config(
     )
 )
 with sql.provide_session(etl_config) as session:
-    result = session.select_one("SELECT generate_embedding('example text')")
-    print(result) # result is a dictionary when `schema_type` is omitted.
+    result = session.execute("SELECT generate_embedding('example text')")
+    print(result.get_first()) # result is a dictionary when `schema_type` is omitted.
 ```
 
 ### Basic Litestar Integration
@@ -215,11 +288,10 @@ In this example we are going to demonstrate how to create a basic configuration
 # ]
 # ///
 
-from aiosqlite import Connection
 from litestar import Litestar, get
 
 from sqlspec.adapters.aiosqlite import AiosqliteConfig, AiosqliteDriver
-from sqlspec.extensions.litestar import SQLSpec
+from sqlspec.extensions.litestar import DatabaseConfig, SQLSpec
 
 
 @get("/")
@@ -227,15 +299,18 @@ async def simple_sqlite(db_session: AiosqliteDriver) -> dict[str, str]:
     return await db_session.select_one("SELECT 'Hello, world!' AS greeting")
 
 
-sqlspec = SQLSpec(config=DatabaseConfig(
-    config=[AiosqliteConfig(), commit_mode="autocommit")],
+sqlspec = SQLSpec(
+    config=DatabaseConfig(
+        config=AiosqliteConfig(),
+        commit_mode="autocommit"
+    )
 )
 app = Litestar(route_handlers=[simple_sqlite], plugins=[sqlspec])
 ```
 
 ## Inspiration and Future Direction
 
-SQLSpec originally drew inspiration from features found in the `aiosql` library.  This is a great library for working with and executed SQL stored in files.  It's unclear how much of an overlap there will be between the two libraries, but it's possible that some features will be contributed back to `aiosql` where appropriate.
+SQLSpec originally drew inspiration from features found in the `aiosql` library. This is a great library for working with and executing SQL stored in files. It's unclear how much of an overlap there will be between the two libraries, but it's possible that some features will be contributed back to `aiosql` where appropriate.
 
 ## Current Focus: Universal Connectivity
 
@@ -275,9 +350,10 @@ This list is not final. If you have a driver you'd like to see added, please ope
         - `litestar/`: Litestar framework integration ✅
         - `fastapi/`: Future home of `fastapi` integration.
         - `flask/`: Future home of `flask` integration.
-        - `*/`: Future home of your favorite framework integration 🔌 ✨
+        - `*/`: Future home of your favorite framework integration
     - `base.py`: Contains base protocols for database configurations.
-    - `filters.py`: Contains the `Filter` class which is used to apply filters to pre-defined SQL queries.
+    - `statement/`: Contains the SQL statement system with builders, validation, and transformation.
+    - `storage/`: Contains unified storage operations for data import/export.
     - `utils/`: Contains utility functions used throughout the project.
     - `exceptions.py`: Contains custom exceptions for SQLSpec.
     - `typing.py`: Contains type hints, type guards and several facades for optional libraries that are not required for the core functionality of SQLSpec.

{sqlspec-0.11.1 → sqlspec-0.16.2}/README.md

@@ -4,18 +4,26 @@
 
 SQLSpec is an experimental Python library designed to streamline and modernize your SQL interactions across a variety of database systems. While still in its early stages, SQLSpec aims to provide a flexible, typed, and extensible interface for working with SQL in Python.
 
-**Note**: SQLSpec is currently under active development and the API is subject to change.  It is not yet ready for production use.  Contributions are welcome!
+**Note**: SQLSpec is currently under active development and the API is subject to change. It is not yet ready for production use. Contributions are welcome!
 
-## Core Features (Planned but subject to change, removal or redesign)
+## Core Features (Current and Planned)
+
+### Currently Implemented
 
 - **Consistent Database Session Interface**: Provides a consistent connectivity interface for interacting with one or more database systems, including SQLite, Postgres, DuckDB, MySQL, Oracle, SQL Server, Spanner, BigQuery, and more.
-- **Emphasis on RAW SQL and Minimal Abstractions and Performance**: SQLSpec is a library for working with SQL in Python.  It's goals are to offer minimal abstractions between the user and the database.  It does not aim to be an ORM library.
+- **Emphasis on RAW SQL and Minimal Abstractions**: SQLSpec is a library for working with SQL in Python. Its goals are to offer minimal abstractions between the user and the database. It does not aim to be an ORM library.
 - **Type-Safe Queries**: Quickly map SQL queries to typed objects using libraries such as Pydantic, Msgspec, Attrs, etc.
-- **Extensible Design**: Easily add support for new database dialects or extend existing functionality to meet your specific needs.  Easily add support for async and sync database drivers.
-- **Minimal Dependencies**: SQLSpec is designed to be lightweight and can run on it's own or with other libraries such as `litestar`, `fastapi`, `flask` and more.  (Contributions welcome!)
-- **Dynamic Query Manipulation**: Easily apply filters to pre-defined queries with a fluent, Pythonic API. Safely manipulate queries without the risk of SQL injection.
-- **Dialect Validation and Conversion**: Use `sqlglot` to validate your SQL against specific dialects and seamlessly convert between them.
+- **Extensible Design**: Easily add support for new database dialects or extend existing functionality to meet your specific needs. Easily add support for async and sync database drivers.
+- **Minimal Dependencies**: SQLSpec is designed to be lightweight and can run on its own or with other libraries such as `litestar`, `fastapi`, `flask` and more. (Contributions welcome!)
 - **Support for Async and Sync Database Drivers**: SQLSpec supports both async and sync database drivers, allowing you to choose the style that best fits your application.
+
+### Experimental Features (API will change rapidly)
+
+- **SQL Builder API**: Type-safe query builder with method chaining (experimental and subject to significant changes)
+- **Dynamic Query Manipulation**: Apply filters to pre-defined queries with a fluent API. Safely manipulate queries without SQL injection risk.
+- **Dialect Validation and Conversion**: Use `sqlglot` to validate your SQL against specific dialects and seamlessly convert between them.
+- **Storage Operations**: Direct export to Parquet, CSV, JSON with Arrow integration
+- **Instrumentation**: OpenTelemetry and Prometheus metrics support
 - **Basic Migration Management**: A mechanism to generate empty migration files where you can add your own SQL and intelligently track which migrations have been applied.
 
 ## What SQLSpec Is Not (Yet)
@@ -26,16 +34,60 @@ SQLSpec is a work in progress. While it offers a solid foundation for modern SQL
 
 We've talked about what SQLSpec is not, so let's look at what it can do.
 
-These are just a few of the examples that demonstrate SQLSpec's flexibility and each of the bundled adapters offer the same config and driver interfaces.
+These are just a few examples that demonstrate SQLSpec's flexibility. Each of the bundled adapters offers the same config and driver interfaces.
+
+### Basic Usage
+
+```python
+from sqlspec import SQLSpec
+from sqlspec.adapters.sqlite import SqliteConfig
+from pydantic import BaseModel
+# Create SQLSpec instance and configure database
+sql = SQLSpec()
+config = sql.add_config(SqliteConfig(database=":memory:"))
+
+# Execute queries with automatic result mapping
+with sql.provide_session(config) as session:
+    # Simple query
+    result = session.execute("SELECT 'Hello, SQLSpec!' as message")
+    print(result.get_first())  # {'message': 'Hello, SQLSpec!'}
+```
+
+### SQL Builder Example (Experimental)
+
+**Warning**: The SQL Builder API is highly experimental and will change significantly.
+
+```python
+from sqlspec import sql
+
+# Build a simple query
+query = sql.select("id", "name", "email").from_("users").where("active = ?", True)
+print(query.build().sql)  # SELECT id, name, email FROM users WHERE active = ?
+
+# More complex example with joins
+query = (
+    sql.select("u.name", "COUNT(o.id) as order_count")
+    .from_("users u")
+    .left_join("orders o", "u.id = o.user_id")
+    .where("u.created_at > ?", "2024-01-01")
+    .group_by("u.name")
+    .having("COUNT(o.id) > ?", 5)
+    .order_by("order_count", desc=True)
+)
+
+# Execute the built query
+with sql.provide_session(config) as session:
+    results = session.execute(query.build())
+```
 
 ### DuckDB LLM
 
-This is a quick implementation using some of the built in Secret and Extension management features of SQLSpec's DuckDB integration.
+This is a quick implementation using some of the built-in Secret and Extension management features of SQLSpec's DuckDB integration.
 
-It allows you to communicate with any compatible OpenAPI conversations endpoint (such as Ollama).  This examples:
+It allows you to communicate with any compatible OpenAPI conversations endpoint (such as Ollama). This example:
 
 - auto installs the `open_prompt` DuckDB extensions
-- automatically creates the correct `open_prompt` comptaible secret required to use the extension
+- automatically creates the correct `open_prompt` compatible secret required to use the extension
 
 ```py
 # /// script
@@ -80,12 +132,12 @@ with sql.provide_session(etl_config) as session:
 
 ### DuckDB Gemini Embeddings
 
-In this example, we are again using DuckDB.  However, we are going to use the built in to call the Google Gemini embeddings service directly from the database.
+In this example, we are again using DuckDB. However, we are going to use the built-in to call the Google Gemini embeddings service directly from the database.
 
-This example will
+This example will:
 
 - auto installs the `http_client` and `vss` (vector similarity search) DuckDB extensions
-- when a connection is created, it ensures that the `generate_embeddings` macro exists in the DuckDB database.
+- when a connection is created, it ensures that the `generate_embeddings` macro exists in the DuckDB database
 - Execute a simple query to call the Google API
 
 ```py
@@ -131,8 +183,8 @@ etl_config = sql.add_config(
     )
 )
 with sql.provide_session(etl_config) as session:
-    result = session.select_one("SELECT generate_embedding('example text')")
-    print(result) # result is a dictionary when `schema_type` is omitted.
+    result = session.execute("SELECT generate_embedding('example text')")
+    print(result.get_first()) # result is a dictionary when `schema_type` is omitted.
 ```
 
 ### Basic Litestar Integration
@@ -147,11 +199,10 @@ In this example we are going to demonstrate how to create a basic configuration
 # ]
 # ///
 
-from aiosqlite import Connection
 from litestar import Litestar, get
 
 from sqlspec.adapters.aiosqlite import AiosqliteConfig, AiosqliteDriver
-from sqlspec.extensions.litestar import SQLSpec
+from sqlspec.extensions.litestar import DatabaseConfig, SQLSpec
 
 
 @get("/")
@@ -159,15 +210,18 @@ async def simple_sqlite(db_session: AiosqliteDriver) -> dict[str, str]:
     return await db_session.select_one("SELECT 'Hello, world!' AS greeting")
 
 
-sqlspec = SQLSpec(config=DatabaseConfig(
-    config=[AiosqliteConfig(), commit_mode="autocommit")],
+sqlspec = SQLSpec(
+    config=DatabaseConfig(
+        config=AiosqliteConfig(),
+        commit_mode="autocommit"
+    )
 )
 app = Litestar(route_handlers=[simple_sqlite], plugins=[sqlspec])
 ```
 
 ## Inspiration and Future Direction
 
-SQLSpec originally drew inspiration from features found in the `aiosql` library.  This is a great library for working with and executed SQL stored in files.  It's unclear how much of an overlap there will be between the two libraries, but it's possible that some features will be contributed back to `aiosql` where appropriate.
+SQLSpec originally drew inspiration from features found in the `aiosql` library. This is a great library for working with and executing SQL stored in files. It's unclear how much of an overlap there will be between the two libraries, but it's possible that some features will be contributed back to `aiosql` where appropriate.
 
 ## Current Focus: Universal Connectivity
 
@@ -207,9 +261,10 @@ This list is not final. If you have a driver you'd like to see added, please ope
         - `litestar/`: Litestar framework integration ✅
         - `fastapi/`: Future home of `fastapi` integration.
         - `flask/`: Future home of `flask` integration.
-        - `*/`: Future home of your favorite framework integration 🔌 ✨
+        - `*/`: Future home of your favorite framework integration
     - `base.py`: Contains base protocols for database configurations.
-    - `filters.py`: Contains the `Filter` class which is used to apply filters to pre-defined SQL queries.
+    - `statement/`: Contains the SQL statement system with builders, validation, and transformation.
+    - `storage/`: Contains unified storage operations for data import/export.
     - `utils/`: Contains utility functions used throughout the project.
     - `exceptions.py`: Contains custom exceptions for SQLSpec.
     - `typing.py`: Contains type hints, type guards and several facades for optional libraries that are not required for the core functionality of SQLSpec.