Skip to content

Commit 7b31a2d

Browse files
woutslakhorstwoutslakhorst
committed
select correct dialector
1 parent a26364f commit 7b31a2d

File tree

5 files changed

+17
-41
lines changed

5 files changed

+17
-41
lines changed

‎go.mod

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ require (
1111
github.com/cbroglie/mustache v1.4.0
1212
github.com/chromedp/chromedp v0.11.0
1313
github.com/dlclark/regexp2 v1.11.4
14-
github.com/glebarez/sqlite v1.11.0
1514
github.com/go-redis/redismock/v9 v9.2.0
1615
github.com/goodsign/monday v1.0.2
1716
github.com/google/uuid v1.6.0
@@ -60,7 +59,6 @@ require (
6059
gopkg.in/yaml.v3 v3.0.1
6160
gorm.io/driver/mysql v1.5.7
6261
gorm.io/driver/postgres v1.5.9
63-
gorm.io/driver/sqlite v1.5.6
6462
gorm.io/driver/sqlserver v1.5.3
6563
schneider.vip/problem v1.9.1
6664
)
@@ -196,17 +194,14 @@ require (
196194
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
197195
gopkg.in/Regis24GmbH/go-diacritics.v2 v2.0.3 // indirect
198196
gorm.io/gorm v1.25.12
199-
modernc.org/libc v1.55.3 // indirect
200197
modernc.org/mathutil v1.6.0 // indirect
201198
modernc.org/memory v1.8.0 // indirect
202199
modernc.org/sqlite v1.33.0
203200
rsc.io/qr v0.2.0 // indirect
204201
)
205202

206203
require (
207-
github.com/glebarez/go-sqlite v1.21.2 // indirect
208204
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
209-
github.com/mattn/go-sqlite3 v1.14.22 // indirect
210205
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
211206
modernc.org/strutil v1.2.0 // indirect
212207
modernc.org/token v1.1.0 // indirect

‎go.sum

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,6 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos
109109
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
110110
github.com/fxamacker/cbor v1.5.1 h1:XjQWBgdmQyqimslUh5r4tUGmoqzHmBFQOImkWGi2awg=
111111
github.com/fxamacker/cbor v1.5.1/go.mod h1:3aPGItF174ni7dDzd6JZ206H8cmr4GDNBGpPa971zsU=
112-
github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo=
113-
github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k=
114-
github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=
115-
github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ=
116112
github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
117113
github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
118114
github.com/go-co-op/gocron v1.28.3 h1:swTsge6u/1Ei51b9VLMz/YTzEzWpbsk5SiR7m5fklTI=
@@ -288,8 +284,6 @@ github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx
288284
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
289285
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
290286
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
291-
github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
292-
github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
293287
github.com/mdp/qrterminal/v3 v3.2.0 h1:qteQMXO3oyTK4IHwj2mWsKYYRBOp1Pj2WRYFYYNTCdk=
294288
github.com/mdp/qrterminal/v3 v3.2.0/go.mod h1:XGGuua4Lefrl7TLEsSONiD+UEjQXJZ4mPzF+gWYIJkk=
295289
github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6BbAxPY=
@@ -610,34 +604,20 @@ gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo=
610604
gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
611605
gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8=
612606
gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI=
613-
gorm.io/driver/sqlite v1.5.6 h1:fO/X46qn5NUEEOZtnjJRWRzZMe8nqJiQ9E+0hi+hKQE=
614-
gorm.io/driver/sqlite v1.5.6/go.mod h1:U+J8craQU6Fzkcvu8oLeAQmi50TkwPEhHDEjQZXDah4=
615607
gorm.io/driver/sqlserver v1.5.3 h1:rjupPS4PVw+rjJkfvr8jn2lJ8BMhT4UW5FwuJY0P3Z0=
616608
gorm.io/driver/sqlserver v1.5.3/go.mod h1:B+CZ0/7oFJ6tAlefsKoyxdgDCXJKSgwS2bMOQZT0I00=
617609
gorm.io/gorm v1.25.7-0.20240204074919-46816ad31dde/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
618610
gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
619611
gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
620612
gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
621-
modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ=
622-
modernc.org/cc/v4 v4.21.4/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ=
623-
modernc.org/ccgo/v4 v4.19.2 h1:lwQZgvboKD0jBwdaeVCTouxhxAyN6iawF3STraAal8Y=
624-
modernc.org/ccgo/v4 v4.19.2/go.mod h1:ysS3mxiMV38XGRTTcgo0DQTeTmAO4oCmJl1nX9VFI3s=
625613
modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
626614
modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
627-
modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw=
628-
modernc.org/gc/v2 v2.4.1/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
629615
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 h1:5D53IMaUuA5InSeMu9eJtlQXS2NxAhyWQvkKEgXZhHI=
630616
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
631-
modernc.org/libc v1.55.3 h1:AzcW1mhlPNrRtjS5sS+eW2ISCgSOLLNyFzRh/V3Qj/U=
632-
modernc.org/libc v1.55.3/go.mod h1:qFXepLhz+JjFThQ4kzwzOjA/y/artDeg+pcYnY+Q83w=
633617
modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
634618
modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
635619
modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
636620
modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU=
637-
modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
638-
modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
639-
modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc=
640-
modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss=
641621
modernc.org/sqlite v1.33.0 h1:WWkA/T2G17okiLGgKAj4/RMIvgyMT19yQ038160IeYk=
642622
modernc.org/sqlite v1.33.0/go.mod h1:9uQ9hF/pCZoYZK73D/ud5Z7cIRIILSZI8NdIemVMTX8=
643623
modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=

‎storage/engine.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ import (
3434
"github.com/nuts-foundation/nuts-node/core"
3535
"github.com/nuts-foundation/nuts-node/storage/log"
3636
"github.com/nuts-foundation/nuts-node/storage/sql_migrations"
37+
"github.com/nuts-foundation/nuts-node/storage/sqlite"
3738
"github.com/pressly/goose/v3"
3839
"github.com/redis/go-redis/v9"
3940
"github.com/sirupsen/logrus"
4041
"gorm.io/driver/mysql"
4142
"gorm.io/driver/postgres"
42-
"gorm.io/driver/sqlite"
4343
"gorm.io/driver/sqlserver"
4444
"gorm.io/gorm"
4545
_ "modernc.org/sqlite"
@@ -256,9 +256,9 @@ func (e *engine) initSQLDatabase() error {
256256
// With 1 connection, all actions will be performed sequentially. This impacts performance, but SQLite should not be used in production.
257257
// See https://github.com/nuts-foundation/nuts-node/pull/2589#discussion_r1399130608
258258
db.SetMaxOpenConns(1)
259-
e.sqlDB, err = gorm.Open(sqlite.New(sqlite.Config{
259+
e.sqlDB, err = gorm.Open(sqlite.Dialector{
260260
Conn: db,
261-
}), gormConfig)
261+
}, gormConfig)
262262
if err != nil {
263263
return err
264264
}

‎storage/sqlite/sqlite_dialector.go

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ package sqlite
2727
import (
2828
"context"
2929
"database/sql"
30+
"modernc.org/sqlite"
31+
sqlite3 "modernc.org/sqlite/lib"
3032
"strconv"
3133

3234
"gorm.io/gorm/callbacks"
@@ -257,19 +259,18 @@ func (dialectopr Dialector) RollbackTo(tx *gorm.DB, name string) error {
257259
}
258260

259261
func (dialector Dialector) Translate(err error) error {
262+
switch terr := err.(type) {
263+
case *sqlite.Error:
264+
switch terr.Code() {
265+
case sqlite3.SQLITE_CONSTRAINT_UNIQUE:
266+
return gorm.ErrDuplicatedKey
267+
case sqlite3.SQLITE_CONSTRAINT_PRIMARYKEY:
268+
return gorm.ErrDuplicatedKey
269+
case sqlite3.SQLITE_CONSTRAINT_FOREIGNKEY:
270+
return gorm.ErrForeignKeyViolated
271+
}
272+
}
260273
return err
261-
//switch terr := err.(type) {
262-
//case *gosqlite.Error:
263-
// switch terr.Code() {
264-
// case sqlite3.SQLITE_CONSTRAINT_UNIQUE:
265-
// return gorm.ErrDuplicatedKey
266-
// case sqlite3.SQLITE_CONSTRAINT_PRIMARYKEY:
267-
// return gorm.ErrDuplicatedKey
268-
// case sqlite3.SQLITE_CONSTRAINT_FOREIGNKEY:
269-
// return gorm.ErrForeignKeyViolated
270-
// }
271-
//}
272-
//return err
273274
}
274275

275276
func compareVersion(version1, version2 string) int {

‎vcr/revocation/bitstring_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package revocation
2020

2121
import (
2222
"database/sql"
23-
"github.com/glebarez/sqlite"
23+
"github.com/nuts-foundation/nuts-node/storage/sqlite"
2424
"github.com/stretchr/testify/assert"
2525
"github.com/stretchr/testify/require"
2626
"math/rand"

0 commit comments

Comments
 (0)