Skip to content

Commit

Permalink
correct linter and fix pipe typing
Browse files Browse the repository at this point in the history
  • Loading branch information
Denis Dorozhkin committed Mar 25, 2021
1 parent 32f0e34 commit 2230c91
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 47 deletions.
6 changes: 2 additions & 4 deletions config.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,8 @@ func (cfg *Config) url(extra map[string]string, dsn bool) *url.URL {
for k, v := range cfg.Params {
query.Set(k, v)
}
if extra != nil {
for k, v := range extra {
query.Set(k, v)
}
for k, v := range extra {
query.Set(k, v)
}

u.RawQuery = query.Encode()
Expand Down
6 changes: 3 additions & 3 deletions conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,15 +290,15 @@ func (c *conn) buildRequest(ctx context.Context, query string, params []driver.V
method string
err error
)
if params != nil && len(params) > 0 {
if len(params) > 0 {
if query, err = interpolateParams(query, params); err != nil {
return nil, err
}
}

var (
bodyReader io.Reader
bodyWriter io.Writer
bodyReader *io.PipeReader
bodyWriter *io.PipeWriter
)
if readonly {
method = http.MethodGet
Expand Down
4 changes: 2 additions & 2 deletions dataparser.go
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ type tupleParser struct {
}

func (p *tupleParser) Type() reflect.Type {
fields := make([]reflect.StructField, len(p.args), len(p.args))
fields := make([]reflect.StructField, len(p.args))
for i, arg := range p.args {
fields[i].Name = "Field" + strconv.Itoa(i)
fields[i].Type = arg.Type()
Expand Down Expand Up @@ -573,7 +573,7 @@ func newDataParser(t *TypeDesc, unquote bool, opt *DataParserOptions) (DataParse
if len(t.Args) < 1 {
return nil, fmt.Errorf("element types not specified for Tuple")
}
subParsers := make([]DataParser, len(t.Args), len(t.Args))
subParsers := make([]DataParser, len(t.Args))
for i, arg := range t.Args {
subParser, err := newDataParser(arg, true, opt)
if err != nil {
Expand Down
30 changes: 0 additions & 30 deletions helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,3 @@ func readResponse(response *http.Response) (result []byte, err error) {
result = buf.Bytes()
return
}

func numOfColumns(data []byte) int {
var cnt int
for _, ch := range data {
switch ch {
case '\t':
cnt++
case '\n':
return cnt + 1
}
}
return -1
}

// splitTSV splits one row of tab separated values, returns begin of next row
func splitTSV(data []byte, out []string) int {
var i, k int
for j, ch := range data {
switch ch {
case '\t':
out[k] = string(data[i:j])
k++
i = j + 1
case '\n':
out[k] = string(data[i:j])
return j + 1
}
}
return -1
}
2 changes: 1 addition & 1 deletion rows.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func newTextRows(c *conn, body io.ReadCloser, location *time.Location, useDBLoca
}
}

parsers := make([]DataParser, len(types), len(types))
parsers := make([]DataParser, len(types))
for i, typ := range types {
desc, err := ParseTypeDesc(typ)
if err != nil {
Expand Down
24 changes: 17 additions & 7 deletions stmt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,12 @@ func (s *stmtSuite) TestExecMulti() {
require.NoError(err)
st, err := tx.Prepare(tc.insertQuery)
require.NoError(err)
st.Exec(tc.exec1)
st.Exec(tc.exec2)
_, err = st.Exec(tc.exec1)
require.NoError(err)
_, err = st.Exec(tc.exec2)
require.NoError(err)
rows, err := s.conn.Query(tc.query1)
require.NoError(err)
s.False(rows.Next())
s.NoError(rows.Close())
require.NoError(tx.Commit())
Expand All @@ -167,9 +170,12 @@ func (s *stmtSuite) TestExecMultiRollback() {
require.NoError(err)
st, err := tx.Prepare("INSERT INTO data (i64) VALUES (?)")
require.NoError(err)
st.Exec(31)
st.Exec(32)
_, err = st.Exec(31)
require.NoError(err)
_, err = st.Exec(32)
require.NoError(err)
rows, err := s.conn.Query("SELECT i64 FROM data WHERE i64=31")
s.NoError(err)
s.False(rows.Next())
s.NoError(rows.Close())
require.NoError(tx.Rollback())
Expand All @@ -188,9 +194,12 @@ func (s *stmtSuite) TestExecMultiInterrupt() {
require.NoError(err)
st2, err := tx.Prepare("INSERT INTO data (i64) VALUES (?)")
require.NoError(err)
st.Exec(31)
st.Exec(32)
_, err = st.Exec(31)
require.NoError(err)
_, err = st.Exec(32)
require.NoError(err)
rows, err := s.conn.Query("SELECT i64 FROM data WHERE i64=31")
s.NoError(err)
s.False(rows.Next())
s.NoError(rows.Close())
require.NoError(st.Close())
Expand All @@ -209,7 +218,8 @@ func (s *stmtSuite) TestFixDoubleInterpolateInStmt() {
st, err := tx.Prepare("INSERT INTO data (s, s2) VALUES (?, ?)")
require.NoError(err)
args := []interface{}{"'", "?"}
st.Exec(args...)
_, err = st.Exec(args...)
require.NoError(err)
require.NoError(tx.Commit())
require.NoError(st.Close())
rows, err := s.conn.Query("SELECT s, s2 FROM data WHERE s='\\'' AND s2='?'")
Expand Down

0 comments on commit 2230c91

Please sign in to comment.