Skip to content

Commit fe0163d

Browse files
ngjayingngjaying
committed
chore: use mattn/sqlite3
Signed-off-by: Jiyong Huang <huangjy@emqx.io>
1 parent 2b2ccdf commit fe0163d

File tree

7 files changed

+9
-61
lines changed

7 files changed

+9
-61
lines changed

‎extensions/impl/sql/client/dburl.go‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package client
1717
import (
1818
"database/sql"
1919
"fmt"
20-
"strings"
2120

2221
"github.com/xo/dburl"
2322

@@ -31,10 +30,6 @@ func ParseDBUrl(urlstr string) (string, string, error) {
3130
return "", "", err
3231
}
3332
// Open returns *sql.DB from urlstr
34-
// As we use modernc.org/sqlite with `sqlite` as driver name and dburl use `sqlite3` as driver name, we need to fix it before open sql.DB
35-
if strings.ToLower(u.Driver) == "sqlite3" {
36-
u.Driver = "sqlite"
37-
}
3833
return u.Driver, u.DSN, nil
3934
}
4035

‎extensions/impl/sql/sqldatabase/driver/moderncsqlite.go‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎extensions/impl/sql/sqldatabase/driver/sqlite3.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
package driver
1818

1919
import (
20-
_ "modernc.org/sqlite" // SQLite3 driver
20+
_ "github.com/mattn/go-sqlite3" // SQLite3 driver
2121
)

‎go.mod‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ require (
5050
github.com/lf-edge/ekuiper/contract/v2 v2.3.1
5151
github.com/lib/pq v1.10.9
5252
github.com/mattn/go-adodb v0.0.1
53+
github.com/mattn/go-sqlite3 v1.14.37
5354
github.com/mattn/go-tflite v1.0.5
5455
github.com/mitchellh/mapstructure v1.5.0
5556
github.com/mmcloughlin/geohash v0.10.0
@@ -101,7 +102,6 @@ require (
101102
gopkg.in/ini.v1 v1.67.0
102103
gopkg.in/yaml.v3 v3.0.1
103104
modernc.org/ql v1.4.7
104-
modernc.org/sqlite v1.29.10
105105
sqlflow.org/gohive v0.0.0-20240730014249-8960223660e2
106106
sqlflow.org/gomaxcompute v0.0.0-20210805062559-c14ae028b44c
107107
)
@@ -198,7 +198,6 @@ require (
198198
github.com/dolthub/go-icu-regex v0.0.0-20230524105445-af7e7991c97e // indirect
199199
github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 // indirect
200200
github.com/dolthub/vitess v0.0.0-20240404214255-c5a87fc7b325 // indirect
201-
github.com/dustin/go-humanize v1.0.1 // indirect
202201
github.com/dvsekhvalnov/jose2go v1.7.0 // indirect
203202
github.com/edsrzf/mmap-go v1.1.0 // indirect
204203
github.com/elastic/go-sysinfo v1.8.1 // indirect
@@ -251,7 +250,6 @@ require (
251250
github.com/hashicorp/go-multierror v1.1.1 // indirect
252251
github.com/hashicorp/go-uuid v1.0.3 // indirect
253252
github.com/hashicorp/golang-lru v1.0.2 // indirect
254-
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
255253
github.com/huandu/xstrings v1.5.0 // indirect
256254
github.com/icholy/digest v0.1.22 // indirect
257255
github.com/influxdata/line-protocol v0.0.0-20210922203350-b1ad95c89adf // indirect
@@ -297,7 +295,6 @@ require (
297295
github.com/nats-io/nats.go v1.39.1 // indirect
298296
github.com/nats-io/nkeys v0.4.9 // indirect
299297
github.com/nats-io/nuid v1.0.1 // indirect
300-
github.com/ncruces/go-strftime v0.1.9 // indirect
301298
github.com/nxadm/tail v1.4.11 // indirect
302299
github.com/oapi-codegen/runtime v1.1.1 // indirect
303300
github.com/oklog/ulid v1.3.1 // indirect
@@ -385,16 +382,12 @@ require (
385382
modernc.org/db v1.0.10 // indirect
386383
modernc.org/file v1.0.8 // indirect
387384
modernc.org/fileutil v1.3.0 // indirect
388-
modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b // indirect
389385
modernc.org/golex v1.1.0 // indirect
390386
modernc.org/internal v1.1.0 // indirect
391-
modernc.org/libc v1.50.9 // indirect
392387
modernc.org/lldb v1.0.8 // indirect
393388
modernc.org/mathutil v1.6.0 // indirect
394-
modernc.org/memory v1.8.0 // indirect
395389
modernc.org/sortutil v1.2.0 // indirect
396390
modernc.org/strutil v1.2.0 // indirect
397-
modernc.org/token v1.1.0 // indirect
398391
modernc.org/zappy v1.1.0 // indirect
399392
nhooyr.io/websocket v1.8.17 // indirect
400393
)

‎go.sum‎

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,6 @@ github.com/dolthub/vitess v0.0.0-20240404214255-c5a87fc7b325/go.mod h1:Xy89nzEyI
585585
github.com/dop251/goja v0.0.0-20240828124009-016eb7256539 h1:YIxvsQAoCLGScK2c9ag+4sFCgiQFpMzywJG6dQZFu9k=
586586
github.com/dop251/goja v0.0.0-20240828124009-016eb7256539/go.mod h1:MxLav0peU43GgvwVgNbLAj1s/bSGboKkhuULvq/7hx4=
587587
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
588-
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
589588
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
590589
github.com/dvsekhvalnov/jose2go v1.7.0 h1:bnQc8+GMnidJZA8zc6lLEAb4xNrIqHwO+9TzqvtQZPo=
591590
github.com/dvsekhvalnov/jose2go v1.7.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
@@ -963,8 +962,6 @@ github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ
963962
github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
964963
github.com/hashicorp/golang-lru v1.0.2 h1:dV3g9Z/unq5DpblPpw+Oqcv4dU/1omnb4Ok8iPY6p1c=
965964
github.com/hashicorp/golang-lru v1.0.2/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
966-
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
967-
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
968965
github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
969966
github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
970967
github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ=
@@ -1174,6 +1171,8 @@ github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh
11741171
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
11751172
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
11761173
github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
1174+
github.com/mattn/go-sqlite3 v1.14.37 h1:3DOZp4cXis1cUIpCfXLtmlGolNLp2VEqhiB/PARNBIg=
1175+
github.com/mattn/go-sqlite3 v1.14.37/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
11771176
github.com/mattn/go-tflite v1.0.5 h1:UOByIpeNtY9urOeID5zBMJBrQfZjT6SO4+CLAzSREWw=
11781177
github.com/mattn/go-tflite v1.0.5/go.mod h1:j7bVlVHgKURK0p7AQOw3OqlGE2SVXqck7JsJo4wI+bc=
11791178
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
@@ -1243,8 +1242,6 @@ github.com/nats-io/nkeys v0.4.9 h1:qe9Faq2Gxwi6RZnZMXfmGMZkg3afLLOtrU+gDZJ35b0=
12431242
github.com/nats-io/nkeys v0.4.9/go.mod h1:jcMqs+FLG+W5YO36OX6wFIFcmpdAns+w1Wm6D3I/evE=
12441243
github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
12451244
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
1246-
github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
1247-
github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
12481245
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
12491246
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
12501247
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
@@ -2483,14 +2480,10 @@ modernc.org/b v1.1.0/go.mod h1:yF+wmBAFjebNdVqZNTeNfmnLaLqq91wozvDLcuXz+ck=
24832480
modernc.org/cc/v3 v3.37.0/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20=
24842481
modernc.org/cc/v3 v3.38.1/go.mod h1:vtL+3mdHx/wcj3iEGz84rQa8vEqR6XM84v5Lcvfph20=
24852482
modernc.org/cc/v3 v3.40.0/go.mod h1:/bTg4dnWkSXowUO6ssQKnOV0yMVxDYNIsIrzqTFDGH0=
2486-
modernc.org/cc/v4 v4.21.2 h1:dycHFB/jDc3IyacKipCNSDrjIC0Lm1hyoWOZTRR20Lk=
2487-
modernc.org/cc/v4 v4.21.2/go.mod h1:HM7VJTZbUCR3rV8EYBi9wxnJ0ZBRiGE5OeGXNA0IsLQ=
24882483
modernc.org/ccgo/v3 v3.0.0-20220904174949-82d86e1b6d56/go.mod h1:YSXjPL62P2AMSxBphRHPn7IkzhVHqkvOnRKAKh+W6ZI=
24892484
modernc.org/ccgo/v3 v3.0.0-20220910160915-348f15de615a/go.mod h1:8p47QxPkdugex9J4n9P2tLZ9bK01yngIVp00g4nomW0=
24902485
modernc.org/ccgo/v3 v3.16.13-0.20221017192402-261537637ce8/go.mod h1:fUB3Vn0nVPReA+7IG7yZDfjv1TMWjhQP8gCxrFAtL5g=
24912486
modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY=
2492-
modernc.org/ccgo/v4 v4.17.8 h1:yyWBf2ipA0Y9GGz/MmCmi3EFpKgeS7ICrAFes+suEbs=
2493-
modernc.org/ccgo/v4 v4.17.8/go.mod h1:buJnJ6Fn0tyAdP/dqePbrrvLyr6qslFfTbFrCuaYvtA=
24942487
modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
24952488
modernc.org/db v1.0.10 h1:Vy2Db368/WfWxQWzS8MECgEOZ5c0gtUHfVny4JleMsk=
24962489
modernc.org/db v1.0.10/go.mod h1:P4R9V+DHFTxL0JYYdGhXkVCxEFS2mA4d7cWzl6Zy7Cs=
@@ -2499,10 +2492,6 @@ modernc.org/file v1.0.8/go.mod h1:v0ae8/gLTK8QR+eyuV504kYZ/nsoe5JRDcHZFZecfxM=
24992492
modernc.org/fileutil v1.1.2/go.mod h1:HdjlliqRHrMAI4nVOvvpYVzVgvRSK7WnoCiG0GUWJNo=
25002493
modernc.org/fileutil v1.3.0 h1:gQ5SIzK3H9kdfai/5x41oQiKValumqNTDXMvKo62HvE=
25012494
modernc.org/fileutil v1.3.0/go.mod h1:XatxS8fZi3pS8/hKG2GH/ArUogfxjpEKs3Ku3aK4JyQ=
2502-
modernc.org/gc/v2 v2.4.1 h1:9cNzOqPyMJBvrUipmynX0ZohMhcxPtMccYgGOJdOiBw=
2503-
modernc.org/gc/v2 v2.4.1/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU=
2504-
modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b h1:BnN1t+pb1cy61zbvSUV7SeI0PwosMhlAEi/vBY4qxp8=
2505-
modernc.org/gc/v3 v3.0.0-20240304020402-f0dba7c97c2b/go.mod h1:Qz0X07sNOR1jWYCrJMEnbW/X55x206Q7Vt4mz6/wHp4=
25062495
modernc.org/golex v1.1.0 h1:dmSaksHMd+y6NkBsRsCShNPRaSNCNH+abrVm5/gZic8=
25072496
modernc.org/golex v1.1.0/go.mod h1:2pVlfqApurXhR1m0N+WDYu6Twnc4QuvO4+U8HnwoiRA=
25082497
modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
@@ -2516,8 +2505,6 @@ modernc.org/libc v1.20.3/go.mod h1:ZRfIaEkgrYgZDl6pa4W39HgN5G/yDW+NRmNKZBDFrk0=
25162505
modernc.org/libc v1.21.2/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI=
25172506
modernc.org/libc v1.21.4/go.mod h1:przBsL5RDOZajTVslkugzLBj1evTue36jEomFQOoYuI=
25182507
modernc.org/libc v1.22.4/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY=
2519-
modernc.org/libc v1.50.9 h1:hIWf1uz55lorXQhfoEoezdUHjxzuO6ceshET/yWjSjk=
2520-
modernc.org/libc v1.50.9/go.mod h1:15P6ublJ9FJR8YQCGy8DeQ2Uwur7iW9Hserr/T3OFZE=
25212508
modernc.org/lldb v1.0.8 h1:gM0Lpmgtw0h/ylWQSxABvzJ++TZKhf1Q/uPAGBAM6aU=
25222509
modernc.org/lldb v1.0.8/go.mod h1:ybOcsZ/RNZo3q8fiGadQFRnD+1Jc+RWGcTPdeilCnUk=
25232510
modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
@@ -2526,25 +2513,19 @@ modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWP
25262513
modernc.org/memory v1.3.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
25272514
modernc.org/memory v1.4.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
25282515
modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
2529-
modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
2530-
modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU=
25312516
modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
2532-
modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4=
25332517
modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
25342518
modernc.org/ql v1.4.7 h1:dnGGGL5tHmPwVhMAylnLlwrnIrtk8PPb5KRfMvfgJzE=
25352519
modernc.org/ql v1.4.7/go.mod h1:I900l6z8ckpPy1y9VR0gu4pZ9hl9AhmQla4F8KERzdc=
25362520
modernc.org/sortutil v1.1.1/go.mod h1:DTj/8BqjEBLZFVPYvEGDfFFg94SsfPxQ70R+SQJ98qA=
25372521
modernc.org/sortutil v1.2.0 h1:jQiD3PfS2REGJNzNCMMaLSp/wdMNieTbKX920Cqdgqc=
25382522
modernc.org/sortutil v1.2.0/go.mod h1:TKU2s7kJMf1AE84OoiGppNHJwvB753OYfNl2WRb++Ss=
25392523
modernc.org/sqlite v1.21.2/go.mod h1:cxbLkB5WS32DnQqeH4h4o1B0eMr8W/y8/RGuxQ3JsC0=
2540-
modernc.org/sqlite v1.29.10 h1:3u93dz83myFnMilBGCOLbr+HjklS6+5rJLx4q86RDAg=
2541-
modernc.org/sqlite v1.29.10/go.mod h1:ItX2a1OVGgNsFh6Dv60JQvGfJfTPHPVpV6DF59akYOA=
25422524
modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw=
25432525
modernc.org/strutil v1.2.0 h1:agBi9dp1I+eOnxXeiZawM8F4LawKv4NzGWSaLfyeNZA=
25442526
modernc.org/strutil v1.2.0/go.mod h1:/mdcBmfOibveCTBxUl5B5l6W+TTH1FXPLHZE6bTosX0=
25452527
modernc.org/tcl v1.15.1/go.mod h1:aEjeGJX2gz1oWKOLDVZ2tnEWLUrIn8H+GFu+akoDhqs=
25462528
modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
2547-
modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y=
25482529
modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
25492530
modernc.org/z v1.7.0/go.mod h1:hVdgNMh8ggTuRG1rGU8x+xGRFfiQUIAw0ZqlPy8+HyQ=
25502531
modernc.org/zappy v1.0.9/go.mod h1:y2c4Hv5jzyBP179SxNmx5H/BM6cVgNIXPQv2bCeR6IM=

‎internal/pkg/store/sql/sqlite/database.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"path"
2222

2323
// introduce sqlite
24-
_ "modernc.org/sqlite"
24+
_ "github.com/mattn/go-sqlite3"
2525

2626
"github.com/lf-edge/ekuiper/v2/internal/conf/logger"
2727
"github.com/lf-edge/ekuiper/v2/internal/pkg/store/definition"
@@ -35,7 +35,7 @@ type Database struct {
3535
}
3636

3737
func NewSqliteDatabase(c definition.Config, name string) (definition.Database, error) {
38-
logger.Log.Infof("use cgo disabled sqlite as store %v", name)
38+
logger.Log.Infof("use cgo sqlite as store %v", name)
3939
sqliteConf := c.Sqlite
4040
dir := sqliteConf.Path
4141
if sqliteConf.Name != "" {
@@ -53,7 +53,7 @@ func NewSqliteDatabase(c definition.Config, name string) (definition.Database, e
5353
}
5454

5555
func (d *Database) Connect() error {
56-
db, err := sql.Open("sqlite", connectionString(d.Path))
56+
db, err := sql.Open("sqlite3", connectionString(d.Path))
5757
if err != nil {
5858
return err
5959
}

‎test/plugins/sql/create_table.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ package main
1717
import (
1818
"database/sql"
1919

20-
_ "modernc.org/sqlite"
20+
_ "github.com/mattn/go-sqlite3"
2121
)
2222

2323
func main() {
24-
db, err := sql.Open("sqlite", "file:/tmp/test.db")
24+
db, err := sql.Open("sqlite3", "file:/tmp/test.db")
2525
if err != nil {
2626
panic(err)
2727
}

0 commit comments

Comments
 (0)