From 6559dff6e2f2b96494303e476021c8bcd41924d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Wed, 10 Aug 2022 14:29:55 +0800 Subject: [PATCH] - update --- beego.go | 16 -------- beego_get.go | 10 ----- beego_mysql.go | 29 -------------- beego_oracle.go | 29 -------------- beego_pgsql.go | 29 -------------- beego_tidb.go | 29 -------------- bun_mssql.go | 25 ------------ const.go | 2 +- go.mod | 50 ++---------------------- go.sum | 91 ++++---------------------------------------- gorm_sqlite.go | 89 ------------------------------------------- gorm_sqlite_cgo.go | 89 ------------------------------------------- gorm_sqlserver.go | 89 ------------------------------------------- upper_cockroachdb.go | 23 ----------- upper_mongodb.go | 23 ----------- upper_mssql.go | 23 ----------- upper_ql.go | 23 ----------- zorm.go | 17 --------- zorm_clickhouse.go | 25 ------------ zorm_dm.go | 25 ------------ zorm_gbase.go | 1 - zorm_get.go | 10 ----- zorm_kingbase.go | 1 - zorm_mysql.go | 25 ------------ zorm_shentong.go | 1 - 25 files changed, 12 insertions(+), 762 deletions(-) delete mode 100644 beego.go delete mode 100644 beego_get.go delete mode 100644 beego_mysql.go delete mode 100644 beego_oracle.go delete mode 100644 beego_pgsql.go delete mode 100644 beego_tidb.go delete mode 100644 bun_mssql.go delete mode 100644 gorm_sqlite.go delete mode 100644 gorm_sqlite_cgo.go delete mode 100644 gorm_sqlserver.go delete mode 100644 upper_cockroachdb.go delete mode 100644 upper_mongodb.go delete mode 100644 upper_mssql.go delete mode 100644 upper_ql.go delete mode 100644 zorm.go delete mode 100644 zorm_clickhouse.go delete mode 100644 zorm_dm.go delete mode 100644 zorm_gbase.go delete mode 100644 zorm_get.go delete mode 100644 zorm_kingbase.go delete mode 100644 zorm_mysql.go delete mode 100644 zorm_shentong.go diff --git a/beego.go b/beego.go deleted file mode 100644 index 443fdfe..0000000 --- a/beego.go +++ /dev/null @@ -1,16 +0,0 @@ -package dorm - -import ( - "github.com/beego/beego/v2/client/orm" -) - -type ConfigBeegoClient struct { - Dns string // 地址 -} - -// BeegoClient -// https://beego.vip/ -type BeegoClient struct { - Db *orm.Ormer // 驱动 - config *ConfigBeegoClient // 配置 -} diff --git a/beego_get.go b/beego_get.go deleted file mode 100644 index ad6516d..0000000 --- a/beego_get.go +++ /dev/null @@ -1,10 +0,0 @@ -package dorm - -import ( - "github.com/beego/beego/v2/client/orm" -) - -// GetDb 获取驱动 -func (c *BeegoClient) GetDb() *orm.Ormer { - return c.Db -} diff --git a/beego_mysql.go b/beego_mysql.go deleted file mode 100644 index 31fb434..0000000 --- a/beego_mysql.go +++ /dev/null @@ -1,29 +0,0 @@ -package dorm - -import ( - "database/sql" - "errors" - "fmt" - "github.com/beego/beego/v2/client/orm" - _ "github.com/go-sql-driver/mysql" -) - -func NewBeegoMysqlClient(config *ConfigBeegoClient) (*BeegoClient, error) { - - var err error - c := &BeegoClient{config: config} - - err = orm.RegisterDriver("mysql", orm.DRMySQL) - if err != nil { - return nil, errors.New(fmt.Sprintf("加载驱动失败：%v", err)) - } - - var db *sql.DB - o, err := orm.NewOrmWithDB("mysql", "default", db) - if err != nil { - return nil, err - } - c.Db = &o - - return c, nil -} diff --git a/beego_oracle.go b/beego_oracle.go deleted file mode 100644 index 43cb0ca..0000000 --- a/beego_oracle.go +++ /dev/null @@ -1,29 +0,0 @@ -package dorm - -import ( - "database/sql" - "errors" - "fmt" - "github.com/beego/beego/v2/client/orm" - _ "github.com/lib/pq" -) - -func NewBeegoOracleClient(config *ConfigBeegoClient) (*BeegoClient, error) { - - var err error - c := &BeegoClient{config: config} - - err = orm.RegisterDriver("oracle", orm.DROracle) - if err != nil { - return nil, errors.New(fmt.Sprintf("加载驱动失败：%v", err)) - } - - var db *sql.DB - o, err := orm.NewOrmWithDB("oracle", "default", db) - if err != nil { - return nil, err - } - c.Db = &o - - return c, nil -} diff --git a/beego_pgsql.go b/beego_pgsql.go deleted file mode 100644 index 91a1d67..0000000 --- a/beego_pgsql.go +++ /dev/null @@ -1,29 +0,0 @@ -package dorm - -import ( - "database/sql" - "errors" - "fmt" - "github.com/beego/beego/v2/client/orm" - _ "github.com/lib/pq" -) - -func NewBeegoPgsqlClient(config *ConfigBeegoClient) (*BeegoClient, error) { - - var err error - c := &BeegoClient{config: config} - - err = orm.RegisterDriver("pgsql", orm.DRPostgres) - if err != nil { - return nil, errors.New(fmt.Sprintf("加载驱动失败：%v", err)) - } - - var db *sql.DB - o, err := orm.NewOrmWithDB("pgsql", "default", db) - if err != nil { - return nil, err - } - c.Db = &o - - return c, nil -} diff --git a/beego_tidb.go b/beego_tidb.go deleted file mode 100644 index 671a57c..0000000 --- a/beego_tidb.go +++ /dev/null @@ -1,29 +0,0 @@ -package dorm - -import ( - "database/sql" - "errors" - "fmt" - "github.com/beego/beego/v2/client/orm" - _ "github.com/lib/pq" -) - -func NewBeegoTidbClient(config *ConfigBeegoClient) (*BeegoClient, error) { - - var err error - c := &BeegoClient{config: config} - - err = orm.RegisterDriver("TiDB", orm.DRTiDB) - if err != nil { - return nil, errors.New(fmt.Sprintf("加载驱动失败：%v", err)) - } - - var db *sql.DB - o, err := orm.NewOrmWithDB("TiDB", "default", db) - if err != nil { - return nil, err - } - c.Db = &o - - return c, nil -} diff --git a/bun_mssql.go b/bun_mssql.go deleted file mode 100644 index c21b13f..0000000 --- a/bun_mssql.go +++ /dev/null @@ -1,25 +0,0 @@ -package dorm - -import ( - "database/sql" - "errors" - "fmt" - _ "github.com/denisenkom/go-mssqldb" - "github.com/uptrace/bun" - "github.com/uptrace/bun/dialect/mssqldialect" -) - -func NewBunMssqlClient(config *ConfigBunClient) (*BunClient, error) { - - var err error - c := &BunClient{config: config} - - sqlDb, err := sql.Open("sqlserver", c.config.Dns) - if err != nil { - return nil, errors.New(fmt.Sprintf("加载驱动失败：%v", err)) - } - - c.Db = bun.NewDB(sqlDb, mssqldialect.New()) - - return c, nil -} diff --git a/const.go b/const.go index 834c5a5..b036f52 100644 --- a/const.go +++ b/const.go @@ -1,3 +1,3 @@ package dorm -const Version = "1.0.12" +const Version = "1.0.13" diff --git a/go.mod b/go.mod index 96c54c9..abf82be 100644 --- a/go.mod +++ b/go.mod @@ -3,41 +3,24 @@ module go.dtapp.net/dorm go 1.19 require ( - gitee.com/chunanyong/dm v1.8.5 - gitee.com/chunanyong/zorm v1.5.6 github.com/basgys/goxml2json v1.1.0 - github.com/beego/beego/v2 v2.0.4 - 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/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 github.com/go-sql-driver/mysql v1.6.0 - github.com/godror/godror v0.34.0 - github.com/gomodule/redigo v2.0.0+incompatible github.com/kamva/mgm/v3 v3.4.1 github.com/lib/pq v1.10.5 - github.com/mailru/go-clickhouse/v2 v2.0.0 - github.com/mattn/go-sqlite3 v1.14.14 github.com/qiniu/qmgo v1.1.1 github.com/rs/xid v1.2.1 github.com/sirupsen/logrus v1.8.1 github.com/upper/db/v4 v4.5.4 github.com/uptrace/bun v1.1.6 - github.com/uptrace/bun/dialect/mssqldialect v1.1.6 github.com/uptrace/bun/dialect/mysqldialect v1.1.6 github.com/uptrace/bun/dialect/pgdialect v1.1.6 - 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 gorm.io/driver/postgres v1.3.7 - gorm.io/driver/sqlite v1.3.6 - gorm.io/driver/sqlserver v1.3.2 gorm.io/gorm v1.23.8 xorm.io/xorm v1.3.1 ) @@ -47,21 +30,13 @@ require ( github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect - github.com/edsrzf/mmap-go v1.0.0 // indirect - github.com/glebarez/go-sqlite v1.17.3 // indirect - github.com/go-logfmt/logfmt v0.5.1 // indirect - github.com/go-logr/logr v1.2.3 // indirect github.com/go-playground/locales v0.13.0 // indirect github.com/go-playground/universal-translator v0.17.0 // indirect github.com/go-playground/validator/v10 v10.4.1 // indirect github.com/go-stack/stack v1.8.1 // indirect github.com/goccy/go-json v0.8.1 // indirect - github.com/godror/knownpb v0.1.0 // indirect - github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect - github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/google/uuid v1.3.0 // indirect - github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/google/go-cmp v0.5.8 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect github.com/jackc/pgconn v1.12.1 // indirect github.com/jackc/pgio v1.0.0 // indirect @@ -73,17 +48,15 @@ require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/klauspost/compress v1.15.6 // indirect github.com/leodido/go-urn v1.2.0 // indirect github.com/mattn/go-isatty v0.0.14 // indirect + github.com/mattn/go-sqlite3 v1.14.14 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect - github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect - github.com/stretchr/testify v1.7.1 // indirect + github.com/stretchr/testify v1.8.0 // indirect github.com/syndtr/goleveldb v1.0.0 // indirect github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect github.com/vmihailenco/msgpack/v5 v5.3.5 // indirect @@ -99,28 +72,13 @@ require ( golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/tools v0.1.11 // indirect - google.golang.org/protobuf v1.27.1 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect lukechampine.com/uint128 v1.2.0 // indirect mellium.im/sasl v0.2.1 // indirect - modernc.org/b v1.0.2 // indirect - modernc.org/cc/v3 v3.36.0 // indirect modernc.org/ccgo/v3 v3.16.7 // indirect - modernc.org/db v1.0.3 // indirect - modernc.org/file v1.0.3 // indirect - modernc.org/fileutil v1.0.0 // indirect - modernc.org/golex v1.0.1 // indirect - modernc.org/internal v1.0.2 // indirect modernc.org/libc v1.16.14 // indirect - modernc.org/lldb v1.0.2 // indirect - modernc.org/mathutil v1.4.1 // indirect - modernc.org/memory v1.1.1 // indirect modernc.org/opt v0.1.3 // indirect - modernc.org/ql v1.4.0 // indirect - modernc.org/sortutil v1.1.0 // indirect modernc.org/sqlite v1.17.3 // indirect modernc.org/strutil v1.1.2 // indirect - modernc.org/token v1.0.0 // indirect - modernc.org/zappy v1.0.3 // indirect xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect ) diff --git a/go.sum b/go.sum index 05e9404..23762b6 100644 --- a/go.sum +++ b/go.sum @@ -2,14 +2,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU= -gitee.com/chunanyong/dm v1.8.5 h1:7RbtxRqZSzMxMT/6vhjdV/Gym2lV2S0PLUUW0ht4ZC4= -gitee.com/chunanyong/dm v1.8.5/go.mod h1:EPRJnuPFgbyOFgJ0TRYCTGzhq+ZT4wdyaj/GW/LLcNg= -gitee.com/chunanyong/zorm v1.5.6 h1:d5y5u7mYdDU3iuAUDXNf64xqtmdj0LCjz/BJhv6XRFE= -gitee.com/chunanyong/zorm v1.5.6/go.mod h1:Sk+vofBqQXgNrDTe+nWhV6iMXhiBObFHdCo1MfvAdi8= gitee.com/travelliu/dm v1.8.11192/go.mod h1:DHTzyhCrM843x9VdKVbZ+GKXGRbKM2sJ4LxihRxShkE= -github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw= -github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0= -github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= @@ -33,18 +26,12 @@ github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/basgys/goxml2json v1.1.0 h1:4ln5i4rseYfXNd86lGEB+Vi652IsIXIvggKM/BhUKVw= github.com/basgys/goxml2json v1.1.0/go.mod h1:wH7a5Np/Q4QoECFIU8zTQlZwZkrilY0itPfecMw41Dw= -github.com/beego/beego/v2 v2.0.4 h1:1NjpVkcqYVdKE06VJTQUVzsgZqFcaj0MqjHna57bWsA= -github.com/beego/beego/v2 v2.0.4/go.mod h1:21YTlo+jRYqrM/dLC0knzmo9C25x0pqddoKqy8kxev8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y= github.com/bitly/go-simplejson v0.5.0/go.mod h1:cXHtHw4XUPsvGaxgjIAn8PhEWG9NfngEKAMDJEczWVA= -github.com/bmizerany/pq v0.0.0-20131128184720-da2b95e392c1 h1:1clOQIolnXGoH1SUo8ZPgdfOWFp/6i8NuRerrVL/TAc= -github.com/bmizerany/pq v0.0.0-20131128184720-da2b95e392c1/go.mod h1:YR6v6TjYGQnPky7rSf5U+AiQ4+EHIVmFYbhHUPo5L2U= -github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d h1:pVrfxiGfwelyab6n21ZBkbkmbevaf+WvMIiR7sr97hw= -github.com/bradfitz/gomemcache v0.0.0-20220106215444-fb4bf637b56d/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -69,20 +56,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisenkom/go-mssqldb v0.10.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/denisenkom/go-mssqldb v0.11.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= -github.com/denisenkom/go-mssqldb v0.12.0/go.mod h1:iiK0YP1ZeepvmBQk/QpLEhhTNJgfzrpArPY/aFvc9yU= -github.com/denisenkom/go-mssqldb v0.12.2 h1:1OcPn5GBIobjWNd+8yjfHNIaFX14B1pWI3F9HZy5KXw= -github.com/denisenkom/go-mssqldb v0.12.2/go.mod h1:lnIw1mZukFRZDJYQ0Pb833QS2IaC3l5HkEfra2LJ+sk= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= 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/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= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= -github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= @@ -93,10 +74,6 @@ github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/glebarez/go-sqlite v1.17.3 h1:Rji9ROVSTTfjuWD6j5B+8DtkNvPILoUC3xRhkQzGxvk= -github.com/glebarez/go-sqlite v1.17.3/go.mod h1:Hg+PQuhUy98XCxWEJEaWob8x7lhJzhNYF1nZbUiRGIY= -github.com/glebarez/sqlite v1.4.6 h1:D5uxD2f6UJ82cHnVtO2TZ9pqsLyto3fpDKHIk2OsR8A= -github.com/glebarez/sqlite v1.4.6/go.mod h1:WYEtEFjhADPaPJqL/PGlbQQGINBA3eUAfDNbKFJf/zA= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= @@ -104,10 +81,6 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= @@ -152,10 +125,6 @@ github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/V github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= github.com/goccy/go-json v0.8.1 h1:4/Wjm0JIJaTDm8K1KcGrLHJoa8EsJ13YWeX+6Kfq6uI= github.com/goccy/go-json v0.8.1/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/godror/godror v0.34.0 h1:/D40cxuWY3PtMa1oIcfXqqInlts5anEL3vj6IkTW8Q8= -github.com/godror/godror v0.34.0/go.mod h1:9QtjJWw+r1v9zh93Qx+hSOfYRVgj11a/7TUnU/00Wbc= -github.com/godror/knownpb v0.1.0 h1:dJPK8s/I3PQzGGaGcUStL2zIaaICNzKKAK8BzP1uLio= -github.com/godror/knownpb v0.1.0/go.mod h1:4nRFbQo1dDuwKnblRXDxrfCFYeT4hjg3GjMqef58eRE= github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw= github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= @@ -163,11 +132,7 @@ github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFG github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= -github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= -github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188/go.mod h1:vXjM/+wXQnTPR4KqTKDgJukSZ6amVRtWMPEjE6sQoK8= -github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= -github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -175,14 +140,11 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0= -github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -190,13 +152,12 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -223,8 +184,6 @@ github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= @@ -353,8 +312,6 @@ github.com/lib/pq v1.10.5/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= -github.com/mailru/go-clickhouse/v2 v2.0.0 h1:O+ZGJDwp/E5W19ooeouEqaOlg+qxA+4Zsfjt63QcnVU= -github.com/mailru/go-clickhouse/v2 v2.0.0/go.mod h1:TwxN829KnFZ7jAka9l9EoCV+U0CBFq83SFev4oLbnNU= github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= @@ -391,7 +348,6 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= @@ -404,7 +360,6 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= -github.com/oklog/ulid/v2 v2.0.2 h1:r4fFzBm+bv0wNKNh5eXTwU7i85y5x+uwkxCUTNVQqLc= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -427,7 +382,6 @@ github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAv github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= -github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -471,8 +425,6 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 h1:DAYUYH5869yV94zvCES9F51oYtN5oGlwjxJJz7ZCnik= -github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= @@ -496,16 +448,18 @@ github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3 github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= @@ -517,18 +471,12 @@ github.com/upper/db/v4 v4.5.4 h1:Hxho4jSx4E+3fxlFgdH4wQTRKygtL0YQPDLQPCUu9wg= github.com/upper/db/v4 v4.5.4/go.mod h1:wyu5BM5Y2gowOt4i6C4LbxftH9QeUF338XVGH4uk+Eo= github.com/uptrace/bun v1.1.6 h1:vDJ1Qs6fXock5+q/PSOZZ7vZVZABmWkGlgZDUkJwbfc= github.com/uptrace/bun v1.1.6/go.mod h1:Z2Pd3cRvNKbrYuL6Gp1XGjA9QEYz+rDz5KkEi9MZLnQ= -github.com/uptrace/bun/dialect/mssqldialect v1.1.6 h1:7mKVFGW6tcapF3aXRh6vgzMX8biu5adKEUsRdMCrEqY= -github.com/uptrace/bun/dialect/mssqldialect v1.1.6/go.mod h1:UdG9P7rRAUqysqQQFWLhM8iv3Y7CqesYlf0B/Ek5/Tg= github.com/uptrace/bun/dialect/mysqldialect v1.1.6 h1:s0sOiXwszVLzXzsOqBKiL7A7g5GcNmrKOtaQFwQtqHc= github.com/uptrace/bun/dialect/mysqldialect v1.1.6/go.mod h1:KmsQgkl1ctIgUTMeNt5n6yEUdIVQJqWupP2gHDDmFrk= github.com/uptrace/bun/dialect/pgdialect v1.1.6 h1:mDGOPm9FkWaM2kQLddzcRW6juUdITJ1XPUr1vt2anYw= github.com/uptrace/bun/dialect/pgdialect v1.1.6/go.mod h1:vSyJq5nr4EP/QcVZEOctDnbHQ4OKebZbXGRd1bTBIFI= -github.com/uptrace/bun/dialect/sqlitedialect v1.1.6 h1:+bFY45/nIA/yTGOPKOPUVKZJm5tLHmN7Mz/HlNz6XvE= -github.com/uptrace/bun/dialect/sqlitedialect v1.1.6/go.mod h1:lSX4rOiE1QevAtbevyrvtnK6fLkT08QGJn4/F8evygk= github.com/uptrace/bun/driver/pgdriver v1.1.6 h1:t5fzjXasWt3uwXS5h5m0BhfdJEZp1Z9rzTgIO3mnq80= github.com/uptrace/bun/driver/pgdriver v1.1.6/go.mod h1:Qb/QgyqAWYQPGk/o6eA6A8EIkOyl0c007NK8//wKJGw= -github.com/uptrace/bun/driver/sqliteshim v1.1.6 h1:zHs1MzlAjI4uecTRMHDjMR0AFhskDdD88dTvpLTkELs= -github.com/uptrace/bun/driver/sqliteshim v1.1.6/go.mod h1:fVxd7RHIlDk7wl5lv00kjDqvFKvpEENb+eOX5r1jhw8= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/vmihailenco/msgpack/v5 v5.3.5 h1:5gO0H1iULLWGhs2H5tbAHIZTV8/cYafcFOr9znI5mJU= @@ -587,7 +535,6 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= @@ -627,7 +574,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -675,7 +621,6 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d h1:/m5NbqQelATgoSPVC2Z23sR4kVNokFwDDyWh/3rGY+I= golang.org/x/sys v0.0.0-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -737,9 +682,6 @@ google.golang.org/grpc v1.22.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyac google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= @@ -762,17 +704,13 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.3.4 h1:/KoBMgsUHC3bExsekDcmNYaBnfH2WNeFuXqqrqMc98Q= gorm.io/driver/mysql v1.3.4/go.mod h1:s4Tq0KmD0yhPGHbZEwg1VPlH0vT/GBHJZorPzhcxBUE= gorm.io/driver/postgres v1.3.7 h1:FKF6sIMDHDEvvMF/XJvbnCl0nu6KSKUaPXevJ4r+VYQ= gorm.io/driver/postgres v1.3.7/go.mod h1:f02ympjIcgtHEGFMZvdgTxODZ9snAHDb4hXfigBVuNI= -gorm.io/driver/sqlite v1.3.6 h1:Fi8xNYCUplOqWiPa3/GuCeowRNBRGTf62DEmhMDHeQQ= -gorm.io/driver/sqlite v1.3.6/go.mod h1:Sg1/pvnKtbQ7jLXxfZa+jSHvoX8hoZA8cn4xllOMTgE= -gorm.io/driver/sqlserver v1.3.2 h1:yYt8f/xdAKLY7lCCyXxIUEgZ/WsURos3dHrx8MKFGAk= -gorm.io/driver/sqlserver v1.3.2/go.mod h1:w25Vrx2BG+CJNUu/xKbFhaKlGxT/nzRkhWCCoptX8tQ= -gorm.io/gorm v1.23.1/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= gorm.io/gorm v1.23.4/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= gorm.io/gorm v1.23.8 h1:h8sGJ+biDgBA1AD1Ha9gFCx7h8npU7AsLdlkX0n2TpE= gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= @@ -785,7 +723,6 @@ lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI= lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= mellium.im/sasl v0.2.1 h1:nspKSRg7/SyO0cRGY71OkfHab8tf9kCts6a6oTDut0w= mellium.im/sasl v0.2.1/go.mod h1:ROaEDLQNuf9vjKqE1SrAfnsobm2YKXT1gnN1uDp1PjQ= -modernc.org/b v1.0.2 h1:iPC2u39ebzq12GOC2yXT4mve0HrWcH85cz+midWjzeo= modernc.org/b v1.0.2/go.mod h1:fVGfCIzkZw5RsuF2A2WHbJmY7FiMIq30nP4s52uWsoY= modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g= @@ -845,20 +782,13 @@ modernc.org/ccgo/v3 v3.16.6/go.mod h1:tGtX0gE9Jn7hdZFeU88slbTh1UtCYKusWOoCJuvkWs modernc.org/ccgo/v3 v3.16.7 h1:aX3IUFUc5Gy+GkLh2lu866tybZkg4e8Ccfs7dKNzYGI= modernc.org/ccgo/v3 v3.16.7/go.mod h1:ruJe28kDQ8nvFDJu3k7lCcD81Dbij6LC7/pSMaujEkQ= modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= -modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk= modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= -modernc.org/db v1.0.3 h1:apxOlWU69je04bY22OT6J0RL23mzvUy22EgTAVyw+Yg= modernc.org/db v1.0.3/go.mod h1:L4ltUg8tu2pkSJk+fKaRrXs/3EdW79ZKYQ5PfVDT53U= -modernc.org/file v1.0.3 h1:McYGAMMuqjRp6ptmpcLr3r5yw3gNPsonFCAJ0tNK74U= modernc.org/file v1.0.3/go.mod h1:CNj/pwOfCtCbqiHcXDUlHBB2vWrzdaDCWdcnjtS1+XY= -modernc.org/fileutil v1.0.0 h1:Z1AFLZwl6BO8A5NldQg/xTSjGLetp+1Ubvl4alfGx8w= modernc.org/fileutil v1.0.0/go.mod h1:JHsWpkrk/CnVV1H/eGlFf85BEpfkrp56ro8nojIq9Q8= -modernc.org/golex v1.0.1 h1:EYKY1a3wStt0RzHaH8mdSRNg78Ub0OHxYfCRWw35YtM= modernc.org/golex v1.0.1/go.mod h1:QCA53QtsT1NdGkaZZkF5ezFwk4IXh4BGNafAARTC254= -modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM= modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= modernc.org/internal v1.0.0/go.mod h1:VUD/+JAkhCpvkUitlEOnhpVxCgsBI90oTzSCRcqQVSM= -modernc.org/internal v1.0.2 h1:Sn3+ojjMRnPaOR6jFISs6KAdRHnR4q9KNuwfKINKmZA= modernc.org/internal v1.0.2/go.mod h1:bycJAcev709ZU/47nil584PeBD+kbu8nv61ozeMso9E= modernc.org/lex v1.0.0/go.mod h1:G6rxMTy3cH2iA0iXL/HRRv4Znu8MK4higxph/lE7ypk= modernc.org/lexer v1.0.0/go.mod h1:F/Dld0YKYdZCLQ7bD0USbWL4YKCyTDRDHiDTOs0q0vk= @@ -901,11 +831,9 @@ modernc.org/libc v1.11.87/go.mod h1:Qvd5iXTeLhI5PS0XSyqMY99282y+3euapQFxM7jYnpY= modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A= modernc.org/libc v1.16.1/go.mod h1:JjJE0eu4yeK7tab2n4S1w8tlWd9MxXLRzheaRnAKymU= modernc.org/libc v1.16.7/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU= -modernc.org/libc v1.16.8/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU= modernc.org/libc v1.16.10/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU= modernc.org/libc v1.16.14 h1:MUIjk9Xwlkrp0BqGhMfRkiq0EkZsqfNiP4eixL3YiPk= modernc.org/libc v1.16.14/go.mod h1:hYIV5VZczAmGZAnG15Vdngn5HSF5cSkbvfz2B7GRuVU= -modernc.org/lldb v1.0.2 h1:LBw58xVFl01OuM5U9++tLy3wmu+PoWok6T3dHuNjcZk= modernc.org/lldb v1.0.2/go.mod h1:ovbKqyzA9H/iPwHkAOH0qJbIQVT9rlijecenxDwVUi0= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= @@ -920,9 +848,7 @@ modernc.org/memory v1.1.1/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw= modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= -modernc.org/ql v1.4.0 h1:CqLAho+y4N8JwvqT7NJsYsp7YPwiRv6RE2n0n1ksSCU= modernc.org/ql v1.4.0/go.mod h1:q4c29Bgdx+iAtxx47ODW5Xo2X0PDkjSCK9NdQl6KFxc= -modernc.org/sortutil v1.1.0 h1:oP3U4uM+NT/qBQcbg/K2iqAX0Nx7B1b6YZtq3Gk/PjM= modernc.org/sortutil v1.1.0/go.mod h1:ZyL98OQHJgH9IEfN71VsamvJgrtRX9Dj2gX+vH86L1k= modernc.org/sqlite v1.14.2/go.mod h1:yqfn85u8wVOE6ub5UT8VI9JjhrwBUUCNyTACN0h6Sx8= modernc.org/sqlite v1.17.3 h1:iE+coC5g17LtByDYDWKpR6m2Z9022YrSh3bumwOnIrI= @@ -931,14 +857,11 @@ modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw modernc.org/strutil v1.1.2 h1:iFBDH6j1Z0bN/Q9udJnnFoFpENA4252qe/7/5woE5MI= modernc.org/strutil v1.1.2/go.mod h1:OYajnUAcI/MX+XD/Wx7v1bbdvcQSvxgtb0gC+u3d3eg= modernc.org/tcl v1.8.13/go.mod h1:V+q/Ef0IJaNUSECieLU4o+8IScapxnMyFV6i/7uQlAY= -modernc.org/tcl v1.13.1 h1:npxzTwFTZYM8ghWicVIX1cRWzj7Nd8i6AqqX2p+IYao= modernc.org/tcl v1.13.1/go.mod h1:XOLfOwzhkljL4itZkK6T72ckMgvj0BDsnKNdZVUOecw= modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk= modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= modernc.org/z v1.2.19/go.mod h1:+ZpP0pc4zz97eukOzW3xagV/lS82IpPN9NGG5pNF9vY= -modernc.org/z v1.5.1 h1:RTNHdsrOpeoSeOF4FbzTo8gBYByaJ5xT7NgZ9ZqRiJM= modernc.org/z v1.5.1/go.mod h1:eWFB510QWW5Th9YGZT81s+LwvaAs3Q2yr4sP0rmLkv8= -modernc.org/zappy v1.0.3 h1:Tr+P3kclDSrvC6zYBW2hWmOmu5SjG6PtvCt3RCjRmss= modernc.org/zappy v1.0.3/go.mod h1:w/Akq8ipfols/xZJdR5IYiQNOqC80qz2mVvsEwEbkiI= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= diff --git a/gorm_sqlite.go b/gorm_sqlite.go deleted file mode 100644 index e6ced6d..0000000 --- a/gorm_sqlite.go +++ /dev/null @@ -1,89 +0,0 @@ -package dorm - -import ( - "errors" - "fmt" - "github.com/glebarez/sqlite" - "go.dtapp.net/gotime" - "gorm.io/gorm" - "gorm.io/gorm/logger" - "time" -) - -func NewGormSqliteClient(config *ConfigGormClient) (*GormClient, error) { - - var err error - c := &GormClient{config: config} - - // 判断路径 - if c.config.Log.Path == "" { - logsUrl = "/logs/sqlite" - } else { - logsUrl = c.config.Log.Path - } - - if c.config.Log.Status == true { - var slowThreshold time.Duration - var logLevel logger.LogLevel - if c.config.Log.Slow == 0 { - slowThreshold = 100 * time.Millisecond - } else { - slowThreshold = time.Duration(c.config.Log.Slow) - } - if c.config.Log.Level == "Error" { - logLevel = logger.Error - } else if c.config.Log.Level == "Warn" { - logLevel = logger.Warn - } else { - logLevel = logger.Info - } - c.Db, err = gorm.Open(sqlite.Open(c.config.Dns), &gorm.Config{ - Logger: logger.New( - writer{}, - logger.Config{ - SlowThreshold: slowThreshold, // 慢SQL阈值 - LogLevel: logLevel, // 日志级别 - IgnoreRecordNotFoundError: c.config.Log.NotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误 - Colorful: c.config.Log.Colorful, // 禁用彩色打印 - }, - ), - NowFunc: func() time.Time { - return gotime.Current().Now().Local() - }, - }) - } else { - c.Db, err = gorm.Open(sqlite.Open(c.config.Dns), &gorm.Config{}) - } - - if err != nil { - return nil, errors.New(fmt.Sprintf("连接失败：%v", err)) - } - - sqlDB, err := c.Db.DB() - if err != nil { - return nil, errors.New(fmt.Sprintf("检查连接失败：%v", err)) - } - - // 设置空闲连接池中连接的最大数量 - if c.config.Conn.SetMaxIdle == 0 { - sqlDB.SetMaxIdleConns(10) - } else { - sqlDB.SetMaxIdleConns(c.config.Conn.SetMaxIdle) - } - - // 设置打开数据库连接的最大数量 - if c.config.Conn.SetMaxOpen == 0 { - sqlDB.SetMaxOpenConns(100) - } else { - sqlDB.SetMaxOpenConns(c.config.Conn.SetMaxOpen) - } - - // 设置了连接可复用的最大时间 - if c.config.Conn.SetConnMaxLifetime == 0 { - sqlDB.SetConnMaxLifetime(time.Second * 600) - } else { - sqlDB.SetConnMaxLifetime(time.Duration(c.config.Conn.SetConnMaxLifetime)) - } - - return c, nil -} diff --git a/gorm_sqlite_cgo.go b/gorm_sqlite_cgo.go deleted file mode 100644 index 501b62b..0000000 --- a/gorm_sqlite_cgo.go +++ /dev/null @@ -1,89 +0,0 @@ -package dorm - -import ( - "errors" - "fmt" - "go.dtapp.net/gotime" - "gorm.io/driver/sqlite" - "gorm.io/gorm" - "gorm.io/gorm/logger" - "time" -) - -func NewGormSqliteCgoClient(config *ConfigGormClient) (*GormClient, error) { - - var err error - c := &GormClient{config: config} - - // 判断路径 - if c.config.Log.Path == "" { - logsUrl = "/logs/sqlite" - } else { - logsUrl = c.config.Log.Path - } - - if c.config.Log.Status == true { - var slowThreshold time.Duration - var logLevel logger.LogLevel - if c.config.Log.Slow == 0 { - slowThreshold = 100 * time.Millisecond - } else { - slowThreshold = time.Duration(c.config.Log.Slow) - } - if c.config.Log.Level == "Error" { - logLevel = logger.Error - } else if c.config.Log.Level == "Warn" { - logLevel = logger.Warn - } else { - logLevel = logger.Info - } - c.Db, err = gorm.Open(sqlite.Open(c.config.Dns), &gorm.Config{ - Logger: logger.New( - writer{}, - logger.Config{ - SlowThreshold: slowThreshold, // 慢SQL阈值 - LogLevel: logLevel, // 日志级别 - IgnoreRecordNotFoundError: c.config.Log.NotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误 - Colorful: c.config.Log.Colorful, // 禁用彩色打印 - }, - ), - NowFunc: func() time.Time { - return gotime.Current().Now().Local() - }, - }) - } else { - c.Db, err = gorm.Open(sqlite.Open(c.config.Dns), &gorm.Config{}) - } - - if err != nil { - return nil, errors.New(fmt.Sprintf("连接失败：%v", err)) - } - - sqlDB, err := c.Db.DB() - if err != nil { - return nil, errors.New(fmt.Sprintf("检查连接失败：%v", err)) - } - - // 设置空闲连接池中连接的最大数量 - if c.config.Conn.SetMaxIdle == 0 { - sqlDB.SetMaxIdleConns(10) - } else { - sqlDB.SetMaxIdleConns(c.config.Conn.SetMaxIdle) - } - - // 设置打开数据库连接的最大数量 - if c.config.Conn.SetMaxOpen == 0 { - sqlDB.SetMaxOpenConns(100) - } else { - sqlDB.SetMaxOpenConns(c.config.Conn.SetMaxOpen) - } - - // 设置了连接可复用的最大时间 - if c.config.Conn.SetConnMaxLifetime == 0 { - sqlDB.SetConnMaxLifetime(time.Second * 600) - } else { - sqlDB.SetConnMaxLifetime(time.Duration(c.config.Conn.SetConnMaxLifetime)) - } - - return c, nil -} diff --git a/gorm_sqlserver.go b/gorm_sqlserver.go deleted file mode 100644 index 35c76f5..0000000 --- a/gorm_sqlserver.go +++ /dev/null @@ -1,89 +0,0 @@ -package dorm - -import ( - "errors" - "fmt" - "go.dtapp.net/gotime" - "gorm.io/driver/sqlserver" - "gorm.io/gorm" - "gorm.io/gorm/logger" - "time" -) - -func NewGormSqlServerClient(config *ConfigGormClient) (*GormClient, error) { - - var err error - c := &GormClient{config: config} - - // 判断路径 - if c.config.Log.Path == "" { - logsUrl = "/logs/sqlserver" - } else { - logsUrl = c.config.Log.Path - } - - if c.config.Log.Status == true { - var slowThreshold time.Duration - var logLevel logger.LogLevel - if c.config.Log.Slow == 0 { - slowThreshold = 100 * time.Millisecond - } else { - slowThreshold = time.Duration(c.config.Log.Slow) - } - if c.config.Log.Level == "Error" { - logLevel = logger.Error - } else if c.config.Log.Level == "Warn" { - logLevel = logger.Warn - } else { - logLevel = logger.Info - } - c.Db, err = gorm.Open(sqlserver.Open(c.config.Dns), &gorm.Config{ - Logger: logger.New( - writer{}, - logger.Config{ - SlowThreshold: slowThreshold, // 慢SQL阈值 - LogLevel: logLevel, // 日志级别 - IgnoreRecordNotFoundError: c.config.Log.NotFoundError, // 忽略ErrRecordNotFound（记录未找到）错误 - Colorful: c.config.Log.Colorful, // 禁用彩色打印 - }, - ), - NowFunc: func() time.Time { - return gotime.Current().Now().Local() - }, - }) - } else { - c.Db, err = gorm.Open(sqlserver.Open(c.config.Dns), &gorm.Config{}) - } - - if err != nil { - return nil, errors.New(fmt.Sprintf("连接失败：%v", err)) - } - - sqlDB, err := c.Db.DB() - if err != nil { - return nil, errors.New(fmt.Sprintf("检查连接失败：%v", err)) - } - - // 设置空闲连接池中连接的最大数量 - if c.config.Conn.SetMaxIdle == 0 { - sqlDB.SetMaxIdleConns(10) - } else { - sqlDB.SetMaxIdleConns(c.config.Conn.SetMaxIdle) - } - - // 设置打开数据库连接的最大数量 - if c.config.Conn.SetMaxOpen == 0 { - sqlDB.SetMaxOpenConns(100) - } else { - sqlDB.SetMaxOpenConns(c.config.Conn.SetMaxOpen) - } - - // 设置了连接可复用的最大时间 - if c.config.Conn.SetConnMaxLifetime == 0 { - sqlDB.SetConnMaxLifetime(time.Second * 600) - } else { - sqlDB.SetConnMaxLifetime(time.Duration(c.config.Conn.SetConnMaxLifetime)) - } - - return c, nil -} diff --git a/upper_cockroachdb.go b/upper_cockroachdb.go deleted file mode 100644 index 523e996..0000000 --- a/upper_cockroachdb.go +++ /dev/null @@ -1,23 +0,0 @@ -package dorm - -import ( - "errors" - "fmt" - "github.com/upper/db/v4/adapter/cockroachdb" -) - -func NewUpperCockroachdbClient(settings cockroachdb.ConnectionURL) (*UpperClient, error) { - - var err error - c := &UpperClient{} - - sess, err := cockroachdb.Open(settings) - if err != nil { - return nil, errors.New(fmt.Sprintf("连接失败：%v", err)) - } - defer sess.Close() - - c.Db = &sess - - return c, nil -} diff --git a/upper_mongodb.go b/upper_mongodb.go deleted file mode 100644 index 2b0256f..0000000 --- a/upper_mongodb.go +++ /dev/null @@ -1,23 +0,0 @@ -package dorm - -import ( - "errors" - "fmt" - "github.com/upper/db/v4/adapter/mongo" -) - -func NewUpperMongodbClient(settings mongo.ConnectionURL) (*UpperClient, error) { - - var err error - c := &UpperClient{} - - sess, err := mongo.Open(settings) - if err != nil { - return nil, errors.New(fmt.Sprintf("连接失败：%v", err)) - } - defer sess.Close() - - c.Db = &sess - - return c, nil -} diff --git a/upper_mssql.go b/upper_mssql.go deleted file mode 100644 index d22edfc..0000000 --- a/upper_mssql.go +++ /dev/null @@ -1,23 +0,0 @@ -package dorm - -import ( - "errors" - "fmt" - "github.com/upper/db/v4/adapter/mssql" -) - -func NewUpperMssqlClient(settings mssql.ConnectionURL) (*UpperClient, error) { - - var err error - c := &UpperClient{} - - sess, err := mssql.Open(settings) - if err != nil { - return nil, errors.New(fmt.Sprintf("连接失败：%v", err)) - } - defer sess.Close() - - c.Db = &sess - - return c, nil -} diff --git a/upper_ql.go b/upper_ql.go deleted file mode 100644 index 4652c8f..0000000 --- a/upper_ql.go +++ /dev/null @@ -1,23 +0,0 @@ -package dorm - -import ( - "errors" - "fmt" - "github.com/upper/db/v4/adapter/ql" -) - -func NewUpperQlClient(settings ql.ConnectionURL) (*UpperClient, error) { - - var err error - c := &UpperClient{} - - sess, err := ql.Open(settings) - if err != nil { - return nil, errors.New(fmt.Sprintf("连接失败：%v", err)) - } - defer sess.Close() - - c.Db = &sess - - return c, nil -} diff --git a/zorm.go b/zorm.go deleted file mode 100644 index 076368c..0000000 --- a/zorm.go +++ /dev/null @@ -1,17 +0,0 @@ -package dorm - -import ( - "gitee.com/chunanyong/zorm" -) - -type ConfigZormClient struct { - Dns string // 地址 -} - -// ZormClient -// https://zorm.cn/ -// https://www.yuque.com/u27016943/nrgi00 -type ZormClient struct { - Db *zorm.DBDao // 驱动 - config *ConfigZormClient // 配置 -} diff --git a/zorm_clickhouse.go b/zorm_clickhouse.go deleted file mode 100644 index db3f785..0000000 --- a/zorm_clickhouse.go +++ /dev/null @@ -1,25 +0,0 @@ -package dorm - -import ( - "errors" - "fmt" - "gitee.com/chunanyong/zorm" - _ "github.com/mailru/go-clickhouse/v2" -) - -func NewZormClickhouseClient(config *ConfigZormClient) (*ZormClient, error) { - - var err error - c := &ZormClient{config: config} - - c.Db, err = zorm.NewDBDao(&zorm.DataSourceConfig{ - DSN: c.config.Dns, - DriverName: "chhttp", // 数据库驱动名称 - DBType: "clickhouse", // 数据库类型 - }) - if err != nil { - return nil, errors.New(fmt.Sprintf("连接失败：%v", err)) - } - - return c, nil -} diff --git a/zorm_dm.go b/zorm_dm.go deleted file mode 100644 index ba9685f..0000000 --- a/zorm_dm.go +++ /dev/null @@ -1,25 +0,0 @@ -package dorm - -import ( - "errors" - "fmt" - _ "gitee.com/chunanyong/dm" - "gitee.com/chunanyong/zorm" -) - -func NewZormDmClient(config *ConfigZormClient) (*ZormClient, error) { - - var err error - c := &ZormClient{config: config} - - c.Db, err = zorm.NewDBDao(&zorm.DataSourceConfig{ - DSN: c.config.Dns, - DriverName: "dm", // 数据库驱动名称 - DBType: "dm", // 数据库类型 - }) - if err != nil { - return nil, errors.New(fmt.Sprintf("连接失败：%v", err)) - } - - return c, nil -} diff --git a/zorm_gbase.go b/zorm_gbase.go deleted file mode 100644 index c382773..0000000 --- a/zorm_gbase.go +++ /dev/null @@ -1 +0,0 @@ -package dorm diff --git a/zorm_get.go b/zorm_get.go deleted file mode 100644 index e1be6cb..0000000 --- a/zorm_get.go +++ /dev/null @@ -1,10 +0,0 @@ -package dorm - -import ( - "gitee.com/chunanyong/zorm" -) - -// GetDb 获取驱动 -func (c *ZormClient) GetDb() *zorm.DBDao { - return c.Db -} diff --git a/zorm_kingbase.go b/zorm_kingbase.go deleted file mode 100644 index c382773..0000000 --- a/zorm_kingbase.go +++ /dev/null @@ -1 +0,0 @@ -package dorm diff --git a/zorm_mysql.go b/zorm_mysql.go deleted file mode 100644 index 385ae92..0000000 --- a/zorm_mysql.go +++ /dev/null @@ -1,25 +0,0 @@ -package dorm - -import ( - "errors" - "fmt" - "gitee.com/chunanyong/zorm" - _ "github.com/go-sql-driver/mysql" -) - -func NewZormMysqlClient(config *ConfigZormClient) (*ZormClient, error) { - - var err error - c := &ZormClient{config: config} - - c.Db, err = zorm.NewDBDao(&zorm.DataSourceConfig{ - DSN: c.config.Dns, - DriverName: "mysql", // 数据库驱动名称 - DBType: "mysql", // 数据库类型 - }) - if err != nil { - return nil, errors.New(fmt.Sprintf("连接失败：%v", err)) - } - - return c, nil -} diff --git a/zorm_shentong.go b/zorm_shentong.go deleted file mode 100644 index c382773..0000000 --- a/zorm_shentong.go +++ /dev/null @@ -1 +0,0 @@ -package dorm