Fix more lint issues

Author: ido50

.golangci.yml

@@ -5,6 +5,7 @@ linters:
     disable-all: true
     enable:
         - govet
+        - golint
         - errcheck
         - staticcheck
         - unused

README.md

@@ -1,9 +1,10 @@
 <h2 align="center">sqlz</h2>
-<p align="center">sqlz is an SQL query builder for Go.</p>
+<p align="center">flexible SQL query builder for Go.</p>
 <p align="center">
 	<a href="https://godoc.org/github.com/ido50/sqlz"><img src="https://img.shields.io/badge/godoc-reference-blue.svg"></a>
     <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-blue.svg"></a>
 	<a href="https://goreportcard.com/report/ido50/sqlz"><img src="https://goreportcard.com/badge/github.com/ido50/sqlz"></a>
+    <a href="https://github.com/ido50/sqlz/actions"><img src="https://github.com/ido50/sqlz/workflows/build/badge.svg"></a>
 </p>
 
 ---

delete.go

@@ -99,7 +99,7 @@ func (stmt *DeleteStmt) Exec() (res sql.Result, err error) {
 	asSQL, bindings := stmt.ToSQL(true)
 
 	res, err = stmt.execer.Exec(asSQL, bindings...)
-	stmt.HandlerError(err)
+	stmt.HandleError(err)
 
 	return res, err
 }
@@ -113,7 +113,7 @@ func (stmt *DeleteStmt) ExecContext(ctx context.Context) (
 	asSQL, bindings := stmt.ToSQL(true)
 
 	res, err = stmt.execer.ExecContext(ctx, asSQL, bindings...)
-	stmt.HandlerError(err)
+	stmt.HandleError(err)
 
 	return res, err
 }
@@ -127,7 +127,7 @@ func (stmt *DeleteStmt) GetRow(into interface{}) error {
 	asSQL, bindings := stmt.ToSQL(true)
 
 	err := sqlx.Get(stmt.execer, into, asSQL, bindings...)
-	stmt.HandlerError(err)
+	stmt.HandleError(err)
 
 	return err
 }
@@ -144,7 +144,7 @@ func (stmt *DeleteStmt) GetRowContext(
 	asSQL, bindings := stmt.ToSQL(true)
 
 	err := sqlx.GetContext(ctx, stmt.execer, into, asSQL, bindings...)
-	stmt.HandlerError(err)
+	stmt.HandleError(err)
 
 	return err
 }
@@ -156,7 +156,7 @@ func (stmt *DeleteStmt) GetAll(into interface{}) error {
 	asSQL, bindings := stmt.ToSQL(true)
 
 	err := sqlx.Select(stmt.execer, into, asSQL, bindings...)
-	stmt.HandlerError(err)
+	stmt.HandleError(err)
 
 	return err
 }
@@ -168,7 +168,7 @@ func (stmt *DeleteStmt) GetAllContext(ctx context.Context, into interface{}) err
 	asSQL, bindings := stmt.ToSQL(true)
 
 	err := sqlx.SelectContext(ctx, stmt.execer, into, asSQL, bindings...)
-	stmt.HandlerError(err)
+	stmt.HandleError(err)
 
 	return err
 }

delete_test.go

@@ -7,28 +7,28 @@ import (
 func TestDelete(t *testing.T) {
 	runTests(t, func(dbz *DB) []test {
 		return []test{
-			test{
+			{
 				"delete all table",
 				dbz.DeleteFrom("table"),
 				"DELETE FROM table",
 				[]interface{}{},
 			},
 
-			test{
+			{
 				"delete all rows matching condition",
 				dbz.DeleteFrom("table").Where(Or(Eq("id", 1), And(Eq("name", "some-name"), Gt("integer", 3)))),
 				"DELETE FROM table WHERE id = ? OR (name = ? AND integer > ?)",
 				[]interface{}{1, "some-name", 3},
 			},
 
-			test{
+			{
 				"delete with returning clause",
 				dbz.DeleteFrom("table").Where(Eq("id", 2)).Returning("name"),
 				"DELETE FROM table WHERE id = ? RETURNING name",
 				[]interface{}{2},
 			},
 
-			test{
+			{
 				"delete using join",
 				dbz.DeleteFrom("table").Using("other", "another").Where(Eq("other.fk_id", Indirect("table.id")), Eq("another.fk_id", Indirect("table.id"))),
 				"DELETE FROM table USING other, another WHERE other.fk_id = table.id AND another.fk_id = table.id",

insert.go

@@ -74,8 +74,7 @@ func (stmt *InsertStmt) ValueMultiple(vals [][]interface{}) *InsertStmt {
 	return stmt
 }
 
-// Select sets a SELECT statements that will supply the rows
-// to be inserted.
+// FromSelect sets a SELECT statements that will supply the rows to be inserted.
 func (stmt *InsertStmt) FromSelect(selStmt *SelectStmt) *InsertStmt {
 	stmt.SelectStmt = selStmt
 	return stmt
@@ -195,7 +194,7 @@ func (stmt *InsertStmt) ToSQL(rebind bool) (asSQL string, bindings []interface{}
 func (stmt *InsertStmt) Exec() (res sql.Result, err error) {
 	asSQL, bindings := stmt.ToSQL(true)
 	res, err = stmt.execer.Exec(asSQL, bindings...)
-	stmt.Statement.HandlerError(err)
+	stmt.Statement.HandleError(err)
 
 	return res, err
 }
@@ -206,7 +205,7 @@ func (stmt *InsertStmt) ExecContext(ctx context.Context) (res sql.Result, err er
 	asSQL, bindings := stmt.ToSQL(true)
 
 	res, err = stmt.execer.ExecContext(ctx, asSQL, bindings...)
-	stmt.Statement.HandlerError(err)
+	stmt.Statement.HandleError(err)
 
 	return res, err
 }
@@ -253,8 +252,11 @@ func (stmt *InsertStmt) GetAllContext(ctx context.Context, into interface{}) err
 type ConflictAction string
 
 const (
+	// DoNothing represents a "DO NOTHING" conflict action
 	DoNothing ConflictAction = "nothing"
-	DoUpdate  ConflictAction = "update"
+
+	// DoUpdate represents a "DO UPDATE" conflict action
+	DoUpdate ConflictAction = "update"
 )
 
 // ConflictClause represents an ON CONFLICT clause in an INSERT statement

insert_test.go

@@ -5,35 +5,35 @@ import "testing"
 func TestInsert(t *testing.T) {
 	runTests(t, func(dbz *DB) []test {
 		return []test{
-			test{
+			{
 				"simple insert",
 				dbz.InsertInto("table").Columns("id", "name", "date").Values(1, "My Name", 96969696),
 				"INSERT INTO table (id, name, date) VALUES (?, ?, ?)",
 				[]interface{}{1, "My Name", 96969696},
 			},
 
-			test{
+			{
 				"insert with value map",
 				dbz.InsertInto("table").ValueMap(map[string]interface{}{"id": 1, "name": "My Name"}),
 				"INSERT INTO table (id, name) VALUES (?, ?)",
 				[]interface{}{1, "My Name"},
 			},
 
-			test{
+			{
 				"insert with returning clause",
 				dbz.InsertInto("table").Columns("one", "two").Values(1, 2).Returning("id"),
 				"INSERT INTO table (one, two) VALUES (?, ?) RETURNING id",
 				[]interface{}{1, 2},
 			},
 
-			test{
+			{
 				"insert with on conflict do nothing clause",
 				dbz.InsertInto("table").Columns("one", "two").Values(1, 2).OnConflictDoNothing(),
 				"INSERT INTO table (one, two) VALUES (?, ?) ON CONFLICT DO NOTHING",
 				[]interface{}{1, 2},
 			},
 
-			test{
+			{
 				"insert rows from a select query",
 				dbz.InsertInto("table").Columns("one", "two").FromSelect(
 					dbz.Select("*").From("table2"),
@@ -42,7 +42,7 @@ func TestInsert(t *testing.T) {
 				[]interface{}{},
 			},
 
-			test{
+			{
 				"insert with on conflict do update",
 				dbz.InsertInto("table").Columns("name").Values("My Name").
 					OnConflict(
@@ -57,7 +57,7 @@ func TestInsert(t *testing.T) {
 				[]interface{}{"My Name", 55151515, "Some Address", "My Name Again"},
 			},
 
-			test{
+			{
 				"insert with on conflict do update conditional set",
 				dbz.InsertInto("table").Columns("name").Values("My Name").
 					OnConflict(
@@ -71,20 +71,20 @@ func TestInsert(t *testing.T) {
 				[]interface{}{"My Name", 55151515, 1},
 			},
 
-			test{
+			{
 				"insert or ignore",
 				dbz.InsertInto("table").OrIgnore().Columns("id", "name", "date").Values(1, "My Name", 96969696),
 				"INSERT OR IGNORE INTO table (id, name, date) VALUES (?, ?, ?)",
 				[]interface{}{1, "My Name", 96969696},
 			},
-			test{
+			{
 				"insert or replace",
 				dbz.InsertInto("table").OrReplace().Columns("id", "name", "date").Values(1, "My Name", 96969696),
 				"INSERT OR REPLACE INTO table (id, name, date) VALUES (?, ?, ?)",
 				[]interface{}{1, "My Name", 96969696},
 			},
 
-			test{
+			{
 				"insert with multiple values",
 				dbz.InsertInto("table").Columns("id", "name").
 					ValueMultiple([][]interface{}{{1, "My Name"}, {2, "John"}, {3, "Golang"}}),

jsonb.go

@@ -4,15 +4,22 @@ import (
 	"strings"
 )
 
+// JSONBObject represents a PostgreSQL JSONB object.
 type JSONBObject struct {
+	// Bindings is the list of bindings for the object.
 	Bindings []interface{}
 }
 
+// JSONBBuilder represents usage of PostgreSQL's jsonb_build_array or
+// jsonb_build_object functions.
 type JSONBBuilder struct {
-	Array    bool
+	// Array indicates whether an array is being built, or an object
+	Array bool
+	// Bindings is the list of bindings for the function call
 	Bindings []interface{}
 }
 
+// BuildJSONBObject creates a call to jsonb_build_object.
 func BuildJSONBObject(in map[string]interface{}) (out JSONBBuilder) {
 	for _, key := range sortKeys(in) {
 		val := in[key]
@@ -22,13 +29,16 @@ func BuildJSONBObject(in map[string]interface{}) (out JSONBBuilder) {
 	return out
 }
 
+// BuildJSONBArray creates a call to jsonb_build_array.
 func BuildJSONBArray(in ...interface{}) (out JSONBBuilder) {
 	out.Array = true
 	out.Bindings = append(out.Bindings, in...)
 
 	return out
 }
 
+// Parse processes the JSONB object creator, returning SQL code that calls
+// the appropriate function.
 func (b JSONBBuilder) Parse() (asSQL string, bindings []interface{}) {
 	asSQL = "jsonb_build_"
 	if b.Array {

jsonb_test.go

@@ -5,7 +5,7 @@ import "testing"
 func TestJSONBBuilder(t *testing.T) {
 	runTests(t, func(dbz *DB) []test {
 		return []test{
-			test{
+			{
 				"create a complex JSONB object",
 				dbz.
 					InsertInto("table").