Skip to content

Commit ecb0491

Browse files
kyleconroykyleconroy
authored
feat(sqlite): Switch from mattn/go-sqlite3 to modernc.org/sqlite (#3040)
After merging #3027, I've been working on getting sqlc to work without CGO. mattn/go-sqlite3 requires CGO, so I've switched to modernc.org/sqlite which does not.
1 parent 4a05999 commit ecb0491

File tree

8 files changed

+78
-19
lines changed

8 files changed

+78
-19
lines changed

‎.github/workflows/ci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,21 @@ on:
77
jobs:
88
test:
99
strategy:
10+
max-parallel: 2
1011
matrix:
1112
os: [ubuntu-latest, macos-latest, windows-latest]
1213
cgo: ['1', '0']
1314
# Workaround no native support for conditional matrix items
1415
# https://github.com/orgs/community/discussions/26253#discussioncomment-6745038
15-
isMain:
16+
isMain:
1617
- ${{ github.ref == 'refs/heads/main' }}
1718
exclude:
1819
- isMain: false
1920
include:
20-
- os: ubuntu-latest
21-
cgo: '1'
22-
- os: ubuntu-latest
23-
cgo: '0'
21+
- os: ubuntu-latest
22+
cgo: '1'
23+
- os: ubuntu-latest
24+
cgo: '0'
2425
name: test ${{ matrix.os }} cgo=${{ matrix.cgo }}
2526
runs-on: ${{ matrix.os }}
2627

‎examples/authors/sqlite/db_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build examples && cgo
2-
// +build examples,cgo
1+
//go:build examples
2+
// +build examples
33

44
package authors
55

‎examples/booktest/sqlite/db_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build examples && cgo
2-
// +build examples,cgo
1+
//go:build examples
2+
// +build examples
33

44
package booktest
55

‎examples/ondeck/sqlite/db_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build examples && cgo
2-
// +build examples,cgo
1+
//go:build examples
2+
// +build examples
33

44
package ondeck
55

‎go.mod

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ require (
77
github.com/bytecodealliance/wasmtime-go/v14 v14.0.0
88
github.com/cubicdaiya/gonp v1.0.4
99
github.com/davecgh/go-spew v1.1.1
10+
github.com/fatih/structtag v1.2.0
1011
github.com/go-sql-driver/mysql v1.7.1
1112
github.com/google/cel-go v0.18.2
1213
github.com/google/go-cmp v0.6.0
1314
github.com/jackc/pgx/v4 v4.18.1
1415
github.com/jackc/pgx/v5 v5.5.0
1516
github.com/jinzhu/inflection v1.0.0
1617
github.com/lib/pq v1.10.9
17-
github.com/mattn/go-sqlite3 v1.14.18
1818
github.com/pganalyze/pg_query_go/v4 v4.2.4-0.20231205012101-7463430c7b73
1919
github.com/pingcap/tidb/pkg/parser v0.0.0-20231103154709-4f00ece106b1
2020
github.com/riza-io/grpc-go v0.2.0
@@ -26,15 +26,15 @@ require (
2626
google.golang.org/grpc v1.59.0
2727
google.golang.org/protobuf v1.31.0
2828
gopkg.in/yaml.v3 v3.0.1
29+
modernc.org/sqlite v1.27.0
2930
)
3031

31-
require github.com/wasilibs/wazerox v0.0.0-20231117065139-b3503f4aeff6 // indirect
32-
3332
require (
3433
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3534
github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 // indirect
36-
github.com/fatih/structtag v1.2.0
35+
github.com/dustin/go-humanize v1.0.1 // indirect
3736
github.com/golang/protobuf v1.5.3 // indirect
37+
github.com/google/uuid v1.3.1 // indirect
3838
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3939
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
4040
github.com/jackc/pgconn v1.14.1 // indirect
@@ -44,23 +44,38 @@ require (
4444
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
4545
github.com/jackc/pgtype v1.14.0 // indirect
4646
github.com/jackc/puddle/v2 v2.2.1 // indirect
47+
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
48+
github.com/mattn/go-isatty v0.0.16 // indirect
49+
github.com/mattn/go-sqlite3 v1.14.18 // indirect
4750
github.com/pingcap/errors v0.11.5-0.20210425183316-da1aaba5fb63 // indirect
4851
github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c // indirect
4952
github.com/pingcap/log v1.1.0 // indirect
5053
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
5154
github.com/rogpeppe/go-internal v1.10.0 // indirect
5255
github.com/stoewer/go-strcase v1.2.0 // indirect
56+
github.com/wasilibs/wazerox v0.0.0-20231117065139-b3503f4aeff6 // indirect
5357
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
5458
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
5559
go.uber.org/atomic v1.11.0 // indirect
5660
go.uber.org/multierr v1.11.0 // indirect
5761
go.uber.org/zap v1.26.0 // indirect
5862
golang.org/x/crypto v0.14.0 // indirect
5963
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
64+
golang.org/x/mod v0.13.0 // indirect
6065
golang.org/x/net v0.17.0 // indirect
6166
golang.org/x/sys v0.13.0 // indirect
6267
golang.org/x/text v0.14.0 // indirect
68+
golang.org/x/tools v0.14.0 // indirect
6369
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
6470
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
6571
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
72+
lukechampine.com/uint128 v1.2.0 // indirect
73+
modernc.org/cc/v3 v3.40.0 // indirect
74+
modernc.org/ccgo/v3 v3.16.13 // indirect
75+
modernc.org/libc v1.29.0 // indirect
76+
modernc.org/mathutil v1.6.0 // indirect
77+
modernc.org/memory v1.7.2 // indirect
78+
modernc.org/opt v0.1.3 // indirect
79+
modernc.org/strutil v1.2.0 // indirect
80+
modernc.org/token v1.0.1 // indirect
6681
)

‎go.sum

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548/go.mod h1:e6NPNENfs
2020
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2121
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2222
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
23+
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
24+
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
2325
github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4=
2426
github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
2527
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
@@ -37,7 +39,11 @@ github.com/google/cel-go v0.18.2/go.mod h1:kWcIzTsPX0zmQ+H3TirHstLLf9ep5QTsZBN9u
3739
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
3840
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
3941
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
42+
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ=
43+
github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo=
4044
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
45+
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
46+
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
4147
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
4248
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
4349
github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
@@ -95,6 +101,8 @@ github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk
95101
github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
96102
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
97103
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
104+
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
105+
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
98106
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
99107
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
100108
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -117,6 +125,8 @@ github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
117125
github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
118126
github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
119127
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
128+
github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
129+
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
120130
github.com/mattn/go-sqlite3 v1.14.18 h1:JL0eqdCOq6DJVNPSvArO/bIV9/P7fbGrV00LZHc+5aI=
121131
github.com/mattn/go-sqlite3 v1.14.18/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
122132
github.com/pganalyze/pg_query_go/v4 v4.2.4-0.20231205012101-7463430c7b73 h1:vZEujakYrBzd7CWMwqTsDRU7bdRm4Aiu76X9K3P+qtI=
@@ -231,6 +241,8 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl
231241
golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
232242
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
233243
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
244+
golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY=
245+
golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
234246
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
235247
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
236248
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -258,6 +270,7 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
258270
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
259271
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
260272
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
273+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
261274
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
262275
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
263276
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -285,6 +298,8 @@ golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtn
285298
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
286299
golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
287300
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
301+
golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc=
302+
golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
288303
golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
289304
golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
290305
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -319,3 +334,31 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C
319334
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
320335
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
321336
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
337+
lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
338+
lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
339+
modernc.org/cc/v3 v3.40.0 h1:P3g79IUS/93SYhtoeaHW+kRCIrYaxJ27MFPv+7kaTOw=
340+
modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
341+
modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw=
342+
modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
343+
modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk=
344+
modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
345+
modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
346+
modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
347+
modernc.org/libc v1.29.0 h1:tTFRFq69YKCF2QyGNuRUQxKBm1uZZLubf6Cjh/pVHXs=
348+
modernc.org/libc v1.29.0/go.mod h1:DaG/4Q3LRRdqpiLyP0C2m1B8ZMGkQ+cCgOIjEtQlYhQ=
349+
modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
350+
modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
351+
modernc.org/memory v1.7.2 h1:Klh90S215mmH8c9gO98QxQFsY+W451E8AnzjoE2ee1E=
352+
modernc.org/memory v1.7.2/go.mod h1:NO4NVCQy0N7ln+T9ngWqOQfi7ley4vpwvARR+Hjw95E=
353+
modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
354+
modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
355+
modernc.org/sqlite v1.27.0 h1:MpKAHoyYB7xqcwnUwkuD+npwEa0fojF0B5QRbN+auJ8=
356+
modernc.org/sqlite v1.27.0/go.mod h1:Qxpazz0zH8Z1xCFyi5GSL3FzbtZ3fvbjmywNogldEW0=
357+
modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
358+
modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
359+
modernc.org/tcl v1.15.2 h1:C4ybAYCGJw968e+Me18oW55kD/FexcHbqH2xak1ROSY=
360+
modernc.org/tcl v1.15.2/go.mod h1:3+k/ZaEbKrC8ePv8zJWPtBSW0V7Gg9g8rkmhI1Kfs3c=
361+
modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg=
362+
modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
363+
modernc.org/z v1.7.3 h1:zDJf6iHjrnB+WRD88stbXokugjyc0/pB91ri1gO6LZY=
364+
modernc.org/z v1.7.3/go.mod h1:Ipv4tsdxZRbQyLq9Q1M6gdbkxYzdlrciF2Hi/lS7nWE=

‎internal/cmd/vet.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import (
1818
"github.com/google/cel-go/cel"
1919
"github.com/google/cel-go/ext"
2020
"github.com/jackc/pgx/v5"
21-
_ "github.com/mattn/go-sqlite3"
2221
"github.com/spf13/cobra"
2322
"google.golang.org/protobuf/encoding/protojson"
23+
_ "modernc.org/sqlite"
2424

2525
"github.com/sqlc-dev/sqlc/internal/config"
2626
"github.com/sqlc-dev/sqlc/internal/debug"
@@ -529,7 +529,7 @@ func (c *checker) checkSQL(ctx context.Context, s config.SQL) error {
529529
prep = &dbPreparer{db}
530530
expl = &mysqlExplainer{db}
531531
case config.EngineSQLite:
532-
db, err := sql.Open("sqlite3", dburl)
532+
db, err := sql.Open("sqlite", dburl)
533533
if err != nil {
534534
return fmt.Errorf("database: connection error: %s", err)
535535
}

‎internal/sqltest/sqlite.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88

99
"github.com/sqlc-dev/sqlc/internal/sql/sqlpath"
1010

11-
_ "github.com/mattn/go-sqlite3"
11+
_ "modernc.org/sqlite"
1212
)
1313

1414
func SQLite(t *testing.T, migrations []string) (*sql.DB, func()) {
@@ -25,7 +25,7 @@ func CreateSQLiteDatabase(t *testing.T, path string, migrations []string) (*sql.
2525
t.Helper()
2626

2727
t.Logf("open %s\n", path)
28-
sdb, err := sql.Open("sqlite3", path)
28+
sdb, err := sql.Open("sqlite", path)
2929
if err != nil {
3030
t.Fatal(err)
3131
}

0 commit comments

Comments
 (0)