Skip to content

Commit 7a933df

Browse files
eatonphileatonphil
authored
Merge pull request #7 from multiprocessio/pe/drop-custom-go
Drop fork of go-sqlite3
2 parents 009799d + d465d2b commit 7a933df

File tree

9 files changed

+118
-21
lines changed

9 files changed

+118
-21
lines changed

‎.github/workflows/pull_requests.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ jobs:
1919
- run: yarn
2020
- run: yarn fmt
2121
- run: ./scripts/fail_on_diff.sh
22+
# Test examples
23+
- run: go run main.go
24+
working-directory: ./examples/connecthook
25+
- run: go run main.go
26+
working-directory: ./examples/basic
2227

2328
tests-ubuntu:
2429
runs-on: ubuntu-latest

‎README.md‎

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,41 @@ func main() {
5353

5454
fmt.Println(s)
5555
}
56-
5756
```
5857

59-
# go.mod replace
60-
61-
Until https://github.com/mattn/go-sqlite3/pull/1046 is merged you'll
62-
need to add the following to your go.mod:
58+
Alternatively if you want to be able to add your own additional
59+
extensions you can just use the `ConnectHook`:
6360

6461
```go
65-
replace github.com/mattn/go-sqlite3 v1.14.13 => github.com/multiprocessio/go-sqlite3 v1.14.14-0.20220513213203-12637a65d5d7
66-
```
62+
package main
63+
64+
import (
65+
"database/sql"
66+
"fmt"
67+
68+
sqlite3 "github.com/mattn/go-sqlite3"
69+
stdlib "github.com/multiprocessio/go-sqlite3-stdlib"
70+
)
71+
72+
func main() {
73+
sql.Register("sqlite3_ext",
74+
&sqlite3.SQLiteDriver{
75+
ConnectHook: stdlib.ConnectHook,
76+
})
77+
db, err := sql.Open("sqlite3_ext", ":memory:")
78+
if err != nil {
79+
panic(err)
80+
}
6781

68-
This is low-risk because go-sqlite3 changes infrequently. As soon
69-
as that PR is merged though you won't need to do this.
82+
var s string
83+
err = db.QueryRow("SELECT repeat('x', 2)").Scan(&s)
84+
if err != nil {
85+
panic(err)
86+
}
87+
88+
fmt.Println(s)
89+
}
90+
```
7091

7192
# Functions
7293

‎examples/basic/go.mod‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,16 @@ module basic
22

33
go 1.18
44

5-
replace github.com/mattn/go-sqlite3 v1.14.13 => github.com/multiprocessio/go-sqlite3 v1.14.14-0.20220513213203-12637a65d5d7
5+
replace github.com/multiprocessio/go-sqlite3-stdlib v0.0.0-20220526202821-009799d2879d => ../../
66

77
require (
8-
github.com/mattn/go-sqlite3 v1.14.13
9-
github.com/multiprocessio/go-sqlite3-stdlib v0.0.0-20220515032354-f4fe715d8da1
8+
github.com/mattn/go-sqlite3 v1.14.14-0.20220530010643-3ccccfb4c9c6
9+
github.com/multiprocessio/go-sqlite3-stdlib v0.0.0-20220526202821-009799d2879d
1010
)
1111

1212
require (
1313
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de // indirect
14+
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 // indirect
15+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
1416
gonum.org/v1/gonum v0.11.0 // indirect
1517
)

‎examples/basic/go.sum‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,20 @@ github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoU
33
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
44
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
55
github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
6-
github.com/multiprocessio/go-sqlite3 v1.14.14-0.20220513213203-12637a65d5d7 h1:1OnwC0UiVssO2YVo/iU1eDXIha/WBXeK/CgFevo35KY=
7-
github.com/multiprocessio/go-sqlite3 v1.14.14-0.20220513213203-12637a65d5d7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
8-
github.com/multiprocessio/go-sqlite3-stdlib v0.0.0-20220515032354-f4fe715d8da1 h1:okMm3jc7dYXUz5eDh/FqJV8K25heAJqNAhuIbM4Sj88=
9-
github.com/multiprocessio/go-sqlite3-stdlib v0.0.0-20220515032354-f4fe715d8da1/go.mod h1:CzeoFLGPKRgVlqqdus5LSlsxYWUktye2PJfg68oRPIM=
6+
github.com/mattn/go-sqlite3 v1.14.14-0.20220530010643-3ccccfb4c9c6 h1:DrdOuBLZstTLMF5yv/IJhkb7q1cpgIE1b51dLnCznRE=
7+
github.com/mattn/go-sqlite3 v1.14.14-0.20220530010643-3ccccfb4c9c6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
108
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
119
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1210
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
1311
github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg=
1412
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
1513
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1614
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
15+
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 h1:SLP7Q4Di66FONjDJbCYrCRrh97focO6sLogHO7/g8F0=
16+
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
1717
golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3 h1:n9HxLrNxWWtEb1cA950nuEEj3QnKbtsCJ6KjcgisNUs=
18+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
19+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1820
gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E=
1921
gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA=
2022
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎examples/connecthook/go.mod‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
module connecthook
2+
3+
go 1.18
4+
5+
replace github.com/multiprocessio/go-sqlite3-stdlib v0.0.0-20220526202821-009799d2879d => ../../
6+
7+
require (
8+
github.com/mattn/go-sqlite3 v1.14.14-0.20220530010643-3ccccfb4c9c6
9+
github.com/multiprocessio/go-sqlite3-stdlib v0.0.0-20220526202821-009799d2879d
10+
)
11+
12+
require (
13+
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de // indirect
14+
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 // indirect
15+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
16+
gonum.org/v1/gonum v0.11.0 // indirect
17+
)

‎examples/connecthook/go.sum‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhPwqqXc4/vE0f7GvRjuAsbW+HOIe8KnA=
2+
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw=
3+
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
4+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5+
github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
6+
github.com/mattn/go-sqlite3 v1.14.14-0.20220530010643-3ccccfb4c9c6 h1:DrdOuBLZstTLMF5yv/IJhkb7q1cpgIE1b51dLnCznRE=
7+
github.com/mattn/go-sqlite3 v1.14.14-0.20220530010643-3ccccfb4c9c6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
8+
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
9+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
10+
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
11+
github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4/go.mod h1:C1a7PQSMz9NShzorzCiG2fk9+xuCgLkPeCvMHYR2OWg=
12+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
13+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
14+
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
15+
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 h1:SLP7Q4Di66FONjDJbCYrCRrh97focO6sLogHO7/g8F0=
16+
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
17+
golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3 h1:n9HxLrNxWWtEb1cA950nuEEj3QnKbtsCJ6KjcgisNUs=
18+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4=
19+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
20+
gonum.org/v1/gonum v0.11.0 h1:f1IJhK4Km5tBJmaiJXtk/PkL4cdVX6J+tGiM187uT5E=
21+
gonum.org/v1/gonum v0.11.0/go.mod h1:fSG4YDCxxUZQJ7rKsQrj0gMOg00Il0Z96/qMA4bVQhA=
22+
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
23+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
24+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎examples/connecthook/main.go‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package main
2+
3+
import (
4+
"database/sql"
5+
"fmt"
6+
7+
sqlite3 "github.com/mattn/go-sqlite3"
8+
stdlib "github.com/multiprocessio/go-sqlite3-stdlib"
9+
)
10+
11+
func main() {
12+
sql.Register("sqlite3_ext",
13+
&sqlite3.SQLiteDriver{
14+
ConnectHook: stdlib.ConnectHook,
15+
})
16+
db, err := sql.Open("sqlite3_ext", ":memory:")
17+
if err != nil {
18+
panic(err)
19+
}
20+
21+
var s string
22+
err = db.QueryRow("SELECT repeat('x', 2)").Scan(&s)
23+
if err != nil {
24+
panic(err)
25+
}
26+
27+
fmt.Println(s)
28+
}

‎go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ module github.com/multiprocessio/go-sqlite3-stdlib
22

33
go 1.18
44

5-
replace github.com/mattn/go-sqlite3 v1.14.13 => github.com/multiprocessio/go-sqlite3 v1.14.14-0.20220513213203-12637a65d5d7
6-
75
require (
86
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
9-
github.com/mattn/go-sqlite3 v1.14.13
7+
github.com/mattn/go-sqlite3 v1.14.14-0.20220530010643-3ccccfb4c9c6
108
github.com/stretchr/testify v1.7.1
119
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898
1210
gonum.org/v1/gonum v0.11.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoU
33
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
44
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
55
github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
6-
github.com/multiprocessio/go-sqlite3 v1.14.14-0.20220513213203-12637a65d5d7 h1:1OnwC0UiVssO2YVo/iU1eDXIha/WBXeK/CgFevo35KY=
7-
github.com/multiprocessio/go-sqlite3 v1.14.14-0.20220513213203-12637a65d5d7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
6+
github.com/mattn/go-sqlite3 v1.14.14-0.20220530010643-3ccccfb4c9c6 h1:DrdOuBLZstTLMF5yv/IJhkb7q1cpgIE1b51dLnCznRE=
7+
github.com/mattn/go-sqlite3 v1.14.14-0.20220530010643-3ccccfb4c9c6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
88
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
99
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1010
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=

0 commit comments

Comments
 (0)