Skip to content

Commit f905d7e

Browse files
committed
Use renamed cel.dev/cel-go package & update to 0.32.0
1 parent a461f8a commit f905d7e

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

docs/howto/vet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
Rules are defined in the `sqlc` [configuration](../reference/config.md) file. They
88
consist of a name, message, and a [Common Expression Language
99
(CEL)](https://github.com/google/cel-spec) expression. Expressions are evaluated
10-
using [cel-go](https://github.com/google/cel-go). If an expression evaluates to
10+
using [cel-go](https://github.com/cel-expr/cel-go). If an expression evaluates to
1111
`true`, `sqlc vet` will report an error using the given message.
1212

1313
## Defining lint rules

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ go 1.26.0
55
toolchain go1.26.5
66

77
require (
8+
cel.dev/cel-go v0.32.0
89
github.com/cubicdaiya/gonp v1.0.4
910
github.com/davecgh/go-spew v1.1.1
1011
github.com/fatih/structtag v1.2.0
1112
github.com/go-sql-driver/mysql v1.10.0
12-
github.com/google/cel-go v0.31.0
1313
github.com/google/go-cmp v0.7.0
1414
github.com/jackc/pgx/v5 v5.10.0
1515
github.com/jinzhu/inflection v1.0.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
cel.dev/cel-go v0.32.0 h1:irvpFKr5EuGPyxeME03ERh0rii1TX+BDAnB9eL3IvNk=
2+
cel.dev/cel-go v0.32.0/go.mod h1:DnVip7tpJSsgZymwfT+m1tnEVy3ivAjSMXPx12YrMkU=
13
cel.dev/expr v0.25.2 h1:K6j46C81hXtZQfuX60cVWQFBJahKSE2gfRbNuvr5bFs=
24
cel.dev/expr v0.25.2/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
35
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
2325
github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk=
2426
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
2527
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
26-
github.com/google/cel-go v0.31.0 h1:H0bhpFTqOvmHrBGrWKp7ZlhBm5Hh8PYUEXnwxT1LL7A=
27-
github.com/google/cel-go v0.31.0/go.mod h1:X0bD6iVNR8pkROSOoHVdgTkzmRcosof7WQqCD6wcMc8=
2828
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
2929
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
3030
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=

internal/cmd/vet.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"encoding/json"
77
"errors"
88
"fmt"
9-
"github.com/sqlc-dev/sqlc/internal/constants"
109
"io"
1110
"log"
1211
"os"
@@ -17,14 +16,15 @@ import (
1716
"sync"
1817
"time"
1918

19+
"cel.dev/cel-go/cel"
20+
"cel.dev/cel-go/ext"
2021
_ "github.com/go-sql-driver/mysql"
21-
"github.com/google/cel-go/cel"
22-
"github.com/google/cel-go/ext"
2322
"github.com/jackc/pgx/v5"
2423
"github.com/spf13/cobra"
2524
"google.golang.org/protobuf/encoding/protojson"
2625

2726
"github.com/sqlc-dev/sqlc/internal/config"
27+
"github.com/sqlc-dev/sqlc/internal/constants"
2828
"github.com/sqlc-dev/sqlc/internal/dbmanager"
2929
"github.com/sqlc-dev/sqlc/internal/debug"
3030
"github.com/sqlc-dev/sqlc/internal/migrations"
@@ -140,7 +140,7 @@ func Vet(ctx context.Context, dir, filename string, opts *Options) error {
140140
rule := rule{Program: &prg, Message: c.Msg}
141141

142142
// TODO There's probably a nicer way to do this from the ast
143-
// https://pkg.go.dev/github.com/google/cel-go/common/ast#AllMatcher
143+
// https://pkg.go.dev/cel.dev/cel-go/common/ast#AllMatcher
144144
if strings.Contains(c.Rule, "postgresql.explain") ||
145145
strings.Contains(c.Rule, "mysql.explain") {
146146
rule.NeedsExplain = true

0 commit comments

Comments
 (0)