code polish. (#13)

* code polish.

* use go18

* fix license

* typo

* reback go17

Author: qicz

common/define.go

@@ -17,13 +17,13 @@
 
 package common
 
-//参数
+// IterFunc 参数
 //  idx:迭代数
 //  bean:序列化后的值
 //返回值:
 //  打断迭代返回true
 type IterFunc func(idx int64, bean interface{}) bool
 
 const (
-	FIELD_NAME = "xfield"
+	FieldName = "xfield"
 )

connection/default_connection.go

@@ -20,6 +20,7 @@ package connection
 import (
 	"context"
 	"database/sql"
+
 	"github.com/acmestack/gobatis/common"
 	"github.com/acmestack/gobatis/errors"
 	"github.com/acmestack/gobatis/reflection"
@@ -30,37 +31,37 @@ import (
 type DefaultConnection sql.DB
 type DefaultStatement sql.Stmt
 
-func (c *DefaultConnection) Prepare(sqlStr string) (statement.Statement, error) {
-	db := (*sql.DB)(c)
+func (conn *DefaultConnection) Prepare(sqlStr string) (statement.Statement, error) {
+	db := (*sql.DB)(conn)
 	s, err := db.Prepare(sqlStr)
 	if err != nil {
-		return nil, errors.CONNECTION_PREPARE_ERROR
+		return nil, errors.ConnectionPrepareError
 	}
 	return (*DefaultStatement)(s), nil
 }
 
-func (c *DefaultConnection) Query(ctx context.Context, result reflection.Object, sqlStr string, params ...interface{}) error {
-	db := (*sql.DB)(c)
+func (conn *DefaultConnection) Query(ctx context.Context, result reflection.Object, sqlStr string, params ...interface{}) error {
+	db := (*sql.DB)(conn)
 	rows, err := db.QueryContext(ctx, sqlStr, params...)
 	if err != nil {
-		return errors.STATEMENT_QUERY_ERROR
+		return errors.StatementQueryError
 	}
 	defer rows.Close()
 
 	util.ScanRows(rows, result)
 	return nil
 }
 
-func (c *DefaultConnection) Exec(ctx context.Context, sqlStr string, params ...interface{}) (common.Result, error) {
-	db := (*sql.DB)(c)
+func (conn *DefaultConnection) Exec(ctx context.Context, sqlStr string, params ...interface{}) (common.Result, error) {
+	db := (*sql.DB)(conn)
 	return db.ExecContext(ctx, sqlStr, params...)
 }
 
 func (s *DefaultStatement) Query(ctx context.Context, result reflection.Object, params ...interface{}) error {
 	stmt := (*sql.Stmt)(s)
 	rows, err := stmt.QueryContext(ctx, params...)
 	if err != nil {
-		return errors.STATEMENT_QUERY_ERROR
+		return errors.StatementQueryError
 	}
 	defer rows.Close()
 

errors/errcode.go

@@ -26,42 +26,42 @@ type ErrCode struct {
 }
 
 var (
-	FACTORY_INITED                   = New("10002", "Factory have been initialized")
-	PARSE_MODEL_TABLEINFO_FAILED     = New("11001", "Parse Model's table info failed")
-	MODEL_NOT_REGISTER               = New("11002", "Register model not found")
-	OBJECT_NOT_SUPPORT               = New("11101", "Object not support")
-	PARSE_OBJECT_NOT_STRUCT          = New("11102", "Parse interface's info but not a struct")
-	PARSE_OBJECT_NOT_SLICE           = New("11103", "Parse interface's info but not a slice")
-	PARSE_OBJECT_NOT_MAP             = New("11104", "Parse interface's info but not a map")
-	PARSE_OBJECT_NOT_SIMPLETYPE      = New("11105", "Parse interface's info but not a simple type")
-	SLICE_SLICE_NOT_SUPPORT          = New("11106", "Parse interface's info: [][]slice not support")
-	GET_OBJECTINFO_FAILED            = New("11121", "Parse interface's info failed")
-	SQL_ID_DUPLICATES                = New("11205", "Sql id is duplicates")
-	DESERIALIZE_FAILED               = New("11206", "Deserialize value failed")
-	PARSE_SQL_VAR_ERROR              = New("12001", "SQL PARSE ERROR")
-	PARSE_SQL_PARAM_ERROR            = New("12002", "SQL PARSE parameter error")
-	PARSE_SQL_PARAM_VAR_NUMBER_ERROR = New("12003", "SQL PARSE parameter var number error")
-	PARSE_PARSER_NIL_ERROR           = New("12004", "Dynamic sql parser is nil error")
-	PARSE_DYNAMIC_SQL_ERROR          = New("12010", "Parse dynamic sql error")
-	PARSE_TEMPLATE_NIL_ERROR         = New("12101", "Parse template is nil")
-	EXECUTOR_COMMIT_ERROR            = New("21001", "executor was closed when transaction commit")
-	EXECUTOR_BEGIN_ERROR             = New("21002", "executor was closed when transaction begin")
-	EXECUTOR_QUERY_ERROR             = New("21003", "executor was closed when exec sql")
-	EXECUTOR_GET_CONNECTION_ERROR    = New("21003", "executor get connection error")
-	TRANSACTION_WITHOUT_BEGIN        = New("22001", "Transaction without begin")
-	TRANSACTION_COMMIT_ERROR         = New("22002", "Transaction commit error")
-	TRANSACTION_BUSINESS_ERROR       = New("22003", "Business error in transaction")
-	CONNECTION_PREPARE_ERROR         = New("23001", "Connection prepare error")
-	STATEMENT_QUERY_ERROR            = New("24001", "statement query error")
-	STATEMENT_EXEC_ERROR             = New("24002", "statement exec error")
-	QUERY_TYPE_ERROR                 = New("25001", "select data convert error")
-	RESULT_POINTER_IS_NIL            = New("31000", "result type is a nil pointer")
-	RESULT_ISNOT_POINTER             = New("31001", "result type is not pointer")
-	RESULT_PTR_VALUE_IS_POINTER      = New("31002", "result type is pointer of pointer")
-	RUNNER_NOT_READY                 = New("31003", "Runner not ready, may sql or param have some error")
-	RESULT_NAME_NOT_FOUND            = New("31004", "result name not found")
-	RESULT_SELECT_EMPTY_VALUE        = New("31005", "select return empty value")
-	RESULT_SET_VALUE_FAILED          = New("31006", "result set value failed")
+	FactoryInited               = New("10002", "Factory have been initialized")
+	ParseModelTableinfoFailed   = New("11001", "Parse Model's table info failed")
+	ModelNotRegister            = New("11002", "Register model not found")
+	ObjectNotSupport            = New("11101", "Object not support")
+	ParseObjectNotStruct        = New("11102", "Parse interface's info but not a struct")
+	ParseObjectNotSlice         = New("11103", "Parse interface's info but not a slice")
+	ParseObjectNotMap           = New("11104", "Parse interface's info but not a map")
+	ParseObjectNotSimpletype    = New("11105", "Parse interface's info but not a simple type")
+	SliceSliceNotSupport        = New("11106", "Parse interface's info: [][]slice not support")
+	GetObjectinfoFailed         = New("11121", "Parse interface's info failed")
+	SqlIdDuplicates             = New("11205", "Sql id is duplicates")
+	DeserializeFailed           = New("11206", "Deserialize value failed")
+	ParseSqlVarError            = New("12001", "SQL PARSE ERROR")
+	ParseSqlParamError          = New("12002", "SQL PARSE parameter error")
+	ParseSqlParamVarNumberError = New("12003", "SQL PARSE parameter var number error")
+	ParseParserNilError         = New("12004", "Dynamic sql parser is nil error")
+	ParseDynamicSqlError        = New("12010", "Parse dynamic sql error")
+	ParseTemplateNilError       = New("12101", "Parse template is nil")
+	ExecutorCommitError         = New("21001", "executor was closed when transaction commit")
+	ExecutorBeginError          = New("21002", "executor was closed when transaction begin")
+	ExecutorQueryError          = New("21003", "executor was closed when exec sql")
+	ExecutorGetConnectionError  = New("21003", "executor get connection error")
+	TransactionWithoutBegin     = New("22001", "Transaction without begin")
+	TransactionCommitError      = New("22002", "Transaction commit error")
+	TransactionBusinessError    = New("22003", "Business error in transaction")
+	ConnectionPrepareError      = New("23001", "Connection prepare error")
+	StatementQueryError         = New("24001", "statement query error")
+	StatementExecError          = New("24002", "statement exec error")
+	QueryTypeError              = New("25001", "select data convert error")
+	ResultPointerIsNil          = New("31000", "result type is a nil pointer")
+	ResultIsnotPointer          = New("31001", "result type is not pointer")
+	ResultPtrValueIsPointer     = New("31002", "result type is pointer of pointer")
+	RunnerNotReady              = New("31003", "Runner not ready, may sql or param have some error")
+	ResultNameNotFound          = New("31004", "result name not found")
+	ResultSelectEmptyValue      = New("31005", "select return empty value")
+	ResultSetValueFailed        = New("31006", "result set value failed")
 )
 
 func New(code, message string) *ErrCode {

executor/prepare_executor.go

@@ -19,6 +19,7 @@ package executor
 
 import (
 	"context"
+
 	"github.com/acmestack/gobatis/common"
 	"github.com/acmestack/gobatis/errors"
 	"github.com/acmestack/gobatis/reflection"
@@ -50,12 +51,12 @@ func (exec *PrepareExecutor) Close(rollback bool) {
 
 func (exec *PrepareExecutor) Query(ctx context.Context, result reflection.Object, sql string, params ...interface{}) error {
 	if exec.closed {
-		return errors.EXECUTOR_QUERY_ERROR
+		return errors.ExecutorQueryError
 	}
 
 	conn := exec.transaction.GetConnection()
 	if conn == nil {
-		return errors.EXECUTOR_GET_CONNECTION_ERROR
+		return errors.ExecutorGetConnectionError
 	}
 
 	//FIXME: stmt must be close, use stmtCache instead
@@ -69,12 +70,12 @@ func (exec *PrepareExecutor) Query(ctx context.Context, result reflection.Object
 
 func (exec *PrepareExecutor) Exec(ctx context.Context, sql string, params ...interface{}) (common.Result, error) {
 	if exec.closed {
-		return nil, errors.EXECUTOR_QUERY_ERROR
+		return nil, errors.ExecutorQueryError
 	}
 
 	conn := exec.transaction.GetConnection()
 	if conn == nil {
-		return nil, errors.EXECUTOR_GET_CONNECTION_ERROR
+		return nil, errors.ExecutorGetConnectionError
 	}
 
 	//FIXME: stmt must be close, use stmtCache instead
@@ -89,15 +90,15 @@ func (exec *PrepareExecutor) Exec(ctx context.Context, sql string, params ...int
 
 func (exec *PrepareExecutor) Begin() error {
 	if exec.closed {
-		return errors.EXECUTOR_BEGIN_ERROR
+		return errors.ExecutorBeginError
 	}
 
 	return exec.transaction.Begin()
 }
 
 func (exec *PrepareExecutor) Commit(require bool) error {
 	if exec.closed {
-		return errors.EXECUTOR_COMMIT_ERROR
+		return errors.ExecutorCommitError
 	}
 
 	if require {

executor/simple_executor.go

@@ -19,6 +19,7 @@ package executor
 
 import (
 	"context"
+
 	"github.com/acmestack/gobatis/common"
 	"github.com/acmestack/gobatis/errors"
 	"github.com/acmestack/gobatis/reflection"
@@ -50,41 +51,41 @@ func (exec *SimpleExecutor) Close(rollback bool) {
 
 func (exec *SimpleExecutor) Query(ctx context.Context, result reflection.Object, sql string, params ...interface{}) error {
 	if exec.closed {
-		return errors.EXECUTOR_QUERY_ERROR
+		return errors.ExecutorQueryError
 	}
 
 	conn := exec.transaction.GetConnection()
 	if conn == nil {
-		return errors.EXECUTOR_GET_CONNECTION_ERROR
+		return errors.ExecutorGetConnectionError
 	}
 
 	return conn.Query(ctx, result, sql, params...)
 }
 
 func (exec *SimpleExecutor) Exec(ctx context.Context, sql string, params ...interface{}) (common.Result, error) {
 	if exec.closed {
-		return nil, errors.EXECUTOR_QUERY_ERROR
+		return nil, errors.ExecutorQueryError
 	}
 
 	conn := exec.transaction.GetConnection()
 	if conn == nil {
-		return nil, errors.EXECUTOR_GET_CONNECTION_ERROR
+		return nil, errors.ExecutorGetConnectionError
 	}
 
 	return conn.Exec(ctx, sql, params...)
 }
 
 func (exec *SimpleExecutor) Begin() error {
 	if exec.closed {
-		return errors.EXECUTOR_BEGIN_ERROR
+		return errors.ExecutorBeginError
 	}
 
 	return exec.transaction.Begin()
 }
 
 func (exec *SimpleExecutor) Commit(require bool) error {
 	if exec.closed {
-		return errors.EXECUTOR_COMMIT_ERROR
+		return errors.ExecutorCommitError
 	}
 
 	if require {

faccreator.go

@@ -51,15 +51,15 @@ func CreateFactory(opts ...FacOpt) (factory.Factory, error) {
 	return f, nil
 }
 
-func SetMaxConn(v int) FacOpt {
+func SetMaxConn(maxConn int) FacOpt {
 	return func(f *factory.DefaultFactory) {
-		f.MaxConn = v
+		f.MaxConn = maxConn
 	}
 }
 
-func SetMaxIdleConn(v int) FacOpt {
+func SetMaxIdleConn(maxIdleConn int) FacOpt {
 	return func(f *factory.DefaultFactory) {
-		f.MaxIdleConn = v
+		f.MaxIdleConn = maxIdleConn
 	}
 }
 
@@ -69,16 +69,16 @@ func SetConnMaxLifetime(v time.Duration) FacOpt {
 	}
 }
 
-func SetLog(v logging.LogFunc) FacOpt {
+func SetLog(logFunc logging.LogFunc) FacOpt {
 	return func(f *factory.DefaultFactory) {
-		f.Log = v
+		f.Log = logFunc
 	}
 }
 
-func SetDataSource(v datasource.DataSource) FacOpt {
+func SetDataSource(ds datasource.DataSource) FacOpt {
 	return func(f *factory.DefaultFactory) {
 		f.WithLock(func(fac *factory.DefaultFactory) {
-			fac.DataSource = v
+			fac.DataSource = ds
 		})
 	}
 }