From 6f1473704dd76af6101c1dec13c0ddc8f07d96a0 Mon Sep 17 00:00:00 2001 From: zhaolun Date: Tue, 25 Apr 2023 19:56:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update:=20sqlserver=20=E9=A9=B1=E5=8A=A8?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=BD=BF=E7=94=A8=E4=B8=A4=E4=B8=AA=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E7=9A=84=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 1 - pkg/database/sql/mssql.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 398995e..967d4bf 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,6 @@ go 1.18 require ( github.com/BurntSushi/toml v0.3.1 github.com/Shopify/sarama v1.26.4 - github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 github.com/eclipse/paho.mqtt.golang v1.4.1 github.com/fatih/color v1.9.0 diff --git a/pkg/database/sql/mssql.go b/pkg/database/sql/mssql.go index 64bd64f..3b8dc20 100644 --- a/pkg/database/sql/mssql.go +++ b/pkg/database/sql/mssql.go @@ -4,7 +4,7 @@ import ( "github.com/mapgoo-lab/atreus/pkg/log" // database driver - _ "github.com/denisenkom/go-mssqldb" + _ "github.com/microsoft/go-mssqldb" ) // NewMSSQL new db and retry connection when has error. From 38be0884313dbc6974e48a9cf79552f4bffcf264 Mon Sep 17 00:00:00 2001 From: zhaolun Date: Wed, 26 Apr 2023 08:59:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?update:=20=E4=B8=8D=E4=BF=AE=E6=94=B9sqlser?= =?UTF-8?q?ver=20=E9=A9=B1=E5=8A=A8=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 8 ++++++-- pkg/database/sql/mssql.go | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 967d4bf..51a359c 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.18 require ( github.com/BurntSushi/toml v0.3.1 github.com/Shopify/sarama v1.26.4 + github.com/denisenkom/go-mssqldb v0.12.3 github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 github.com/eclipse/paho.mqtt.golang v1.4.1 github.com/fatih/color v1.9.0 @@ -65,7 +66,6 @@ require ( github.com/gobuffalo/logger v1.0.3 // indirect github.com/gobuffalo/packd v1.0.0 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect - github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/golang/mock v1.4.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/uuid v1.3.0 // indirect @@ -85,7 +85,6 @@ require ( github.com/mattn/go-isatty v0.0.11 // indirect github.com/mattn/go-sqlite3 v1.14.15 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/microsoft/go-mssqldb v0.17.0 // indirect github.com/paulmach/orb v0.7.1 // indirect github.com/pierrec/lz4 v2.4.1+incompatible // indirect github.com/pierrec/lz4/v4 v4.1.17 // indirect @@ -124,3 +123,8 @@ require ( modernc.org/mathutil v1.1.1 // indirect modernc.org/strutil v1.1.0 // indirect ) + +replace ( + github.com/denisenkom/go-mssqldb v0.12.3 => github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc + gorm.io/driver/sqlserver v1.4.1 => gorm.io/driver/sqlserver v1.4.0 +) diff --git a/pkg/database/sql/mssql.go b/pkg/database/sql/mssql.go index 3b8dc20..64bd64f 100644 --- a/pkg/database/sql/mssql.go +++ b/pkg/database/sql/mssql.go @@ -4,7 +4,7 @@ import ( "github.com/mapgoo-lab/atreus/pkg/log" // database driver - _ "github.com/microsoft/go-mssqldb" + _ "github.com/denisenkom/go-mssqldb" ) // NewMSSQL new db and retry connection when has error. From 35c110dfde61dc6af33d114675d933033b763aee Mon Sep 17 00:00:00 2001 From: zhaolun Date: Wed, 26 Apr 2023 09:14:13 +0800 Subject: [PATCH 3/4] =?UTF-8?q?update:=20=E4=B8=8D=E4=BF=AE=E6=94=B9sqlser?= =?UTF-8?q?ver=20=E9=A9=B1=E5=8A=A8=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 51a359c..112ccc9 100644 --- a/go.mod +++ b/go.mod @@ -66,6 +66,7 @@ require ( github.com/gobuffalo/logger v1.0.3 // indirect github.com/gobuffalo/packd v1.0.0 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect + github.com/golang-sql/sqlexp v0.1.0 // indirect github.com/golang/mock v1.4.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/uuid v1.3.0 // indirect @@ -85,6 +86,7 @@ require ( github.com/mattn/go-isatty v0.0.11 // indirect github.com/mattn/go-sqlite3 v1.14.15 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/microsoft/go-mssqldb v0.17.0 // indirect github.com/paulmach/orb v0.7.1 // indirect github.com/pierrec/lz4 v2.4.1+incompatible // indirect github.com/pierrec/lz4/v4 v4.1.17 // indirect @@ -123,8 +125,3 @@ require ( modernc.org/mathutil v1.1.1 // indirect modernc.org/strutil v1.1.0 // indirect ) - -replace ( - github.com/denisenkom/go-mssqldb v0.12.3 => github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc - gorm.io/driver/sqlserver v1.4.1 => gorm.io/driver/sqlserver v1.4.0 -) From 5a31935d92098c42bbad96cef9e5ff09924bc97d Mon Sep 17 00:00:00 2001 From: zhaolun Date: Wed, 26 Apr 2023 09:15:09 +0800 Subject: [PATCH 4/4] add --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 112ccc9..398995e 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/BurntSushi/toml v0.3.1 github.com/Shopify/sarama v1.26.4 - github.com/denisenkom/go-mssqldb v0.12.3 + github.com/denisenkom/go-mssqldb v0.0.0-20200428022330-06a60b6afbbc github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 github.com/eclipse/paho.mqtt.golang v1.4.1 github.com/fatih/color v1.9.0