Skip to content

Commit cb5af1e

Browse files
committed
use non c binding for sqlite
1 parent 27160ec commit cb5af1e

File tree

6 files changed

+115
-14
lines changed

6 files changed

+115
-14
lines changed

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
go-version: "^1.17.3"
4141
- name: Install dependencies
4242
run: |
43-
sudo apt-get install build-essential wget zip gcc-mingw-w64 gcc-9-aarch64-linux-gnu gcc-aarch64-linux-gnu libc6-dev-arm64-cross && \
43+
sudo apt-get install build-essential wget zip libc6-dev-arm64-cross && \
4444
echo "/usr/bin/x86_64-w64-mingw32-gcc" >> GITHUB_PATH && \
4545
wget --no-check-certificate --progress=dot:mega https://github.com/wangyoucao577/assets-uploader/releases/download/v0.3.0/github-assets-uploader-v0.3.0-linux-amd64.tar.gz -O github-assets-uploader.tar.gz && \
4646
tar -zxf github-assets-uploader.tar.gz && \

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ test.db
1515
.vscode/
1616
.yalc
1717
yalc.lock
18-
certs/
18+
certs/
19+
*-shm
20+
*-wal

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ VERSION := $(or $(VERSION),$(DEFAULT_VERSION))
44
cmd:
55
cd server && go build -ldflags "-w -X main.VERSION=$(VERSION)" -o '../build/server'
66
build:
7-
cd server && gox -cgo \
8-
-osarch="linux/amd64 linux/arm64 darwin/amd64 windows/386 windows/amd64" \
7+
cd server && gox \
8+
-osarch="linux/amd64 linux/arm64 darwin/amd64 windows/amd64" \
99
-ldflags "-w -X main.VERSION=$(VERSION)" \
1010
-output="../build/{{.OS}}/{{.Arch}}/server" \
1111
./...
@@ -16,7 +16,7 @@ build-dashboard:
1616
clean:
1717
rm -rf build
1818
test:
19-
rm -rf server/test/test.db && rm -rf test.db && cd server && go clean --testcache && TEST_DBS="sqlite" go test -p 1 -v ./test
19+
rm -rf server/test/test.db server/test/test.db-shm server/test/test.db-wal && rm -rf test.db test.db-shm test.db-wal && cd server && go clean --testcache && TEST_DBS="sqlite" go test -p 1 -v ./test
2020
test-mongodb:
2121
docker run -d --name authorizer_mongodb_db -p 27017:27017 mongo:4.4.15
2222
cd server && go clean --testcache && TEST_DBS="mongodb" go test -p 1 -v ./test
@@ -34,7 +34,7 @@ test-dynamodb:
3434
cd server && go clean --testcache && TEST_DBS="dynamodb" go test -p 1 -v ./test
3535
docker rm -vf dynamodb-local-test
3636
test-all-db:
37-
rm -rf server/test/test.db && rm -rf test.db
37+
rm -rf server/test/test.db server/test/test.db-shm server/test/test.db-wal && rm -rf test.db test.db-shm test.db-wal
3838
docker run -d --name authorizer_scylla_db -p 9042:9042 scylladb/scylla
3939
docker run -d --name authorizer_mongodb_db -p 27017:27017 mongo:4.4.15
4040
docker run -d --name authorizer_arangodb -p 8529:8529 -e ARANGO_NO_AUTH=1 arangodb/arangodb:3.8.4

server/db/providers/sql/provider.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99
"github.com/authorizerdev/authorizer/server/constants"
1010
"github.com/authorizerdev/authorizer/server/db/models"
1111
"github.com/authorizerdev/authorizer/server/memorystore"
12+
"github.com/glebarez/sqlite"
1213
"gorm.io/driver/mysql"
1314
"gorm.io/driver/postgres"
14-
"gorm.io/driver/sqlite"
1515
"gorm.io/driver/sqlserver"
1616
"gorm.io/gorm"
1717
"gorm.io/gorm/logger"
@@ -61,7 +61,7 @@ func NewProvider() (*provider, error) {
6161
case constants.DbTypePostgres, constants.DbTypeYugabyte, constants.DbTypeCockroachDB:
6262
sqlDB, err = gorm.Open(postgres.Open(dbURL), ormConfig)
6363
case constants.DbTypeSqlite:
64-
sqlDB, err = gorm.Open(sqlite.Open(dbURL), ormConfig)
64+
sqlDB, err = gorm.Open(sqlite.Open(dbURL+"?_pragma=busy_timeout(5000)&_pragma=journal_mode(WAL)"), ormConfig)
6565
case constants.DbTypeMysql, constants.DbTypeMariaDB, constants.DbTypePlanetScaleDB:
6666
sqlDB, err = gorm.Open(mysql.Open(dbURL), ormConfig)
6767
case constants.DbTypeSqlserver:

server/go.mod

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ require (
77
github.com/arangodb/go-driver v1.2.1
88
github.com/aws/aws-sdk-go v1.44.109
99
github.com/coreos/go-oidc/v3 v3.1.0
10+
github.com/denisenkom/go-mssqldb v0.11.0 // indirect
1011
github.com/gin-gonic/gin v1.8.1
12+
github.com/glebarez/sqlite v1.5.0 // indirect
1113
github.com/go-playground/validator/v10 v10.11.1 // indirect
1214
github.com/go-redis/redis/v8 v8.11.0
1315
github.com/goccy/go-json v0.9.11 // indirect
@@ -25,7 +27,7 @@ require (
2527
github.com/stretchr/testify v1.8.0
2628
github.com/vektah/gqlparser/v2 v2.5.1
2729
go.mongodb.org/mongo-driver v1.8.1
28-
golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be
30+
golang.org/x/crypto v0.0.0-20221005025214-4161e89ecf1b
2931
golang.org/x/net v0.0.0-20220930213112-107f3e3c3b0b // indirect
3032
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914
3133
golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
@@ -34,9 +36,8 @@ require (
3436
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
3537
gopkg.in/mail.v2 v2.3.1
3638
gopkg.in/square/go-jose.v2 v2.6.0
37-
gorm.io/driver/mysql v1.2.1
38-
gorm.io/driver/postgres v1.2.3
39-
gorm.io/driver/sqlite v1.2.6
40-
gorm.io/driver/sqlserver v1.2.1
41-
gorm.io/gorm v1.22.4
39+
gorm.io/driver/mysql v1.4.3
40+
gorm.io/driver/postgres v1.4.5
41+
gorm.io/driver/sqlserver v1.4.1
42+
gorm.io/gorm v1.24.1
4243
)

0 commit comments

Comments
 (0)