From 38541522e66895e6820c1e9c454e4c1b7a4af77d Mon Sep 17 00:00:00 2001 From: go-jet Date: Sun, 16 May 2021 19:10:43 +0200 Subject: [PATCH] Fix linter errors --- internal/jet/literal_expression.go | 16 ++++++++-------- internal/jet/select_table.go | 1 + mysql/expressions.go | 6 +++--- mysql/lateral.go | 1 + postgres/expressions.go | 6 +++--- postgres/lateral.go | 1 + qrm/qrm.go | 1 + 7 files changed, 18 insertions(+), 14 deletions(-) diff --git a/internal/jet/literal_expression.go b/internal/jet/literal_expression.go index 9ce9a81..d7cf47a 100644 --- a/internal/jet/literal_expression.go +++ b/internal/jet/literal_expression.go @@ -440,42 +440,42 @@ func RawWithParent(raw string, parent ...Expression) Expression { return rawExp } -// Raw helper that for integer expressions +// RawInt helper that for integer expressions func RawInt(raw string, namedArgs ...map[string]interface{}) IntegerExpression { return IntExp(Raw(raw, namedArgs...)) } -// Raw helper that for float expressions +// RawFloat helper that for float expressions func RawFloat(raw string, namedArgs ...map[string]interface{}) FloatExpression { return FloatExp(Raw(raw, namedArgs...)) } -// Raw helper that for string expressions +// RawString helper that for string expressions func RawString(raw string, namedArgs ...map[string]interface{}) StringExpression { return StringExp(Raw(raw, namedArgs...)) } -// Raw helper that for time expressions +// RawTime helper that for time expressions func RawTime(raw string, namedArgs ...map[string]interface{}) TimeExpression { return TimeExp(Raw(raw, namedArgs...)) } -// Raw helper that for time with time zone expressions +// RawTimez helper that for time with time zone expressions func RawTimez(raw string, namedArgs ...map[string]interface{}) TimezExpression { return TimezExp(Raw(raw, namedArgs...)) } -// Raw helper that for timestamp expressions +// RawTimestamp helper that for timestamp expressions func RawTimestamp(raw string, namedArgs ...map[string]interface{}) TimestampExpression { return TimestampExp(Raw(raw, namedArgs...)) } -// Raw helper that for timestamp with time zone expressions +// RawTimestampz helper that for timestamp with time zone expressions func RawTimestampz(raw string, namedArgs ...map[string]interface{}) TimestampzExpression { return TimestampzExp(Raw(raw, namedArgs...)) } -// Raw helper that for date expressions +// RawDate helper that for date expressions func RawDate(raw string, namedArgs ...map[string]interface{}) DateExpression { return DateExp(Raw(raw, namedArgs...)) } diff --git a/internal/jet/select_table.go b/internal/jet/select_table.go index 1421b14..541992f 100644 --- a/internal/jet/select_table.go +++ b/internal/jet/select_table.go @@ -45,6 +45,7 @@ type lateralImpl struct { selectTableImpl } +// NewLateral creates new lateral expression from select statement with alias func NewLateral(selectStmt SerializerStatement, alias string) SelectTable { return lateralImpl{selectTableImpl: NewSelectTable(selectStmt, alias)} } diff --git a/mysql/expressions.go b/mysql/expressions.go index 7c13939..b585719 100644 --- a/mysql/expressions.go +++ b/mysql/expressions.go @@ -73,12 +73,12 @@ var TimestampExp = jet.TimestampExp // RawArgs is type used to pass optional arguments to Raw method type RawArgs = map[string]interface{} +// Raw can be used for any unsupported functions, operators or expressions. +// For example: Raw("current_database()") +// Raw helper methods for each of the mysql types var ( - // Raw can be used for any unsupported functions, operators or expressions. - // For example: Raw("current_database()") Raw = jet.Raw - // Raw helper methods for each of the mysql type RawInt = jet.RawInt RawFloat = jet.RawFloat RawString = jet.RawString diff --git a/mysql/lateral.go b/mysql/lateral.go index 8ba974b..30ebb49 100644 --- a/mysql/lateral.go +++ b/mysql/lateral.go @@ -2,6 +2,7 @@ package mysql import "github.com/go-jet/jet/v2/internal/jet" +// LATERAL derived tables constructor from select statement func LATERAL(selectStmt SelectStatement) lateralImpl { return lateralImpl{ selectStmt: selectStmt, diff --git a/postgres/expressions.go b/postgres/expressions.go index ca6223b..8d0be88 100644 --- a/postgres/expressions.go +++ b/postgres/expressions.go @@ -84,12 +84,12 @@ var TimestampzExp = jet.TimestampzExp // RawArgs is type used to pass optional arguments to Raw method type RawArgs = map[string]interface{} +// Raw can be used for any unsupported functions, operators or expressions. +// For example: Raw("current_database()") +// Raw helper methods for each of the postgres types var ( - // Raw can be used for any unsupported functions, operators or expressions. - // For example: Raw("current_database()") Raw = jet.Raw - // Raw helper methods for each of the postgres type RawInt = jet.RawInt RawFloat = jet.RawFloat RawString = jet.RawString diff --git a/postgres/lateral.go b/postgres/lateral.go index 8d2d4f8..7b0ded6 100644 --- a/postgres/lateral.go +++ b/postgres/lateral.go @@ -2,6 +2,7 @@ package postgres import "github.com/go-jet/jet/v2/internal/jet" +// LATERAL derived tables constructor from select statement func LATERAL(selectStmt SelectStatement) lateralImpl { return lateralImpl{ selectStmt: selectStmt, diff --git a/qrm/qrm.go b/qrm/qrm.go index 52c1a28..51bbffa 100644 --- a/qrm/qrm.go +++ b/qrm/qrm.go @@ -59,6 +59,7 @@ func Query(ctx context.Context, db DB, query string, args []interface{}, destPtr } } +// ScanOneRowToDest will scan one row into struct destination func ScanOneRowToDest(rows *sql.Rows, destPtr interface{}) error { utils.MustBeInitializedPtr(destPtr, "jet: destination is nil") utils.MustBe(destPtr, reflect.Ptr, "jet: destination has to be a pointer to slice or pointer to struct")