From f905d7e5ad33b8c176be48138dff63d96ba5262f Mon Sep 17 00:00:00 2001 From: Philipp Trulson Date: Wed, 2 Sep 2026 09:40:27 +0200 Subject: [PATCH] Use renamed cel.dev/cel-go package & update to 0.32.0 --- docs/howto/vet.md | 2 +- go.mod | 2 +- go.sum | 4 ++-- internal/cmd/vet.go | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/howto/vet.md b/docs/howto/vet.md index 1bcb089c58..5b39625301 100644 --- a/docs/howto/vet.md +++ b/docs/howto/vet.md @@ -7,7 +7,7 @@ Rules are defined in the `sqlc` [configuration](../reference/config.md) file. They consist of a name, message, and a [Common Expression Language (CEL)](https://github.com/google/cel-spec) expression. Expressions are evaluated -using [cel-go](https://github.com/google/cel-go). If an expression evaluates to +using [cel-go](https://github.com/cel-expr/cel-go). If an expression evaluates to `true`, `sqlc vet` will report an error using the given message. ## Defining lint rules diff --git a/go.mod b/go.mod index adc00663e9..c7d6e6340c 100644 --- a/go.mod +++ b/go.mod @@ -5,11 +5,11 @@ go 1.26.0 toolchain go1.26.5 require ( + cel.dev/cel-go v0.32.0 github.com/cubicdaiya/gonp v1.0.4 github.com/davecgh/go-spew v1.1.1 github.com/fatih/structtag v1.2.0 github.com/go-sql-driver/mysql v1.10.0 - github.com/google/cel-go v0.31.0 github.com/google/go-cmp v0.7.0 github.com/jackc/pgx/v5 v5.10.0 github.com/jinzhu/inflection v1.0.0 diff --git a/go.sum b/go.sum index 470a77bfd1..ab463ad4a2 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +cel.dev/cel-go v0.32.0 h1:irvpFKr5EuGPyxeME03ERh0rii1TX+BDAnB9eL3IvNk= +cel.dev/cel-go v0.32.0/go.mod h1:DnVip7tpJSsgZymwfT+m1tnEVy3ivAjSMXPx12YrMkU= cel.dev/expr v0.25.2 h1:K6j46C81hXtZQfuX60cVWQFBJahKSE2gfRbNuvr5bFs= cel.dev/expr v0.25.2/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= @@ -23,8 +25,6 @@ github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxo github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/cel-go v0.31.0 h1:H0bhpFTqOvmHrBGrWKp7ZlhBm5Hh8PYUEXnwxT1LL7A= -github.com/google/cel-go v0.31.0/go.mod h1:X0bD6iVNR8pkROSOoHVdgTkzmRcosof7WQqCD6wcMc8= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= diff --git a/internal/cmd/vet.go b/internal/cmd/vet.go index 38a808fdb1..b4a7fd7241 100644 --- a/internal/cmd/vet.go +++ b/internal/cmd/vet.go @@ -6,7 +6,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/sqlc-dev/sqlc/internal/constants" "io" "log" "os" @@ -17,14 +16,15 @@ import ( "sync" "time" + "cel.dev/cel-go/cel" + "cel.dev/cel-go/ext" _ "github.com/go-sql-driver/mysql" - "github.com/google/cel-go/cel" - "github.com/google/cel-go/ext" "github.com/jackc/pgx/v5" "github.com/spf13/cobra" "google.golang.org/protobuf/encoding/protojson" "github.com/sqlc-dev/sqlc/internal/config" + "github.com/sqlc-dev/sqlc/internal/constants" "github.com/sqlc-dev/sqlc/internal/dbmanager" "github.com/sqlc-dev/sqlc/internal/debug" "github.com/sqlc-dev/sqlc/internal/migrations" @@ -140,7 +140,7 @@ func Vet(ctx context.Context, dir, filename string, opts *Options) error { rule := rule{Program: &prg, Message: c.Msg} // TODO There's probably a nicer way to do this from the ast - // https://pkg.go.dev/github.com/google/cel-go/common/ast#AllMatcher + // https://pkg.go.dev/cel.dev/cel-go/common/ast#AllMatcher if strings.Contains(c.Rule, "postgresql.explain") || strings.Contains(c.Rule, "mysql.explain") { rule.NeedsExplain = true