v9.7.1

* Fix all formatting for golangci-lint * Move to golangci-lint github action
doug-martin · Mar 17, 2020 · 0b21ed8 · 0b21ed8
1 parent 5edc406
commit 0b21ed8
Show file tree

Hide file tree

Showing 45 changed files with 178 additions and 241 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -25,6 +25,8 @@ jobs:
     steps:
     - name: checkout
       uses: actions/checkout@v1
+    - name: Run golangci-lint
+      uses: actions-contrib/golangci-lint@v1
     - name: Test
       env:
         GO_VERSION: ${{ matrix.go_version }}

diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,8 @@
+# v9.7.1
+
+* Fix all formatting for golangci-lint
+* Move to golangci-lint github action
+
 # v9.7.0
 
 * [ADDED] Support for sqlserver dialect [#197](https://github.com/doug-martin/goqu/issues/197),[#205](https://github.com/doug-martin/goqu/issues/205) - [@vlanse](https://github.com/vlanse)

diff --git a/database_example_test.go b/database_example_test.go
@@ -133,7 +133,6 @@ func ExampleDatabase_ExecContext() {
 }
 
 func ExampleDatabase_From() {
-
 	db := getDb()
 	var names []string
 

diff --git a/database_test.go b/database_test.go
@@ -24,7 +24,7 @@ func (dtml *dbTestMockLogger) Printf(format string, v ...interface{}) {
 	dtml.Messages = append(dtml.Messages, fmt.Sprintf(format, v...))
 }
 
-func (dtml *dbTestMockLogger) Reset(format string, v ...interface{}) {
+func (dtml *dbTestMockLogger) Reset() {
 	dtml.Messages = dtml.Messages[0:0]
 }
 

diff --git a/delete_dataset_example_test.go b/delete_dataset_example_test.go
@@ -54,7 +54,6 @@ func ExampleDeleteDataset_Executor_returning() {
 }
 
 func ExampleDeleteDataset_With() {
-
 	sql, _, _ := goqu.Delete("test").
 		With("check_vals(val)", goqu.From().Select(goqu.L("123"))).
 		Where(goqu.C("val").Eq(goqu.From("check_vals").Select("val"))).

diff --git a/delete_dataset_test.go b/delete_dataset_test.go
@@ -449,7 +449,6 @@ func (dds *deleteDatasetSuite) TestExecutor() {
 }
 
 func (dds *deleteDatasetSuite) TestSetError() {
-
 	err1 := errors.New("error #1")
 	err2 := errors.New("error #2")
 	err3 := errors.New("error #3")

diff --git a/dialect/mysql/mysql_test.go b/dialect/mysql/mysql_test.go
@@ -11,7 +11,6 @@ import (
 
 	"github.com/doug-martin/goqu/v9"
 	"github.com/doug-martin/goqu/v9/dialect/mysql"
-	_ "github.com/doug-martin/goqu/v9/dialect/mysql"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/stretchr/testify/suite"
 )
@@ -388,7 +387,6 @@ func (mt *mysqlTest) TestInsertReturning() {
 	e := entry{Int: 10, Float: 1.000000, String: "1.000000", Time: now, Bool: true, Bytes: []byte("1.000000")}
 	_, err := ds.Insert().Rows(e).Returning(goqu.Star()).Executor().ScanStruct(&e)
 	mt.Error(err)
-
 }
 
 func (mt *mysqlTest) TestUpdate() {

diff --git a/dialect/sqlite3/sqlite3_dialect_test.go b/dialect/sqlite3/sqlite3_dialect_test.go
@@ -192,7 +192,6 @@ func (sds *sqlite3DialectSuite) TestBooleanOperations() {
 	sql, _, err = ds.Where(goqu.C("a").NotILike(regexp.MustCompile("(a|b)"))).ToSQL()
 	sds.NoError(err)
 	sds.Equal("SELECT * FROM `test` WHERE (`a` NOT REGEXP '(a|b)')", sql)
-
 }
 
 func TestDatasetAdapterSuite(t *testing.T) {

diff --git a/dialect/sqlite3/sqlite3_test.go b/dialect/sqlite3/sqlite3_test.go
@@ -397,7 +397,6 @@ func (st *sqlite3Suite) TestInsert_returning() {
 	e := entry{Int: 10, Float: 1.000000, String: "1.000000", Time: now, Bool: true, Bytes: []byte("1.000000")}
 	_, err := ds.Insert().Rows(e).Returning(goqu.Star()).Executor().ScanStruct(&e)
 	st.Error(err)
-
 }
 
 func (st *sqlite3Suite) TestUpdate() {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,6 +9,8 @@ services:
       - "POSTGRES_HOST_AUTH_METHOD=trust"
     expose:
       - "5432"
+    ports:
+      - "5432:5432"
 
   mysql:
     image: "mysql:${MYSQL_VERSION}"
@@ -17,6 +19,8 @@ services:
       - "MYSQL_ALLOW_EMPTY_PASSWORD=yes"
     expose:
       - "3306"
+    ports:
+      - "3306:3306"
 
   sqlserver:
     image: "mcr.microsoft.com/mssql/server:${SQLSERVER_VERSION}"
@@ -25,6 +29,8 @@ services:
       - "SA_PASSWORD=qwe123QWE"
     expose:
       - "1433"
+    ports:
+      - "1433:1433"
 
   goqu:
     image: "golang:${GO_VERSION}"

diff --git a/exec/query_executor_test.go b/exec/query_executor_test.go
@@ -62,7 +62,6 @@ func (qes *queryExecutorSuite) TestWithError() {
 }
 
 func (qes *queryExecutorSuite) TestToSQL() {
-
 	db, _, err := sqlmock.New()
 	qes.NoError(err)
 
@@ -71,7 +70,6 @@ func (qes *queryExecutorSuite) TestToSQL() {
 	qes.NoError(err)
 	qes.Equal(`SELECT * FROM "items"`, query)
 	qes.Empty(args)
-
 }
 
 func (qes *queryExecutorSuite) TestScanStructs_withTaggedFields() {
@@ -160,7 +158,7 @@ func (qes *queryExecutorSuite) TestScanStructs_withPointerFields() {
 
 func (qes *queryExecutorSuite) TestScanStructs_withPrivateFields() {
 	type StructWithPrivateTags struct {
-		private string // nolint:structcheck,unused
+		private string // nolint:structcheck,unused // need for test
 		Address string `db:"address"`
 		Name    string `db:"name"`
 	}
@@ -1015,7 +1013,6 @@ func (qes *queryExecutorSuite) TestScanStruct_taggedStructs() {
 			Age:            testAge2,
 		},
 	}, item)
-
 }
 
 func (qes *queryExecutorSuite) TestScanVals() {

diff --git a/exp/col.go b/exp/col.go
@@ -42,7 +42,6 @@ func NewColumnListExpression(vals ...interface{}) ColumnListExpression {
 			} else {
 				panic(fmt.Sprintf("Cannot created expression from  %+v", val))
 			}
-
 		}
 	}
 	return columnList{columns: cols}

diff --git a/exp/exp_map.go b/exp/exp_map.go
@@ -108,7 +108,7 @@ func createOredExpressionFromMap(lhs IdentifierExpression, op Op) ([]Expression,
 	return ors, nil
 }
 
-// nolint:gocyclo
+// nolint:gocyclo // not complex just long
 func createExpressionFromOp(lhs IdentifierExpression, opKey string, op Op) (exp Expression, err error) {
 	switch strings.ToLower(opKey) {
 	case EqOp.String():

diff --git a/exp/func.go b/exp/func.go
@@ -16,21 +16,32 @@ func (sfe sqlFunctionExpression) Clone() Expression {
 	return sqlFunctionExpression{name: sfe.name, args: sfe.args}
 }
 
-func (sfe sqlFunctionExpression) Expression() Expression                    { return sfe }
-func (sfe sqlFunctionExpression) Args() []interface{}                       { return sfe.args }
-func (sfe sqlFunctionExpression) Name() string                              { return sfe.name }
-func (sfe sqlFunctionExpression) As(val interface{}) AliasedExpression      { return aliased(sfe, val) }
-func (sfe sqlFunctionExpression) Eq(val interface{}) BooleanExpression      { return eq(sfe, val) }
-func (sfe sqlFunctionExpression) Neq(val interface{}) BooleanExpression     { return neq(sfe, val) }
-func (sfe sqlFunctionExpression) Gt(val interface{}) BooleanExpression      { return gt(sfe, val) }
-func (sfe sqlFunctionExpression) Gte(val interface{}) BooleanExpression     { return gte(sfe, val) }
-func (sfe sqlFunctionExpression) Lt(val interface{}) BooleanExpression      { return lt(sfe, val) }
-func (sfe sqlFunctionExpression) Lte(val interface{}) BooleanExpression     { return lte(sfe, val) }
-func (sfe sqlFunctionExpression) Between(val RangeVal) RangeExpression      { return between(sfe, val) }
-func (sfe sqlFunctionExpression) NotBetween(val RangeVal) RangeExpression   { return notBetween(sfe, val) }
+func (sfe sqlFunctionExpression) Expression() Expression { return sfe }
+
+func (sfe sqlFunctionExpression) Args() []interface{} { return sfe.args }
+
+func (sfe sqlFunctionExpression) Name() string { return sfe.name }
+
+func (sfe sqlFunctionExpression) As(val interface{}) AliasedExpression { return aliased(sfe, val) }
+
+func (sfe sqlFunctionExpression) Eq(val interface{}) BooleanExpression  { return eq(sfe, val) }
+func (sfe sqlFunctionExpression) Neq(val interface{}) BooleanExpression { return neq(sfe, val) }
+
+func (sfe sqlFunctionExpression) Gt(val interface{}) BooleanExpression  { return gt(sfe, val) }
+func (sfe sqlFunctionExpression) Gte(val interface{}) BooleanExpression { return gte(sfe, val) }
+func (sfe sqlFunctionExpression) Lt(val interface{}) BooleanExpression  { return lt(sfe, val) }
+func (sfe sqlFunctionExpression) Lte(val interface{}) BooleanExpression { return lte(sfe, val) }
+
+func (sfe sqlFunctionExpression) Between(val RangeVal) RangeExpression { return between(sfe, val) }
+
+func (sfe sqlFunctionExpression) NotBetween(val RangeVal) RangeExpression {
+	return notBetween(sfe, val)
+}
+
 func (sfe sqlFunctionExpression) Like(val interface{}) BooleanExpression    { return like(sfe, val) }
 func (sfe sqlFunctionExpression) NotLike(val interface{}) BooleanExpression { return notLike(sfe, val) }
 func (sfe sqlFunctionExpression) ILike(val interface{}) BooleanExpression   { return iLike(sfe, val) }
+
 func (sfe sqlFunctionExpression) NotILike(val interface{}) BooleanExpression {
 	return notILike(sfe, val)
 }
@@ -46,6 +57,7 @@ func (sfe sqlFunctionExpression) RegexpILike(val interface{}) BooleanExpression
 func (sfe sqlFunctionExpression) RegexpNotILike(val interface{}) BooleanExpression {
 	return regexpNotILike(sfe, val)
 }
+
 func (sfe sqlFunctionExpression) In(vals ...interface{}) BooleanExpression { return in(sfe, vals...) }
 func (sfe sqlFunctionExpression) NotIn(vals ...interface{}) BooleanExpression {
 	return notIn(sfe, vals...)

diff --git a/exp/insert.go b/exp/insert.go
@@ -32,7 +32,6 @@ func NewInsertExpression(rows ...interface{}) (insertExpression InsertExpression
 		if ae, ok := rows[0].(AppendableExpression); ok {
 			return &insert{from: ae}, nil
 		}
-
 	}
 	return newInsert(rows...)
 }

diff --git a/exp/join.go b/exp/join.go
@@ -8,7 +8,6 @@ type (
 		// The table expressions (e.g. LEFT JOIN "my_table", ON (....))
 		table Expression
 	}
-	// todo fix this to use new interfaces
 	// Container for all joins within a dataset
 	conditionedJoin struct {
 		joinExpression

diff --git a/exp/record.go b/exp/record.go
@@ -47,10 +47,10 @@ func NewRecordFromStruct(i interface{}, forInsert, forUpdate bool) (r Record, er
 	return
 }
 
-func addFieldToRecord(r Record, val reflect.Value, f util.ColumnData) Record {
+func addFieldToRecord(r Record, val reflect.Value, f util.ColumnData) {
 	v, isAvailable := util.SafeGetFieldByIndex(val, f.FieldIndex)
 	if !isAvailable {
-		return r
+		return
 	}
 	switch {
 	case f.DefaultIfEmpty && util.IsEmptyValue(v):
@@ -60,5 +60,4 @@ func addFieldToRecord(r Record, val reflect.Value, f util.ColumnData) Record {
 	default:
 		r[f.ColumnName] = reflect.Zero(f.GoType).Interface()
 	}
-	return r
 }
diff --git a/exp/select_clauses_test.go b/exp/select_clauses_test.go
@@ -69,7 +69,6 @@ func (scs *selectClausesSuite) TestSetSelect() {
 
 	scs.Equal(NewColumnListExpression(Star()), c.Select())
 	scs.Equal(NewColumnListExpression("a"), c2.Select())
-
 }
 
 func (scs *selectClausesSuite) TestDistinct() {
@@ -141,7 +140,6 @@ func (scs *selectClausesSuite) TestSetAlias() {
 }
 
 func (scs *selectClausesSuite) TestJoins() {
-
 	jc := NewConditionedJoinExpression(
 		LeftJoinType,
 		NewIdentifierExpression("", "test", ""),
@@ -469,7 +467,6 @@ func (scs *selectClausesSuite) TestSetOffset() {
 }
 
 func (scs *selectClausesSuite) TestCompounds() {
-
 	ce := NewCompoundExpression(UnionCompoundType, newTestAppendableExpression("SELECT * FROM foo", []interface{}{}))
 
 	c := NewSelectClauses()
@@ -480,7 +477,6 @@ func (scs *selectClausesSuite) TestCompounds() {
 	scs.Equal([]CompoundExpression{ce}, c2.Compounds())
 }
 func (scs *selectClausesSuite) TestCompoundsAppend() {
-
 	ce := NewCompoundExpression(UnionCompoundType, newTestAppendableExpression("SELECT * FROM foo1", []interface{}{}))
 	ce2 := NewCompoundExpression(UnionCompoundType, newTestAppendableExpression("SELECT * FROM foo2", []interface{}{}))
 
@@ -493,7 +489,6 @@ func (scs *selectClausesSuite) TestCompoundsAppend() {
 }
 
 func (scs *selectClausesSuite) TestLock() {
-
 	l := NewLock(ForUpdate, Wait)
 
 	c := NewSelectClauses()
@@ -505,7 +500,6 @@ func (scs *selectClausesSuite) TestLock() {
 }
 
 func (scs *selectClausesSuite) TestSetLock() {
-
 	l := NewLock(ForUpdate, Wait)
 	l2 := NewLock(ForUpdate, NoWait)
 
@@ -518,7 +512,6 @@ func (scs *selectClausesSuite) TestSetLock() {
 }
 
 func (scs *selectClausesSuite) TestCommonTables() {
-
 	cte := NewCommonTableExpression(true, "test", newTestAppendableExpression(`SELECT * FROM "foo"`, []interface{}{}))
 
 	c := NewSelectClauses()
@@ -530,7 +523,6 @@ func (scs *selectClausesSuite) TestCommonTables() {
 }
 
 func (scs *selectClausesSuite) TestAddCommonTablesAppend() {
-
 	cte := NewCommonTableExpression(true, "test", testSQLExpression("test_cte"))
 	cte2 := NewCommonTableExpression(true, "test", testSQLExpression("test_cte2"))
 

diff --git a/exp/update_clauses_test.go b/exp/update_clauses_test.go
@@ -240,7 +240,6 @@ func (ucs *updateClausesSuite) TestSetLimit() {
 }
 
 func (ucs *updateClausesSuite) TestCommonTables() {
-
 	cte := NewCommonTableExpression(true, "test", newTestAppendableExpression(`SELECT * FROM "foo"`, []interface{}{}))
 
 	c := NewUpdateClauses()
@@ -252,7 +251,6 @@ func (ucs *updateClausesSuite) TestCommonTables() {
 }
 
 func (ucs *updateClausesSuite) TestAddCommonTablesAppend() {
-
 	cte := NewCommonTableExpression(true, "test", testSQLExpression("test_cte"))
 	cte2 := NewCommonTableExpression(true, "test", testSQLExpression("test_cte2"))
 
@@ -265,7 +263,6 @@ func (ucs *updateClausesSuite) TestAddCommonTablesAppend() {
 }
 
 func (ucs *updateClausesSuite) TestReturning() {
-
 	cl := NewColumnListExpression(NewIdentifierExpression("", "", "col"))
 
 	c := NewUpdateClauses()
@@ -277,7 +274,6 @@ func (ucs *updateClausesSuite) TestReturning() {
 }
 
 func (ucs *updateClausesSuite) TestHasReturning() {
-
 	cl := NewColumnListExpression(NewIdentifierExpression("", "", "col"))
 
 	c := NewUpdateClauses()
@@ -289,7 +285,6 @@ func (ucs *updateClausesSuite) TestHasReturning() {
 }
 
 func (ucs *updateClausesSuite) TestSetReturning() {
-
 	cl := NewColumnListExpression(NewIdentifierExpression("", "", "col"))
 	cl2 := NewColumnListExpression(NewIdentifierExpression("", "", "col2"))
-Original file line number
+Diff line change
@@ Expand Up / @@ -133,7 +133,6 @@ func ExampleDatabase_ExecContext() { @@
     }
     func ExampleDatabase_From() {
     	db := getDb()
     	var names []string
@@ Expand Down @@