sqlty 0.4.0__tar.gz → 0.5.1__tar.gz

{sqlty-0.4.0 → sqlty-0.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlty
-Version: 0.4.0
+Version: 0.5.1
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -12,6 +12,7 @@ Classifier: Programming Language :: Rust
 Classifier: Programming Language :: SQL
 Classifier: Topic :: Software Development :: Code Generators
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Database
 Classifier: Typing :: Typed
 Requires-Dist: pathspec>=0.12.1
@@ -19,15 +20,15 @@ Requires-Dist: typing-extensions>=4.15.0 ; python_full_version < '3.15'
 Requires-Dist: psycopg>=3.2.12 ; extra == 'psycopg'
 Provides-Extra: psycopg
 License-File: LICENSE
-Summary: Type-safe SQL queries for Python
-Keywords: sql,type-hints,mypy,type-safety,static-analysis,code-generation
+Summary: Type-safe raw SQL for Python: row and parameter types inferred from your SQL and schema, no ORM or database needed
+Keywords: sql,raw-sql,type-safety,type-checking,type-hints,static-analysis,linter,mypy,pyright,ty,postgresql,sqlite,mysql,psycopg,migrations,code-generation,orm-alternative
 Author-email: Jiri Kuncar <jiri.kuncar@gmail.com>
 License-Expression: MIT
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown; charset=UTF-8; variant=GFM
 Project-URL: Changelog, https://github.com/jirikuncar/sqlty/releases
-Project-URL: Documentation, https://jirikuncar.github.io/sqlty/
-Project-URL: Homepage, https://github.com/jirikuncar/sqlty
+Project-URL: Documentation, https://sqlty.kuncar.dev/
+Project-URL: Homepage, https://sqlty.kuncar.dev/
 Project-URL: Issues, https://github.com/jirikuncar/sqlty/issues
 Project-URL: Repository, https://github.com/jirikuncar/sqlty
 
@@ -56,13 +57,13 @@ migration that changes a column is caught in review, not in production.
   (<a href="https://github.com/jirikuncar/sqlty/blob/main/docs/assets/demo.tape">view source</a>)
 </p>
 
-**Documentation: [jirikuncar.github.io/sqlty](https://jirikuncar.github.io/sqlty/)**
+**Documentation: [sqlty.kuncar.dev](https://sqlty.kuncar.dev/)**
 
 **Fits if** you write SQL as string literals on Python 3.14+, against
 PostgreSQL, SQLite or MySQL, with a schema dump or SQL migrations in the
 repository. Rows are typed end to end with psycopg 3; with other drivers sqlty
 checks the query and its parameters, and you annotate what the cursor returns
-([Drivers](https://jirikuncar.github.io/sqlty/guide/drivers-and-orms/)).
+([Drivers](https://sqlty.kuncar.dev/guide/drivers-and-orms/)).
 
 > **Beta.** APIs and configuration may change before 1.0. Feedback welcome in
 > [GitHub Issues](https://github.com/jirikuncar/sqlty/issues).
@@ -124,10 +125,10 @@ query = SQL[tuple[int, str]]("--sql\nSELECT id, email FROM users")
 caller that now needs a `None` check. `narrow-type` is an error, so CI fails on
 it; an annotation that is only wider than the rows, such as `str | None` for a
 column made `NOT NULL`, is a `stale-type` warning
-([CI](https://jirikuncar.github.io/sqlty/recipes/ci/)). For rolling deploys,
+([CI](https://sqlty.kuncar.dev/recipes/ci/)). For rolling deploys,
 `sqlty breaking --against origin/main` exits 1 when old code breaks on the new
 schema or new code on the old one
-([Breaking schema changes](https://jirikuncar.github.io/sqlty/guide/breaking-changes/)).
+([Breaking schema changes](https://sqlty.kuncar.dev/guide/breaking-changes/)).
 
 ### A row type that doesn't match its query
 
@@ -144,7 +145,7 @@ query = SQL[User]("--sql\nSELECT id::INTEGER, name::TEXT FROM users")
 ```
 
 `TypedDict`, `NamedTuple`, dataclasses and Pydantic models are all checked
-([Row types](https://jirikuncar.github.io/sqlty/guide/row-types/)).
+([Row types](https://sqlty.kuncar.dev/guide/row-types/)).
 
 ### Wrong parameters, misspelled columns
 
@@ -176,11 +177,11 @@ conn.execute(SQL[tuple[str | None]]("--sql\nSELECT email FROM users WHERE id = ?
 conn.execute("--sql\nSELECT emial FROM users")
 ```
 
-`?`, `$1`, `%s` and `:name` placeholders are checked on sqlite3, psycopg and
-asyncpg calls ([Parameters](https://jirikuncar.github.io/sqlty/guide/parameters/)).
+`?`, `$1`, `%s` and `:name` placeholders are checked on sqlite3, aiosqlite,
+psycopg and asyncpg calls ([Parameters](https://sqlty.kuncar.dev/guide/parameters/)).
 These are the mistakes coding agents make: every problem is one
 `file:line: [rule] message` line and a non-zero exit code they can act on, and
-the [sqlty skills](https://jirikuncar.github.io/sqlty/recipes/agents/) teach
+the [sqlty skills](https://sqlty.kuncar.dev/recipes/agents/) teach
 them the conventions. In Claude Code, `/plugin install sqlty --marketplace jirikuncar/sqlty`
 installs them.
 
@@ -196,13 +197,13 @@ sqlty strip .                  # undo: back to plain strings
 
 `rewrite` and `strip` only touch the wrapper, never the SQL, so you can adopt
 sqlty one module at a time and back out. New project:
-[Quickstart](https://jirikuncar.github.io/sqlty/quickstart/). Existing codebase:
-[Migration](https://jirikuncar.github.io/sqlty/recipes/migration/), starting
+[Quickstart](https://sqlty.kuncar.dev/quickstart/). Existing codebase:
+[Migration](https://sqlty.kuncar.dev/recipes/migration/), starting
 with `pg_dump --schema-only app > schema.sql`. In the editor:
-[VS Code](https://jirikuncar.github.io/sqlty/recipes/vscode/).
+[VS Code](https://sqlty.kuncar.dev/recipes/vscode/).
 
 Not a fit for ORMs, SQL built at runtime, or runtime validation;
-[Why SQLTy?](https://jirikuncar.github.io/sqlty/motivation/) compares it with
+[Why SQLTy?](https://sqlty.kuncar.dev/motivation/) compares it with
 sqlc, sqlx, PgTyped and others.
 
 ## About
@@ -213,6 +214,6 @@ developed with AI coding agents, mainly Claude Code; every change is reviewed by
 a maintainer (see the
 [AI-assisted contributions](https://github.com/jirikuncar/sqlty/blob/main/CONTRIBUTING.md#ai-assisted-contributions)
 policy). [Contributing](https://github.com/jirikuncar/sqlty/blob/main/CONTRIBUTING.md) ·
-[Credits](https://jirikuncar.github.io/sqlty/credits/) ·
+[Credits](https://sqlty.kuncar.dev/credits/) ·
 MIT [License](https://github.com/jirikuncar/sqlty/blob/main/LICENSE).
 

{sqlty-0.4.0 → sqlty-0.5.1}/README.md

@@ -23,13 +23,13 @@ migration that changes a column is caught in review, not in production.
   (<a href="https://github.com/jirikuncar/sqlty/blob/main/docs/assets/demo.tape">view source</a>)
 </p>
 
-**Documentation: [jirikuncar.github.io/sqlty](https://jirikuncar.github.io/sqlty/)**
+**Documentation: [sqlty.kuncar.dev](https://sqlty.kuncar.dev/)**
 
 **Fits if** you write SQL as string literals on Python 3.14+, against
 PostgreSQL, SQLite or MySQL, with a schema dump or SQL migrations in the
 repository. Rows are typed end to end with psycopg 3; with other drivers sqlty
 checks the query and its parameters, and you annotate what the cursor returns
-([Drivers](https://jirikuncar.github.io/sqlty/guide/drivers-and-orms/)).
+([Drivers](https://sqlty.kuncar.dev/guide/drivers-and-orms/)).
 
 > **Beta.** APIs and configuration may change before 1.0. Feedback welcome in
 > [GitHub Issues](https://github.com/jirikuncar/sqlty/issues).
@@ -91,10 +91,10 @@ query = SQL[tuple[int, str]]("--sql\nSELECT id, email FROM users")
 caller that now needs a `None` check. `narrow-type` is an error, so CI fails on
 it; an annotation that is only wider than the rows, such as `str | None` for a
 column made `NOT NULL`, is a `stale-type` warning
-([CI](https://jirikuncar.github.io/sqlty/recipes/ci/)). For rolling deploys,
+([CI](https://sqlty.kuncar.dev/recipes/ci/)). For rolling deploys,
 `sqlty breaking --against origin/main` exits 1 when old code breaks on the new
 schema or new code on the old one
-([Breaking schema changes](https://jirikuncar.github.io/sqlty/guide/breaking-changes/)).
+([Breaking schema changes](https://sqlty.kuncar.dev/guide/breaking-changes/)).
 
 ### A row type that doesn't match its query
 
@@ -111,7 +111,7 @@ query = SQL[User]("--sql\nSELECT id::INTEGER, name::TEXT FROM users")
 ```
 
 `TypedDict`, `NamedTuple`, dataclasses and Pydantic models are all checked
-([Row types](https://jirikuncar.github.io/sqlty/guide/row-types/)).
+([Row types](https://sqlty.kuncar.dev/guide/row-types/)).
 
 ### Wrong parameters, misspelled columns
 
@@ -143,11 +143,11 @@ conn.execute(SQL[tuple[str | None]]("--sql\nSELECT email FROM users WHERE id = ?
 conn.execute("--sql\nSELECT emial FROM users")
 ```
 
-`?`, `$1`, `%s` and `:name` placeholders are checked on sqlite3, psycopg and
-asyncpg calls ([Parameters](https://jirikuncar.github.io/sqlty/guide/parameters/)).
+`?`, `$1`, `%s` and `:name` placeholders are checked on sqlite3, aiosqlite,
+psycopg and asyncpg calls ([Parameters](https://sqlty.kuncar.dev/guide/parameters/)).
 These are the mistakes coding agents make: every problem is one
 `file:line: [rule] message` line and a non-zero exit code they can act on, and
-the [sqlty skills](https://jirikuncar.github.io/sqlty/recipes/agents/) teach
+the [sqlty skills](https://sqlty.kuncar.dev/recipes/agents/) teach
 them the conventions. In Claude Code, `/plugin install sqlty --marketplace jirikuncar/sqlty`
 installs them.
 
@@ -163,13 +163,13 @@ sqlty strip .                  # undo: back to plain strings
 
 `rewrite` and `strip` only touch the wrapper, never the SQL, so you can adopt
 sqlty one module at a time and back out. New project:
-[Quickstart](https://jirikuncar.github.io/sqlty/quickstart/). Existing codebase:
-[Migration](https://jirikuncar.github.io/sqlty/recipes/migration/), starting
+[Quickstart](https://sqlty.kuncar.dev/quickstart/). Existing codebase:
+[Migration](https://sqlty.kuncar.dev/recipes/migration/), starting
 with `pg_dump --schema-only app > schema.sql`. In the editor:
-[VS Code](https://jirikuncar.github.io/sqlty/recipes/vscode/).
+[VS Code](https://sqlty.kuncar.dev/recipes/vscode/).
 
 Not a fit for ORMs, SQL built at runtime, or runtime validation;
-[Why SQLTy?](https://jirikuncar.github.io/sqlty/motivation/) compares it with
+[Why SQLTy?](https://sqlty.kuncar.dev/motivation/) compares it with
 sqlc, sqlx, PgTyped and others.
 
 ## About
@@ -180,5 +180,5 @@ developed with AI coding agents, mainly Claude Code; every change is reviewed by
 a maintainer (see the
 [AI-assisted contributions](https://github.com/jirikuncar/sqlty/blob/main/CONTRIBUTING.md#ai-assisted-contributions)
 policy). [Contributing](https://github.com/jirikuncar/sqlty/blob/main/CONTRIBUTING.md) ·
-[Credits](https://jirikuncar.github.io/sqlty/credits/) ·
+[Credits](https://sqlty.kuncar.dev/credits/) ·
 MIT [License](https://github.com/jirikuncar/sqlty/blob/main/LICENSE).

{sqlty-0.4.0 → sqlty-0.5.1}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "sqlty"
 dynamic = ["version"]
-description = "Type-safe SQL queries for Python"
+description = "Type-safe raw SQL for Python: row and parameter types inferred from your SQL and schema, no ORM or database needed"
 readme = "README.md"
 requires-python = ">=3.14"
 license = "MIT"
@@ -9,11 +9,22 @@ license-files = ["LICENSE"]
 authors = [{ name = "Jiri Kuncar", email = "jiri.kuncar@gmail.com" }]
 keywords = [
     "sql",
-    "type-hints",
-    "mypy",
+    "raw-sql",
     "type-safety",
+    "type-checking",
+    "type-hints",
     "static-analysis",
+    "linter",
+    "mypy",
+    "pyright",
+    "ty",
+    "postgresql",
+    "sqlite",
+    "mysql",
+    "psycopg",
+    "migrations",
     "code-generation",
+    "orm-alternative",
 ]
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -27,6 +38,7 @@ classifiers = [
     "Programming Language :: SQL",
     "Topic :: Software Development :: Code Generators",
     "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Software Development :: Quality Assurance",
     "Topic :: Database",
     "Typing :: Typed",
 ]
@@ -36,8 +48,8 @@ dependencies = [
 ]
 
 [project.urls]
-Homepage = "https://github.com/jirikuncar/sqlty"
-Documentation = "https://jirikuncar.github.io/sqlty/"
+Homepage = "https://sqlty.kuncar.dev/"
+Documentation = "https://sqlty.kuncar.dev/"
 Repository = "https://github.com/jirikuncar/sqlty"
 Changelog = "https://github.com/jirikuncar/sqlty/releases"
 Issues = "https://github.com/jirikuncar/sqlty/issues"
@@ -45,6 +57,9 @@ Issues = "https://github.com/jirikuncar/sqlty/issues"
 [project.scripts]
 sqlty = "sqlty._cli:main"
 
+[project.entry-points."pygments.lexers"]
+sqlty = "sqlty.lexer:SQLTyLexer"
+
 [project.optional-dependencies]
 psycopg = ["psycopg>=3.2.12"]
 
@@ -83,11 +98,14 @@ dev = [
     "pydantic[email]>=2.14.1",
     "jsonschema>=4.26.0",
     "pytest-xdist>=3.8.0",
+    "types-pygments>=2.19",
 ]
 cli = ["rich>=15.0.0"]
 # Only the DuckDB type tests need it, and it has no wheel for every Python.
 duckdb = ["duckdb>=1.4.0"]
 psycopg = ["psycopg>=3.2.12"]
+# The aiosqlite calls sqlty checks, run against aiosqlite (tests/test_aiosqlite.py).
+aiosqlite = ["aiosqlite>=0.22.1"]
 fuzz = [
     "hypothesis>=6.140",
 ]

{sqlty-0.4.0 → sqlty-0.5.1}/rust/Cargo.lock

@@ -1190,7 +1190,7 @@ dependencies = [
 
 [[package]]
 name = "sqlty-bench"
-version = "0.4.0"
+version = "0.5.1"
 dependencies = [
  "criterion",
  "sqlty-python",
@@ -1199,7 +1199,7 @@ dependencies = [
 
 [[package]]
 name = "sqlty-core"
-version = "0.4.0"
+version = "0.5.1"
 dependencies = [
  "pyo3",
  "recursive",
@@ -1214,7 +1214,7 @@ dependencies = [
 
 [[package]]
 name = "sqlty-format"
-version = "0.4.0"
+version = "0.5.1"
 dependencies = [
  "regex",
  "sqlty-python",
@@ -1223,7 +1223,7 @@ dependencies = [
 
 [[package]]
 name = "sqlty-lsp"
-version = "0.4.0"
+version = "0.5.1"
 dependencies = [
  "crossbeam-channel",
  "lsp-server",
@@ -1236,7 +1236,7 @@ dependencies = [
 
 [[package]]
 name = "sqlty-python"
-version = "0.4.0"
+version = "0.5.1"
 dependencies = [
  "regex",
  "sqlty-sql",
@@ -1246,7 +1246,7 @@ dependencies = [
 
 [[package]]
 name = "sqlty-sql"
-version = "0.4.0"
+version = "0.5.1"
 dependencies = [
  "insta",
  "recursive",
@@ -1260,7 +1260,7 @@ dependencies = [
 
 [[package]]
 name = "sqlty-wasm"
-version = "0.4.0"
+version = "0.5.1"
 dependencies = [
  "serde",
  "serde_json",

{sqlty-0.4.0 → sqlty-0.5.1}/rust/Cargo.toml

@@ -3,13 +3,13 @@ resolver = "2"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.4.0"
+version = "0.5.1"
 edition = "2021"
 description = "Rust engine of sqlty: SQL type inference and Python source rewriting"
 license = "MIT"
 repository = "https://github.com/jirikuncar/sqlty"
 publish = false
-rust-version = "1.88"
+rust-version = "1.99"
 
 [workspace.dependencies]
 pyo3 = { version = "0.30", features = ["extension-module"] }

{sqlty-0.4.0 → sqlty-0.5.1}/rust/crates/sqlty-ext/src/lib.rs

@@ -180,6 +180,15 @@ impl SchemaHandle {
         self.dialect
     }
 
+    /// Whether queries of this database are read without a schema: it was loaded without one.
+    #[getter]
+    fn absent(&self) -> bool {
+        self.loaded
+            .schema
+            .databases()
+            .is_some_and(|databases| databases.absent)
+    }
+
     fn __repr__(&self) -> String {
         format!("Schema(dialect={:?})", self.dialect)
     }
@@ -190,15 +199,24 @@ impl SchemaHandle {
 /// `types` maps a SQL type name (`DATE`) or a `table.column` to the Python type a
 /// converter above the driver gives it (`[tool.sqlty.types]`).
 ///
+/// `databases` maps the name of each other database of the project to its schema, `None`
+/// for one without; a query whose marker names one (`--sql sqlty:db=analytics`) is read
+/// against it, in its dialect. `name` is this database's, and `absent` says it has no
+/// schema: its queries are read without one.
+///
 /// Raises:
 ///     ValueError: a key of `types` is neither a SQL type nor `table.column`
 #[pyfunction]
-#[pyo3(signature = (schema_sql, *, dialect = DialectArg::POSTGRES, types = None))]
+#[pyo3(signature = (schema_sql, *, dialect = DialectArg::POSTGRES, types = None, name = None, absent = false, databases = None))]
+#[allow(clippy::too_many_arguments)]
 fn load_schema(
     py: Python<'_>,
     schema_sql: &str,
     dialect: DialectArg,
     types: Option<Vec<(String, String)>>,
+    name: Option<String>,
+    absent: bool,
+    databases: Option<Vec<(String, Option<PyRef<'_, SchemaHandle>>)>>,
 ) -> PyResult<SchemaHandle> {
     let dialect = dialect.0;
     let overrides = analyzer::TypeOverrides::new(&types.unwrap_or_default(), dialect)
@@ -211,6 +229,33 @@ fn load_schema(
         };
         Arc::new(LoadedSchema { schema, skipped })
     });
+    let loaded = match databases {
+        None if name.is_none() && !absent => loaded,
+        databases => {
+            let others = databases
+                .unwrap_or_default()
+                .into_iter()
+                .map(|(other, handle)| match handle {
+                    Some(handle) => (
+                        other,
+                        handle.dialect,
+                        (!handle.absent()).then(|| handle.loaded.schema.clone()),
+                    ),
+                    None => (other, dialect, None),
+                })
+                .collect();
+            let databases = analyzer::Databases {
+                name: name.unwrap_or_else(|| analyzer::DEFAULT.to_string()),
+                absent,
+                others,
+            };
+            let LoadedSchema { schema, skipped } =
+                Arc::into_inner(loaded).expect("a schema just loaded is not shared");
+            let schema = analyzer::SchemaData::with_databases(schema, databases)
+                .expect("a schema just loaded is not shared");
+            Arc::new(LoadedSchema { schema, skipped })
+        }
+    };
     Ok(SchemaHandle {
         loaded,
         text: Arc::from(schema_sql),

{sqlty-0.4.0 → sqlty-0.5.1}/rust/crates/sqlty-format/Cargo.toml

@@ -14,4 +14,6 @@ workspace = true
 [dependencies]
 sqlty-python.workspace = true
 regex.workspace = true
+# On upgrade, check quarylabs/sqruff#5251: 0.44 lays out a query only up to an unparsable
+# `{name}` field. Once fixed, drop the `\{\w*\}` arm of `PLACEHOLDER` in src/lib.rs.
 sqruff-lib = "0.44"

{sqlty-0.4.0 → sqlty-0.5.1}/rust/crates/sqlty-format/src/lib.rs

@@ -32,10 +32,10 @@ use sqlty_python::rewriter::ImportStyle;
 use sqruff_lib::core::config::FluffConfig;
 use sqruff_lib::core::linter::core::Linter;
 
-/// psycopg's `%s`, `%(name)s` and `%%`, and the `?` of SQLite and MySQL drivers, which
-/// sqruff does not read as values.
+/// psycopg's `%s`, `%(name)s` and `%%`, the `?` of SQLite and MySQL drivers, and the `{name}`
+/// fields of `str.format` and `sql.SQL` templates, which sqruff does not read as values.
 static PLACEHOLDER: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r"%(?:\([^)]*\))?[sbt]|%%|\?").unwrap());
+    LazyLock::new(|| Regex::new(r"%(?:\([^)]*\))?[sbt]|%%|\?|\{\w*\}").unwrap());
 
 /// `source` with every query string sqruff can lay out formatted in `dialect`.
 pub fn format_source(source: &str, dialect: &str, style: &ImportStyle) -> String {

{sqlty-0.4.0 → sqlty-0.5.1}/rust/crates/sqlty-lsp/src/actions.rs

@@ -13,7 +13,7 @@ use crate::text::LineIndex;
 use crate::{Diagnostic, Document, Severity};
 
 /// The rules reference; each rule is a heading of it.
-const RULES: &str = "https://jirikuncar.github.io/sqlty/reference/rules/";
+const RULES: &str = "https://sqlty.kuncar.dev/reference/rules/";
 
 pub(crate) fn diagnostic(diagnostic: &Diagnostic, index: &LineIndex<'_>) -> lsp_types::Diagnostic {
     lsp_types::Diagnostic {

{sqlty-0.4.0 → sqlty-0.5.1}/rust/crates/sqlty-lsp/src/tests.rs

@@ -261,7 +261,7 @@ fn diagnostics_are_published_in_utf16_units() {
     assert_eq!(diagnostic["severity"], 1);
     assert_eq!(
         diagnostic["codeDescription"]["href"],
-        "https://jirikuncar.github.io/sqlty/reference/rules/#stale-type"
+        "https://sqlty.kuncar.dev/reference/rules/#stale-type"
     );
     client.shutdown();
 }

{sqlty-0.4.0 → sqlty-0.5.1}/rust/crates/sqlty-python/src/checker.rs

@@ -27,7 +27,9 @@ use crate::rewriter::{
 use crate::rules::{Rule, RuleConfig, Severity};
 use crate::scan::Scan;
 use crate::tokens::{content, query_offset, Call};
-use sqlty_sql::analyzer::{expand_star, parse, row_type, Column, Parsed, SchemaData};
+use sqlty_sql::analyzer::{
+    expand_star, parse, route, row_type, unknown_database, Column, Parsed, SchemaData,
+};
 use sqlty_sql::diagnostics::{NameDiagnostic, NameRule};
 use std::ops::Range;
 
@@ -231,8 +233,9 @@ impl Checker<'_> {
         }
         #[cfg(test)]
         ANALYZED.with(|count| count.set(count.get() + 1));
-        let parsed = parse(query, self.options.dialect.name());
-        let (columns, diagnostics) = parsed.analyze_with_diagnostics(self.options.schema);
+        let (dialect, schema) = route(query, self.options.dialect.name(), self.options.schema);
+        let parsed = parse(query, dialect);
+        let (columns, diagnostics) = parsed.analyze_with_diagnostics(schema);
         let columns = columns.ok().flatten();
         let analysis = Rc::new(Analysis {
             row_type: columns.as_deref().and_then(row_type),
@@ -428,6 +431,11 @@ impl Checker<'_> {
                 fix.into_iter().collect(),
             );
         }
+        if let Some(message) = marked_query(sql_content)
+            .and_then(|query| unknown_database(&query, self.options.schema))
+        {
+            self.report(Rule::UnknownDatabase, message, at);
+        }
         if self.rules.is_enabled(Rule::UnparsedQuery) && !template {
             if let Some(error) =
                 marked_query(sql_content).and_then(|sql| self.analysis(&sql).parsed.error())
@@ -515,18 +523,14 @@ impl Checker<'_> {
             return;
         };
         let stars = self.analysis(&query).parsed.result_stars();
-        let Some((rule, message)) = star_finding(stars, &query, self.options.schema.is_some())
-        else {
+        let (dialect, schema) = route(&query, self.options.dialect.name(), self.options.schema);
+        let Some((rule, message)) = star_finding(stars, &query, schema.is_some()) else {
             return;
         };
-        let fix = match (rule, call.strings.as_slice(), self.options.schema) {
-            (Rule::SelectStar, [span], Some(schema)) => expanded_literal(
-                self.scan.source(),
-                span,
-                sql_content,
-                self.options.dialect.name(),
-                schema,
-            ),
+        let fix = match (rule, call.strings.as_slice(), schema) {
+            (Rule::SelectStar, [span], Some(schema)) => {
+                expanded_literal(self.scan.source(), span, sql_content, dialect, schema)
+            }
             _ => None,
         };
         self.report_fix(rule, message, at, fix.into_iter().collect());
@@ -541,10 +545,11 @@ impl Checker<'_> {
     /// Why a query has no row type, and what to do about it: the first name or construct
     /// the analyzer could not type, else the untyped columns.
     fn untyped_cause(&self, sql_content: &str) -> String {
-        let has_schema = self.options.schema.is_some_and(|schema| !schema.is_empty());
         let Some(query) = marked_query(sql_content) else {
             return "add casts (for example id::INTEGER) or a schema".to_string();
         };
+        let (_, schema) = route(&query, self.options.dialect.name(), self.options.schema);
+        let has_schema = schema.is_some_and(|schema| !schema.is_empty());
         let analysis = self.analysis(&query);
         if let Some(diagnostic) = analysis.diagnostics.first() {
             let hint = match diagnostic.rule {
@@ -719,8 +724,12 @@ fn expanded_literal(
 }
 
 /// A `--sql` marker line at the start of string content.
-static SQL_PREFIX: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r"(?s)^(\s*(?:--sql|-- sql)(?:\\r\\n|\\n|\r?\n))(.*)").unwrap());
+static SQL_PREFIX: LazyLock<Regex> = LazyLock::new(|| {
+    Regex::new(
+        r"(?s)^(\s*(?:--sql|-- sql)(?:[ \t]+sqlty:[ \t]*db=[\w-]+)?(?:\\r\\n|\\n|\r?\n))(.*)",
+    )
+    .unwrap()
+});
 
 const INLINE_MESSAGE: &str = r#""--sql SELECT ..." treats the query as a SQL comment; use "--sql\nSELECT ..." or run sqlty check --fix"#;