Merge pull request #209 from doug-martin/v9.7.1-rc

v9.7.1

Author: doug-martin

.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 }}

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)

database_example_test.go

@@ -133,7 +133,6 @@ func ExampleDatabase_ExecContext() {
 }
 
 func ExampleDatabase_From() {
-
 	db := getDb()
 	var names []string
 

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]
 }
 

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"))).

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")

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() {

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) {

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() {

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}"