From fb90a9407c51d50eca9a0f39a35057a658637a21 Mon Sep 17 00:00:00 2001 From: lwnmengjing Date: Thu, 2 May 2024 00:01:02 +0600 Subject: [PATCH] :sparkles: feat: support pure-Go SQLite driver for GORM --- pkg/config/gormdb/open.go | 4 ++-- pkg/config/gormdb/open_sqlite3.go | 19 ------------------- virtual/model/model.go | 2 +- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 pkg/config/gormdb/open_sqlite3.go diff --git a/pkg/config/gormdb/open.go b/pkg/config/gormdb/open.go index b6d7ceb..8ee0877 100644 --- a/pkg/config/gormdb/open.go +++ b/pkg/config/gormdb/open.go @@ -1,8 +1,7 @@ -//go:build !sqlite3 - package gormdb import ( + "github.com/glebarez/sqlite" dm "github.com/nfjBill/gorm-driver-dm" "gorm.io/driver/mysql" "gorm.io/driver/postgres" @@ -13,4 +12,5 @@ var Opens = map[string]func(string) gorm.Dialector{ "mysql": mysql.Open, "postgres": postgres.Open, "dm": dm.Open, + "sqlite": sqlite.Open, } diff --git a/pkg/config/gormdb/open_sqlite3.go b/pkg/config/gormdb/open_sqlite3.go deleted file mode 100644 index 3bbb41a..0000000 --- a/pkg/config/gormdb/open_sqlite3.go +++ /dev/null @@ -1,19 +0,0 @@ -//go:build sqlite3 -// +build sqlite3 - -package gormdb - -import ( - dm "github.com/nfjBill/gorm-driver-dm" - "gorm.io/driver/mysql" - "gorm.io/driver/postgres" - "gorm.io/driver/sqlite" - "gorm.io/gorm" -) - -var Opens = map[string]func(string) gorm.Dialector{ - "mysql": mysql.Open, - "postgres": postgres.Open, - "sqlite3": sqlite.Open, - "dm": dm.Open, -} diff --git a/virtual/model/model.go b/virtual/model/model.go index 87e4dc0..4936b65 100644 --- a/virtual/model/model.go +++ b/virtual/model/model.go @@ -134,7 +134,7 @@ func (m *Model) TenantScope(ctx *gin.Context, _ = db.AddError(err) return db } - return db.Where(fmt.Sprintf("`%s`.`tenant_id` = ?", m.TableName()), tenantID) + return db.Where(fmt.Sprintf("%s.tenant_id = ?", m.TableName()), tenantID) } }