From fd11c377b9e49d6df14d19ea71edfb3e8efdf501 Mon Sep 17 00:00:00 2001 From: go-jet Date: Fri, 19 Jul 2019 10:46:41 +0200 Subject: [PATCH] Fix linter errors. --- delete_statement.go | 2 +- execution/execution.go | 8 ++++---- insert_statement.go | 2 +- lock_statement.go | 2 +- select_statement.go | 2 +- statement.go | 6 +++--- update_statement.go | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/delete_statement.go b/delete_statement.go index 3b128cc..98bf1dd 100644 --- a/delete_statement.go +++ b/delete_statement.go @@ -98,5 +98,5 @@ func (d *deleteStatementImpl) Exec(db execution.DB) (res sql.Result, err error) } func (d *deleteStatementImpl) ExecContext(context context.Context, db execution.DB) (res sql.Result, err error) { - return execContext(d, db, context) + return execContext(context, d, db) } diff --git a/execution/execution.go b/execution/execution.go index 91c34c1..18b5606 100644 --- a/execution/execution.go +++ b/execution/execution.go @@ -15,7 +15,7 @@ import ( // Query executes query with arguments over database connection with context and stores result into destination. // Destination can be either pointer to struct or pointer to slice of structs. -func Query(db DB, context context.Context, query string, args []interface{}, destinationPtr interface{}) error { +func Query(context context.Context, db DB, query string, args []interface{}, destinationPtr interface{}) error { if destinationPtr == nil { return errors.New("jet: Destination is nil") @@ -27,12 +27,12 @@ func Query(db DB, context context.Context, query string, args []interface{}, des } if destinationPtrType.Elem().Kind() == reflect.Slice { - return queryToSlice(db, context, query, args, destinationPtr) + return queryToSlice(context, db, query, args, destinationPtr) } else if destinationPtrType.Elem().Kind() == reflect.Struct { tempSlicePtrValue := reflect.New(reflect.SliceOf(destinationPtrType)) tempSliceValue := tempSlicePtrValue.Elem() - err := queryToSlice(db, context, query, args, tempSlicePtrValue.Interface()) + err := queryToSlice(context, db, query, args, tempSlicePtrValue.Interface()) if err != nil { return err @@ -54,7 +54,7 @@ func Query(db DB, context context.Context, query string, args []interface{}, des } } -func queryToSlice(db DB, ctx context.Context, query string, args []interface{}, slicePtr interface{}) error { +func queryToSlice(ctx context.Context, db DB, query string, args []interface{}, slicePtr interface{}) error { if db == nil { return errors.New("jet: db is nil") } diff --git a/insert_statement.go b/insert_statement.go index a0bc470..5d765ee 100644 --- a/insert_statement.go +++ b/insert_statement.go @@ -165,5 +165,5 @@ func (i *insertStatementImpl) Exec(db execution.DB) (res sql.Result, err error) } func (i *insertStatementImpl) ExecContext(context context.Context, db execution.DB) (res sql.Result, err error) { - return execContext(i, db, context) + return execContext(context, i, db) } diff --git a/lock_statement.go b/lock_statement.go index 76f15d8..da249ec 100644 --- a/lock_statement.go +++ b/lock_statement.go @@ -110,5 +110,5 @@ func (l *lockStatementImpl) Exec(db execution.DB) (sql.Result, error) { } func (l *lockStatementImpl) ExecContext(context context.Context, db execution.DB) (res sql.Result, err error) { - return execContext(l, db, context) + return execContext(context, l, db) } diff --git a/select_statement.go b/select_statement.go index 7997b69..25083ac 100644 --- a/select_statement.go +++ b/select_statement.go @@ -292,7 +292,7 @@ func (s *selectStatementImpl) Exec(db execution.DB) (res sql.Result, err error) } func (s *selectStatementImpl) ExecContext(context context.Context, db execution.DB) (res sql.Result, err error) { - return execContext(s.parent, db, context) + return execContext(context, s.parent, db) } // SelectLock is interface for SELECT statement locks diff --git a/statement.go b/statement.go index 4bd5da5..e7df331 100644 --- a/statement.go +++ b/statement.go @@ -55,7 +55,7 @@ func query(statement Statement, db execution.DB, destination interface{}) error return err } - return execution.Query(db, context.Background(), query, args, destination) + return execution.Query(context.Background(), db, query, args, destination) } func queryContext(context context.Context, statement Statement, db execution.DB, destination interface{}) error { @@ -65,7 +65,7 @@ func queryContext(context context.Context, statement Statement, db execution.DB, return err } - return execution.Query(db, context, query, args, destination) + return execution.Query(context, db, query, args, destination) } func exec(statement Statement, db execution.DB) (res sql.Result, err error) { @@ -78,7 +78,7 @@ func exec(statement Statement, db execution.DB) (res sql.Result, err error) { return db.Exec(query, args...) } -func execContext(statement Statement, db execution.DB, context context.Context) (res sql.Result, err error) { +func execContext(context context.Context, statement Statement, db execution.DB) (res sql.Result, err error) { query, args, err := statement.Sql() if err != nil { diff --git a/update_statement.go b/update_statement.go index 9ad5990..d261410 100644 --- a/update_statement.go +++ b/update_statement.go @@ -144,5 +144,5 @@ func (u *updateStatementImpl) Exec(db execution.DB) (res sql.Result, err error) } func (u *updateStatementImpl) ExecContext(context context.Context, db execution.DB) (res sql.Result, err error) { - return execContext(u, db, context) + return execContext(context, u, db) }