Bump sql-psi 0.5.2 → 0.7.3 and sqldelight 2.1.0 → 2.3.2 (#167)

<!-- CURSOR_AGENT_PR_BODY_BEGIN -->
## Summary

Bumps the two core upstream dependencies together (they release as a
pair):

- `app.cash.sql-psi:core` **0.5.2 → 0.7.3**
- `app.cash.sqldelight:*` **2.1.0 → 2.3.2**

## What changed

1. **`gradle/libs.versions.toml`** — version bumps only.

2. **`cockroachdb-dialect/.../grammar/CockroachDB.bnf`** — added an
override for the new `enum_data_type` production that PostgreSQL added
in sqldelight 2.2.x. Upstream's `enum_data_type ::= {identifier}` is an
unrestricted wildcard that turned every identifier into a valid column
type, which broke parsing of CockroachDB-specific table-level constructs
like `FAMILY f1 (id, last_accessed)` (the parser greedily consumed
`FAMILY f1` as a `column_def` instead of falling back to
`table_family_constraint`). The override replaces the production with a
never-matching placeholder.

Trade-off documented in a code comment: this dialect doesn't currently
parse `CREATE TYPE ... AS ENUM` either (it isn't part of cockroach's
`extension_stmt` override), so removing the wildcard has no functional
regression today.

3. **`cockroachdb-dialect/.../CockroachDBFixturesTest.kt`** — extended
the existing `excludedAnsiFixtures` and `excludedPgSqlFixtures` lists
for inherited test fixtures whose statements aren't currently parseable
by this dialect, with explanatory comments grouped by reason:
- SQLite-style `CREATE TRIGGER ... BEGIN ... END;` ANSI fixtures (the
PostgreSQL trigger grammar is `EXECUTE FUNCTION fn();`).
- `DROP TRIGGER IF EXISTS test;` without `ON tablename` (SQLite syntax).
- PostgreSQL-only DDL added in sqldelight 2.2.x / 2.3.x:
CREATE/ALTER/DROP POLICY, CREATE TYPE/ENUM, CREATE/DROP FUNCTION,
COMMENT ON, DROP TRIGGER, CREATE OR REPLACE TRIGGER, ALTER TABLE … ROW
LEVEL SECURITY, ALTER TABLE … SET (storage_param=…). All valid
CockroachDB SQL but not yet wired into this dialect's `extension_stmt` /
`alter_table_rules` overrides.

## Verification

```
./gradlew :cockroachdb-dialect:test       # 174 fixture tests, 0 failures
./gradlew :integration-testing:assemble :integration-testing:compileTestKotlin
./gradlew spotlessCheck
./gradlew check -x :integration-testing:test    # all green locally
```

`./gradlew :integration-testing:test` was not run locally (requires
Docker for testcontainers + CockroachDB image, not available in the dev
VM). CI on this PR will exercise it.

## Out of scope / follow-ups

Extending the cockroach grammar to actually parse policies, enums,
functions, comment-on, row-level-security, set-storage-parameter, and
the new trigger forms. CockroachDB does support these on the database
side; the work is to add productions to `extension_stmt` /
`alter_table_rules` and likely new mixins. That would also let us drop
most of the new exclusions and replace the `enum_data_type` placeholder
with the real production.
<!-- CURSOR_AGENT_PR_BODY_END -->

<div><a
href="https://cursor.com/agents/bc-fd4519a4-4bc1-42cd-9d8d-c77c1421faff"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://cursor.com/assets/images/open-in-web-dark.png"><source
media="(prefers-color-scheme: light)"
srcset="https://cursor.com/assets/images/open-in-web-light.png"><img
alt="Open in Web" width="114" height="28"
src="https://cursor.com/assets/images/open-in-web-dark.png"></picture></a>&nbsp;<a
href="https://cursor.com/background-agent?bcId=bc-fd4519a4-4bc1-42cd-9d8d-c77c1421faff"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://cursor.com/assets/images/open-in-cursor-dark.png"><source
media="(prefers-color-scheme: light)"
srcset="https://cursor.com/assets/images/open-in-cursor-light.png"><img
alt="Open in Cursor" width="131" height="28"
src="https://cursor.com/assets/images/open-in-cursor-dark.png"></picture></a>&nbsp;</div>

---------

Co-authored-by: Cursor Agent <cursor-agent@cursor.sh>

Author: Hexcles

cockroachdb-dialect/src/main/kotlin/com/faire/sqldelight/dialects/cockroachdb/grammar/CockroachDB.bnf

@@ -100,6 +100,7 @@ overrides ::= table_constraint
   | string_data_type
   | date_data_type
   | blob_data_type
+  | enum_data_type
   | generated_clause
   | alter_table_rules
   | extension_stmt
@@ -187,6 +188,15 @@ blob_data_type ::= 'BYTEA' | 'BLOB' | 'BYTES' {
   override = true
 }
 
+// PostgreSQL added enum_data_type as an unrestricted identifier wildcard. That makes any token
+// (e.g. FAMILY in a CockroachDB family constraint) eligible as a column type, which prevents the
+// parser from falling back to table_constraint alternatives. CockroachDB supports CREATE TYPE AS
+// ENUM but this dialect does not currently parse it, so we override the production with a never-
+// matching placeholder token.
+enum_data_type ::= 'COCKROACHDB_ENUM_DATA_TYPE_DISABLED_PLACEHOLDER' {
+  override = true
+}
+
 create_index_stmt ::= CREATE [ UNIQUE ] INDEX [ 'CONCURRENTLY' ] [ IF NOT EXISTS ] [ [ ansi_database_name DOT ] ansi_index_name ] ON ansi_table_name (
   USING {index_method} LP ansi_indexed_column [ {operator_class_stmt} ] ( COMMA ansi_indexed_column [ {operator_class_stmt} ] ) * RP [ {with_storage_parameter} ] |
   LP ansi_indexed_column [ {operator_class_stmt} ] ( COMMA ansi_indexed_column [ {operator_class_stmt} ] ) * RP [ index_using_hash ] [ ('STORING' | 'COVERING' | 'INCLUDE') LP ansi_indexed_column ( COMMA ansi_indexed_column ) * RP ] [ WHERE <<expr '-1'>> ]

cockroachdb-dialect/src/test/kotlin/com/faire/sqldelight/dialects/cockroachdb/CockroachDBFixturesTest.kt

@@ -23,16 +23,33 @@ import java.io.File
 
 @RunWith(Parameterized::class)
 class CockroachDBFixturesTest(name: String, fixtureRoot: File) : FixturesTest(name, fixtureRoot) {
+  // The upstream sql-psi ANSI fixtures are written for a SQLite-flavored dialect. These
+  // text substitutions translate the most common SQLite-isms into their
+  // CockroachDB / PostgreSQL equivalents before the fixture is parsed:
+  //
+  //  - INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT  -> SERIAL NOT NULL PRIMARY KEY
+  //    SQLite's AUTOINCREMENT only applies to INTEGER PRIMARY KEY columns; CockroachDB uses
+  //    SERIAL (https://www.cockroachlabs.com/docs/stable/serial).
+  //  - AUTOINCREMENT -> ""  (drop the keyword everywhere else; column types like SERIAL
+  //    auto-increment by default in CockroachDB).
+  //  - ?1 / ?2 -> ?  CockroachDB/PostgreSQL bind parameters are positional ($1, $2, ...) or
+  //    unnumbered ?, not ?1/?2.
+  //  - BLOB -> TEXT  CockroachDB has BYTEA/BYTES/BLOB, but the upstream BLOB-typed columns
+  //    are usually used in TEXT-comparison contexts; mapping to TEXT keeps the test green
+  //    without changing what's being asserted.
+  //  - "id TEXT GENERATED ALWAYS AS (2) ... NOT NULL" gets a STORED keyword inserted because
+  //    PostgreSQL/CockroachDB require GENERATED ALWAYS AS (...) STORED (no VIRTUAL form for
+  //    PostgreSQL; CockroachDB allows STORED or VIRTUAL).
+  //
+  // (The previously-present rule rewriting the multiple-column-where parser-error message
+  // was dead code: that fixture is excluded entirely below.)
   override val replaceRules = arrayOf(
-    // TODO: document why
     "INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT" to "SERIAL NOT NULL PRIMARY KEY",
     "AUTOINCREMENT" to "",
     "?1" to "?",
     "?2" to "?",
     "BLOB" to "TEXT",
     "id TEXT GENERATED ALWAYS AS (2) UNIQUE NOT NULL" to "id TEXT GENERATED ALWAYS AS (2) STORED UNIQUE NOT NULL",
-    "'(', ')', ',', '.', <binary like operator real>, BETWEEN or IN expected, got ','"
-      to "'#-', '(', ')', ',', '.', <binary like operator real>, <jsona binary operator real>, <jsonb boolean operator real>, '@@', BETWEEN or IN expected, got ','",
   )
 
   override fun setupDialect() {
@@ -41,23 +58,128 @@ class CockroachDBFixturesTest(name: String, fixtureRoot: File) : FixturesTest(na
 
   companion object {
     private val excludedAnsiFixtures = listOf(
-      // Excluded since we're not validating indices when dropping them.
+      // The cockroach grammar's CreateIndexMixin and DropIndexMixin intentionally leave
+      // modifySchema()/annotate() empty (see those files for rationale: CockroachDB allows
+      // unnamed indexes, indexes declared inline in CREATE TABLE, and the same index name
+      // across different tables, none of which the upstream sql-psi schema tracker handles).
+      // The result is that we don't currently surface "duplicate index name" / "no index
+      // found" diagnostics, which these fixtures assert.
+      //
+      // TODO(validation): CockroachDB does enforce index-name uniqueness within a single
+      // table (see https://www.cockroachlabs.com/docs/stable/create-index). Once unnamed
+      // indexes and inline-CREATE-TABLE indexes are tracked in the schema, these fixtures
+      // could be re-enabled.
       "index-migration",
-      // Excluded since we're not validating indices when creating them.
+      "create-index-collision",
+      // Mostly exercises CREATE TABLE foreign-key constraint validation (composite primary
+      // key matching, "unique index on column" lookups, duplicate primary key clauses, etc.)
+      // — all of which CockroachDB does enforce — but several assertions also depend on
+      // index tracking (see above). Excluded because of the index-tracking gap.
+      //
+      // TODO(validation): split or re-enable once CockroachDB index tracking is implemented.
       "create-table-validation-failures",
-      // Excluded since we're not validating indices when creating them.
+      // Tests CREATE TABLE/VIEW/INDEX/TRIGGER + IF NOT EXISTS collision detection. The
+      // CREATE INDEX collision lines hit the same index-tracking gap as above, and the
+      // CREATE TRIGGER lines use SQLite-style `BEGIN ... END;` trigger bodies that neither
+      // PostgreSQL nor CockroachDB parse (CockroachDB uses `EXECUTE FUNCTION fn()`).
       "create-if-not-exists",
-      // Excluded since we're not validating indices when creating them.
-      "create-index-collision",
-      // Excluded since our error message is different;
-      // we've copied the test case, but without the failure case, into `multiple-column-where-ansi`.
+      // The fixture asserts a parser error message that is shorter than what cockroach
+      // actually emits, because the cockroach/postgres expression grammar adds many extra
+      // operator alternatives (`<jsona binary operator real>`, `<jsonb boolean operator
+      // real>`, `'#-'`, `'@@'`, `<contains operator real>`, etc.) to the "expected" list.
+      // We've copied the valid-syntax half of this fixture to `multiple-column-where-ansi`.
+      // Not a CockroachDB feature gap.
       "multiple-column-where",
+      // The following ANSI fixtures use SQLite-style `CREATE TRIGGER ... BEGIN ... END;`
+      // syntax, which is not parseable by the PostgreSQL dialect (which we inherit from)
+      // and is not the form CockroachDB accepts either. CockroachDB's CREATE TRIGGER uses
+      // the PostgreSQL-style `EXECUTE FUNCTION fn()` form (since v24.3 LTS, see
+      // https://www.cockroachlabs.com/docs/stable/create-trigger), so these SQLite-flavored
+      // fixtures can't be supported as-written.
+      "create-trigger-collision",
+      "create-trigger-docid",
+      "create-trigger-raise",
+      "create-trigger-success",
+      "create-trigger-validation-failures",
+      "rowid-triggers",
+      "timestamp-literals",
+      "trigger-migration",
+      "trigger-new-in-expression",
+      "update-view-with-trigger",
+      // `DROP TRIGGER IF EXISTS test3;` (no `ON tablename`) is SQLite syntax. The
+      // PostgreSQL dialect (and CockroachDB, see
+      // https://www.cockroachlabs.com/docs/stable/drop-trigger) require
+      // `DROP TRIGGER ... ON tablename`. The CREATE TRIGGER block in this fixture is also
+      // SQLite-flavored.
+      "if-not-exists",
     )
 
     private val excludedPgSqlFixtures = listOf(
-      // Excluded since we're not validating indices when creating them;
-      // we've copied the test case, but without error assertions, into `create-index-pgsql`.
+      // The fixture asserts on PostgreSQL's index storage-parameter validators (fillfactor,
+      // deduplicate_items, fastupdate, gin_pending_list_limit, autosummarize, pages_per_range
+      // ranges/booleans). The cockroach `create_index_stmt` in CockroachDB.bnf includes
+      // [ {with_storage_parameter} ] syntactically but does not run those validators (the
+      // cockroach CreateIndexMixin overrides annotate() with a no-op). We've copied the
+      // valid-syntax half of this fixture to `create-index-pgsql` (without error
+      // assertions).
+      //
+      // TODO(validation): CockroachDB does support / reject storage parameters on indexes
+      // (https://www.cockroachlabs.com/docs/stable/create-index), and the cockroach-specific
+      // ones (e.g. `bucket_count` for hash-sharded indexes) ought to be validated here too.
+      // Once index tracking is wired up (see excludedAnsiFixtures above) the storage-param
+      // validation could be inherited from the postgres mixin.
       "create-index",
+      // The following PostgreSQL fixtures exercise statements added to PostgreSQL's
+      // `extension_stmt` / `alter_table_rules` rules in sqldelight 2.2.x / 2.3.x. CockroachDB's
+      // grammar overrides those rules without these productions, so they currently fail to
+      // parse. Each is supported by CockroachDB itself and would be a worthwhile follow-up.
+      //
+      // TODO(grammar): Add CREATE/ALTER/DROP POLICY to the cockroach `extension_stmt` rule.
+      // CockroachDB supports row-level security policies as of v25.2 with PostgreSQL-compatible
+      // syntax. https://www.cockroachlabs.com/docs/stable/create-policy
+      "alter-policy",
+      "create-policy",
+      "drop-policy",
+      // TODO(grammar): Add COMMENT ON to the cockroach `extension_stmt` rule. CockroachDB
+      // supports `COMMENT ON DATABASE/SCHEMA/TYPE/TABLE/COLUMN/INDEX/CONSTRAINT` (note: VIEW is
+      // not currently listed in the CockroachDB docs, so the upstream fixture's
+      // `COMMENT ON VIEW VSomeTable IS '...'` line may need a dialect-specific variant).
+      // https://www.cockroachlabs.com/docs/stable/comment-on
+      "comment-on",
+      // TODO(grammar): Add CREATE/ALTER/DROP TYPE (enum) to the cockroach `extension_stmt`
+      // rule. CockroachDB supports `CREATE TYPE name AS ENUM (...)`, `ALTER TYPE`, and
+      // `DROP TYPE` with PostgreSQL-compatible syntax.
+      // https://www.cockroachlabs.com/docs/stable/create-type
+      "create-enum",
+      // TODO(grammar): Add CREATE/DROP FUNCTION to the cockroach `extension_stmt` rule.
+      // CockroachDB has supported user-defined functions since v22.2.
+      // https://www.cockroachlabs.com/docs/stable/create-function
+      // https://www.cockroachlabs.com/docs/stable/drop-function
+      "drop-function",
+      // TODO(grammar): Add CREATE TRIGGER / CREATE OR REPLACE TRIGGER / DROP TRIGGER to the
+      // cockroach grammar. CockroachDB supports triggers (since v24.3 LTS) with the
+      // PostgreSQL-style `EXECUTE FUNCTION fn()` form, and `CREATE OR REPLACE TRIGGER` since
+      // v26.2. The upstream fixtures should pass once these productions are inherited.
+      // https://www.cockroachlabs.com/docs/stable/create-trigger
+      // https://www.cockroachlabs.com/docs/stable/drop-trigger
+      "create-or-replace-trigger",
+      "drop-trigger",
+      // TODO(grammar): Add `ALTER TABLE ... { ENABLE | DISABLE } ROW LEVEL SECURITY` to the
+      // cockroach `alter_table_rules` rule. CockroachDB supports both subcommands as of v25.2.
+      // The upstream fixture also exercises `FORCE ROW LEVEL SECURITY`, which is not currently
+      // documented as supported by CockroachDB; that line may need a dialect-specific variant.
+      // https://www.cockroachlabs.com/docs/stable/alter-table#enable-row-level-security
+      "alter-table-row-level-security",
+      // TODO(grammar): Add support for PostgreSQL's `ALTER TABLE ... SET (param = value)` /
+      // `RESET (...)` storage-parameter form to the cockroach `alter_table_rules` rule.
+      // CockroachDB does support a SET (storage parameter) form on ALTER TABLE, although the
+      // set of accepted parameters differs from PostgreSQL (CockroachDB-specific TTL/stats
+      // parameters are real, while several PostgreSQL parameters such as `fillfactor` and
+      // `autovacuum_vacuum_scale_factor` are parsed as no-ops or unsupported). Cockroach's
+      // current `alter_table_set_storage_options` rule covers a different cockroach-only
+      // `WITH (k=v)` form.
+      // https://www.cockroachlabs.com/docs/stable/alter-table
+      "alter-table-set-storage-parameter",
     )
 
     // Used by Parameterized JUnit runner reflectively.

gradle.properties

@@ -2,4 +2,4 @@ org.gradle.parallel=true
 
 GROUP=com.faire
 POM_ARTIFACT_ID=sqldelight-cockroachdb-dialect
-VERSION_NAME=0.7.0
+VERSION_NAME=0.8.0

gradle/libs.versions.toml

@@ -2,8 +2,8 @@
 idea = "231.9392.1"
 kotlin = "2.3.20"
 spotless = "8.4.0"
-sql-psi = "0.5.2"
-sqldelight = "2.1.0"
+sql-psi = "0.7.3"
+sqldelight = "2.3.2"
 
 [libraries]
 assertj-core = { module = "org.assertj:assertj-core", version = "3.27.7" }