Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix NamedValueChecker implemented on conn not used #61

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion connection.go
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ func (c *connection) statement(stmt driver.Stmt, err error, id, query string) (d
return stmt, err
}

return &statement{Stmt: stmt, query: query, logger: c.logger, connID: c.id, id: id}, nil
return &statement{Stmt: stmt, query: query, logger: c.logger, connID: c.id, conn: c.Conn, id: id}, nil
}

func (c *connection) rows(res driver.Rows, err error, query string, args []driver.Value) (driver.Rows, error) {
Expand Down
6 changes: 5 additions & 1 deletion statement.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ type statement struct {
query string
logger *logger
id string
conn driver.Conn
connID string
}

Expand Down Expand Up @@ -115,7 +116,10 @@ func (s *statement) QueryContext(ctx context.Context, args []driver.NamedValue)
func (s *statement) CheckNamedValue(nm *driver.NamedValue) error {
checker, ok := s.Stmt.(driver.NamedValueChecker)
if !ok {
return driver.ErrSkip
checker, ok = s.conn.(driver.NamedValueChecker)
if !ok {
return driver.ErrSkip
}
}

lvl, start := LevelTrace, time.Now()
Expand Down
20 changes: 20 additions & 0 deletions statement_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"database/sql/driver"
"encoding/json"
"errors"
"testing"

"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -376,6 +377,17 @@ func TestStatement_CheckNamedValue(t *testing.T) {
assert.NotEmpty(t, stmtOutput.Data[testOpts.connIDFieldname])
})

t.Run("Implement driver.NamedValueChecker on conn but stmt", func(t *testing.T) {
stmtMock := &statementMock{}
connMock := &driverConnNamedValueCheckerMock{}
mockErr := errors.New("mock")
connMock.On("CheckNamedValue", mock.Anything).Return(mockErr)

stmt := &statement{Stmt: stmtMock, logger: testLogger, id: testLogger.opt.uidGenerator.UniqueID(), connID: testLogger.opt.uidGenerator.UniqueID(), conn: connMock}
err := stmt.CheckNamedValue(&driver.NamedValue{Name: "", Ordinal: 0, Value: "testid"})
assert.Equal(t, mockErr, err)
})

t.Run("Not implement driver.NamedValueChecker", func(t *testing.T) {
stmtMock := &statementMock{}

Expand Down Expand Up @@ -458,6 +470,14 @@ func (m *statementNamedValueCheckerMock) CheckNamedValue(nm *driver.NamedValue)
return m.Called().Error(0)
}

type driverConnNamedValueCheckerMock struct {
driverConnMock
}

func (c *driverConnNamedValueCheckerMock) CheckNamedValue(nm *driver.NamedValue) error {
return c.Called().Error(0)
}

type statementValueConverterMock struct {
statementMock
}
Expand Down