Skip to content

Commit

Permalink
Enable support for table schema
Browse files Browse the repository at this point in the history
  • Loading branch information
lafriks committed Aug 14, 2023
1 parent 94c5693 commit 6ba69dd
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions mssql.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,11 @@ type MSSQL struct {
sql.SQL
}

var (
_ rel.Adapter = (*MSSQL)(nil)
)
var _ rel.Adapter = (*MSSQL)(nil)

// Begin begins a new transaction.
func (m MSSQL) Begin(ctx context.Context) (rel.Adapter, error) {
var (
txSql, err = m.SQL.Begin(ctx)
)
txSql, err := m.SQL.Begin(ctx)

return &MSSQL{SQL: *txSql.(*sql.SQL)}, err
}
Expand Down Expand Up @@ -85,7 +81,7 @@ func (m MSSQL) InsertAll(ctx context.Context, query rel.Query, primaryField stri
// New mssql adapter using existing connection.
func New(db *db.DB) rel.Adapter {
var (
bufferFactory = builder.BufferFactory{ArgumentPlaceholder: "@p", ArgumentOrdinal: true, BoolTrueValue: "1", BoolFalseValue: "0", Quoter: builder.Quote{IDPrefix: "[", IDSuffix: "]", IDSuffixEscapeChar: "]", ValueQuote: "'", ValueQuoteEscapeChar: "'"}}
bufferFactory = builder.BufferFactory{AllowTableSchema: true, ArgumentPlaceholder: "@p", ArgumentOrdinal: true, BoolTrueValue: "1", BoolFalseValue: "0", Quoter: builder.Quote{IDPrefix: "[", IDSuffix: "]", IDSuffixEscapeChar: "]", ValueQuote: "'", ValueQuoteEscapeChar: "'"}}

Check failure on line 84 in mssql.go

View workflow job for this annotation

GitHub Actions / Test (2017)

unknown field AllowTableSchema in struct literal of type "github.com/go-rel/sql/builder".BufferFactory
filterBuilder = builder.Filter{}
queryBuilder = mssqlbuilder.Query{Query: builder.Query{BufferFactory: bufferFactory, Filter: filterBuilder}}
InsertBuilder = mssqlbuilder.Insert{BufferFactory: bufferFactory}
Expand Down Expand Up @@ -115,7 +111,7 @@ func New(db *db.DB) rel.Adapter {

// Open mssql connection using dsn.
func Open(dsn string) (rel.Adapter, error) {
var database, err = db.Open("sqlserver", dsn)
database, err := db.Open("sqlserver", dsn)
return New(database), err
}

Expand All @@ -124,7 +120,7 @@ func errorMapper(err error) error {
return nil
}

var msg = err.Error()
msg := err.Error()

switch {
case strings.HasPrefix(msg, "mssql: Violation of PRIMARY KEY"):
Expand Down

0 comments on commit 6ba69dd

Please sign in to comment.