Skip to content

Commit 4726054

Browse files
committed
Update go-mssqldb
1 parent a08bde3 commit 4726054

File tree

5 files changed

+53
-625
lines changed

5 files changed

+53
-625
lines changed

datasource/datasource_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55
"path/filepath"
66
"testing"
77

8-
_ "github.com/denisenkom/go-mssqldb"
98
_ "github.com/go-sql-driver/mysql"
109
"github.com/k1LoW/tbls/config"
1110
_ "github.com/lib/pq"
11+
_ "github.com/microsoft/go-mssqldb"
1212
)
1313

1414
var tests = []struct {

drivers/mssql/mssql_test.go

+16-9
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,43 @@ package mssql
22

33
import (
44
"database/sql"
5-
"os"
5+
"log"
66
"testing"
77

8-
_ "github.com/denisenkom/go-mssqldb"
98
"github.com/k1LoW/tbls/schema"
9+
_ "github.com/microsoft/go-mssqldb"
1010
"github.com/xo/dburl"
1111
)
1212

1313
var s *schema.Schema
1414
var db *sql.DB
15+
var err error
1516

1617
func TestMain(m *testing.M) {
1718
s = &schema.Schema{
1819
Name: "testdb",
1920
}
20-
db, _ = dburl.Open("ms://SA:MSSQLServer-Passw0rd@localhost:11433/testdb")
21+
db, err = dburl.Open("ms://SA:MSSQLServer-Passw0rd@localhost:11433/testdb")
22+
if err != nil {
23+
log.Fatal(err)
24+
}
2125
defer db.Close()
22-
exit := m.Run()
23-
if exit != 0 {
24-
os.Exit(exit)
26+
if err := db.Ping(); err != nil {
27+
log.Fatal(err)
2528
}
29+
_ = m.Run()
2630
}
2731

28-
func TestAnalyzeView(t *testing.T) {
32+
func TestAnalyzeViewMs(t *testing.T) {
2933
driver := New(db)
3034
err := driver.Analyze(s)
3135
if err != nil {
32-
t.Errorf("%v", err)
36+
t.Error(err)
37+
}
38+
view, err := s.FindTableByName("post_comments")
39+
if err != nil {
40+
t.Fatal(err)
3341
}
34-
view, _ := s.FindTableByName("post_comments")
3542
want := view.Def
3643
if want == "" {
3744
t.Errorf("got not empty string.")

go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ require (
99
github.com/aquasecurity/go-version v0.0.0-20210121072130-637058cfe492
1010
github.com/aws/aws-sdk-go v1.44.157
1111
github.com/beta/freetype v0.0.1
12-
github.com/denisenkom/go-mssqldb v0.12.3
1312
github.com/gertd/go-pluralize v0.2.1
1413
github.com/go-sql-driver/mysql v1.7.0
1514
github.com/goccy/go-graphviz v0.0.9
@@ -23,6 +22,7 @@ require (
2322
github.com/loadoff/excl v0.0.0-20171207172601-c6a9e4c4b4c4
2423
github.com/mattn/go-runewidth v0.0.14
2524
github.com/mattn/go-sqlite3 v1.14.16
25+
github.com/microsoft/go-mssqldb v0.18.0
2626
github.com/minio/pkg v1.5.6
2727
github.com/pkg/errors v0.9.1
2828
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
@@ -72,7 +72,6 @@ require (
7272
github.com/fogleman/gg v1.3.0 // indirect
7373
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
7474
github.com/gabriel-vasile/mimetype v1.4.1 // indirect
75-
github.com/go-stack/stack v1.8.1 // indirect
7675
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
7776
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
7877
github.com/golang-sql/sqlexp v0.1.0 // indirect
@@ -89,7 +88,6 @@ require (
8988
github.com/jmespath/go-jmespath v0.4.0 // indirect
9089
github.com/k1LoW/fontdir v0.1.1 // indirect
9190
github.com/klauspost/compress v1.15.12 // indirect
92-
github.com/kylelemons/godebug v1.1.0 // indirect
9391
github.com/mattn/go-colorable v0.1.13 // indirect
9492
github.com/mattn/go-ieproxy v0.0.9 // indirect
9593
github.com/mattn/go-isatty v0.0.16 // indirect

0 commit comments

Comments
 (0)