- update gorm

- update bun
2 years ago · 1a428bfa15
parent 82edf1cf60
commit 1a428bfa15
10 changed files with 35 additions and 10 deletions
--- a/bun_sqlite.go
+++ b/bun_sqlite.go
@ -0,0 +1,25 @@
+package dorm
+
+import (
+	"database/sql"
+	"errors"
+	"fmt"
+	"github.com/uptrace/bun"
+	"github.com/uptrace/bun/dialect/sqlitedialect"
+	"github.com/uptrace/bun/driver/sqliteshim"
+)
+
+func NewBunSqliteClient(config *ConfigBunClient) (*BunClient, error) {
+
+	var err error
+	c := &BunClient{config: config}
+
+	sqlDb, err := sql.Open(sqliteshim.ShimName, c.config.Dns)
+	if err != nil {
+		return nil, errors.New(fmt.Sprintf("加载驱动失败：%v", err))
+	}
+
+	c.Db = bun.NewDB(sqlDb, sqlitedialect.New())
+
+	return c, nil
+}
--- a/go.mod
+++ b/go.mod
@ -10,7 +10,6 @@ require (
 	github.com/bmizerany/pq v0.0.0-20131128184720-da2b95e392c1
 	github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d
 	github.com/denisenkom/go-mssqldb v0.12.2
-	github.com/dtapps/go-library/utils/gotime v0.0.0-20220321125442-5750f7eb2ca1
 	github.com/glebarez/sqlite v1.4.6
 	github.com/go-redis/redis/v8 v8.11.5
 	github.com/go-redis/redis/v9 v9.0.0-beta.1
@ -32,6 +31,7 @@ require (
 	github.com/uptrace/bun/dialect/sqlitedialect v1.1.6
 	github.com/uptrace/bun/driver/pgdriver v1.1.6
 	github.com/uptrace/bun/driver/sqliteshim v1.1.6
+	go.dtapp.net/gotime v1.0.4
 	go.mongodb.org/mongo-driver v1.9.1
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22
 	gorm.io/driver/mysql v1.3.4
--- a/go.sum
+++ b/go.sum
@ -76,8 +76,6 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
-github.com/dtapps/go-library/utils/gotime v0.0.0-20220321125442-5750f7eb2ca1 h1:FiQYs8AYt/iI8tdr52xluI66L8KpI/9pnLQzU/s7G4M=
-github.com/dtapps/go-library/utils/gotime v0.0.0-20220321125442-5750f7eb2ca1/go.mod h1:r0LiuyhLO87GE+vsrySui1ku/HAkcL5iXRPvn6s0CEo=
 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
@ -552,6 +550,8 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
+go.dtapp.net/gotime v1.0.4 h1:gOOkGKfhJwX+dsGHvnF2est09Oqvk7cihJkePddJ5a8=
+go.dtapp.net/gotime v1.0.4/go.mod h1:Gq7eNLr2iMLP18UNWONRq4V3Uhf/ADp4bIrS+Tc6ktY=
 go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
 go.mongodb.org/mongo-driver v1.7.0/go.mod h1:Q4oFMbo1+MSNqICAdYMlC/zSTrwCogR4R8NzkI+yfU8=
--- a/gorm_mysql.go
+++ b/gorm_mysql.go
@ -3,7 +3,7 @@ package dorm
 import (
 	"errors"
 	"fmt"
-	"github.com/dtapps/go-library/utils/gotime"
+	"go.dtapp.net/gotime"
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
--- a/gorm_postgresql.go
+++ b/gorm_postgresql.go
@ -3,7 +3,7 @@ package dorm
 import (
 	"errors"
 	"fmt"
-	"github.com/dtapps/go-library/utils/gotime"
+	"go.dtapp.net/gotime"
 	"gorm.io/driver/postgres"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
--- a/gorm_sqlite.go
+++ b/gorm_sqlite.go
@ -3,8 +3,8 @@ package dorm
 import (
 	"errors"
 	"fmt"
-	"github.com/dtapps/go-library/utils/gotime"
 	"github.com/glebarez/sqlite"
+	"go.dtapp.net/gotime"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"time"
--- a/gorm_sqlite_cgo.go
+++ b/gorm_sqlite_cgo.go
@ -3,7 +3,7 @@ package dorm
 import (
 	"errors"
 	"fmt"
-	"github.com/dtapps/go-library/utils/gotime"
+	"go.dtapp.net/gotime"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
--- a/gorm_sqlserver.go
+++ b/gorm_sqlserver.go
@ -3,7 +3,7 @@ package dorm
 import (
 	"errors"
 	"fmt"
-	"github.com/dtapps/go-library/utils/gotime"
+	"go.dtapp.net/gotime"
 	"gorm.io/driver/sqlserver"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
--- a/mongo_time.go
+++ b/mongo_time.go
@ -1,7 +1,7 @@
 package dorm

 import (
-	"github.com/dtapps/go-library/utils/gotime"
+	"go.dtapp.net/gotime"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/bsontype"
 	"time"
--- a/version.go
+++ b/version.go
@ -1,3 +1,3 @@
 package dorm

-const Version = "1.0.8"
+const Version = "1.0.9"