some gofmt & golint fixed

engine.go

@@ -59,7 +59,7 @@ func (engine *Engine) ShowSQL(show ...bool) {
 	}
 }
 
-// ShowExecTime show SQL statment and execute time or not on logger if log level is great than INFO
+// ShowExecTime show SQL statement and execute time or not on logger if log level is great than INFO
 func (engine *Engine) ShowExecTime(show ...bool) {
 	if len(show) == 0 {
 		engine.showExecTime = true
@@ -120,7 +120,7 @@ func (engine *Engine) SupportInsertMany() bool {
 	return engine.dialect.SupportInsertMany()
 }
 
-// QuoteStr Engine's database use which charactor as quote.
+// QuoteStr Engine's database use which character as quote.
 // mysql, sqlite use ` and postgres use "
 func (engine *Engine) QuoteStr() string {
 	return engine.dialect.QuoteStr()
@@ -308,7 +308,7 @@ func (engine *Engine) Sql(querystring string, args ...interface{}) *Session {
 	return engine.SQL(querystring, args...)
 }
 
-// SQL method let's you manualy write raw SQL and operate
+// SQL method let's you manually write raw SQL and operate
 // For example:
 //
 //         engine.SQL("select * from user").Find(&users)
@@ -319,9 +319,9 @@ func (engine *Engine) SQL(query interface{}, args ...interface{}) *Session {
 	session.IsAutoClose = true
 	switch query.(type) {
 	case string:
-		session.IsSqlFuc = true
+		session.IsSqlFunc = true
 	default:
-		session.IsSqlFuc = false
+		session.IsSqlFunc = false
 	}
 	return session.SQL(query, args...)
 }
@@ -725,7 +725,7 @@ func (engine *Engine) Select(str string) *Session {
 	return session.Select(str)
 }
 
-// Cols only use the paramters as select or update columns
+// Cols only use the parameters as select or update columns
 func (engine *Engine) Cols(columns ...string) *Session {
 	session := engine.NewSession()
 	session.IsAutoClose = true
@@ -749,15 +749,15 @@ func (engine *Engine) MustCols(columns ...string) *Session {
 // UseBool xorm automatically retrieve condition according struct, but
 // if struct has bool field, it will ignore them. So use UseBool
 // to tell system to do not ignore them.
-// If no paramters, it will use all the bool field of struct, or
-// it will use paramters's columns
+// If no parameters, it will use all the bool field of struct, or
+// it will use parameters's columns
 func (engine *Engine) UseBool(columns ...string) *Session {
 	session := engine.NewSession()
 	session.IsAutoClose = true
 	return session.UseBool(columns...)
 }
 
-// Omit only not use the paramters as select or update columns
+// Omit only not use the parameters as select or update columns
 func (engine *Engine) Omit(columns ...string) *Session {
 	session := engine.NewSession()
 	session.IsAutoClose = true

engineplus.go

@@ -17,14 +17,14 @@ func (engine *Engine) SetSqlTemplateRootDir(sqlTemplateRootDir string) *Engine {
 func (engine *Engine) SqlMapClient(sqlTagName string, args ...interface{}) *Session {
 	session := engine.NewSession()
 	session.IsAutoClose = true
-	session.IsSqlFuc = true
+	session.IsSqlFunc = true
 	return session.Sql(engine.sqlMap.Sql[sqlTagName], args...)
 }
 
 func (engine *Engine) SqlTemplateClient(sqlTagName string, args ...interface{}) *Session {
 	session := engine.NewSession()
 	session.IsAutoClose = true
-	session.IsSqlFuc = true
+	session.IsSqlFunc = true
 	return session.SqlTemplateClient(sqlTagName, args...)
 
 }
@@ -64,20 +64,20 @@ func JSONString(v interface{}, IndentJSON bool) (string, error) {
 func (engine *Engine) Sqls(sqls interface{}, parmas ...interface{}) *SqlsExecutor {
 	session := engine.NewSession()
 	session.IsAutoClose = true
-	session.IsSqlFuc = true
+	session.IsSqlFunc = true
 	return session.Sqls(sqls, parmas...)
 }
 
 func (engine *Engine) SqlMapsClient(sqlkeys interface{}, parmas ...interface{}) *SqlMapsExecutor {
 	session := engine.NewSession()
 	session.IsAutoClose = true
-	session.IsSqlFuc = true
+	session.IsSqlFunc = true
 	return session.SqlMapsClient(sqlkeys, parmas...)
 }
 
 func (engine *Engine) SqlTemplatesClient(sqlkeys interface{}, parmas ...interface{}) *SqlTemplatesExecutor {
 	session := engine.NewSession()
 	session.IsAutoClose = true
-	session.IsSqlFuc = true
+	session.IsSqlFunc = true
 	return session.SqlTemplatesClient(sqlkeys, parmas...)
 }

helpers.go

@@ -102,7 +102,7 @@ func splitTag(tag string) (tags []string) {
 		}
 	}
 	if lastIdx < len(tag) {
-		tags = append(tags, strings.TrimSpace(tag[lastIdx:len(tag)]))
+		tags = append(tags, strings.TrimSpace(tag[lastIdx:]))
 	}
 	return
 }

logger.go

@@ -12,6 +12,7 @@ import (
 	"github.com/xormplus/core"
 )
 
+// default log options
 const (
 	DEFAULT_LOG_PREFIX = "[xorm]"
 	DEFAULT_LOG_FLAG   = log.Ldate | log.Lmicroseconds

mysql_dialect.go

@@ -465,7 +465,7 @@ func (db *mysql) GetIndexes(tableName string) (map[string]*core.Index, error) {
 		colName = strings.Trim(colName, "` ")
 		var isRegular bool
 		if strings.HasPrefix(indexName, "IDX_"+tableName) || strings.HasPrefix(indexName, "UQE_"+tableName) {
-			indexName = indexName[5+len(tableName) : len(indexName)]
+			indexName = indexName[5+len(tableName):]
 			isRegular = true
 		}
 

postgres_dialect.go

@@ -1077,7 +1077,7 @@ func (db *postgres) GetIndexes(tableName string) (map[string]*core.Index, error)
 		colNames = strings.Split(cs[1][0:len(cs[1])-1], ",")
 
 		if strings.HasPrefix(indexName, "IDX_"+tableName) || strings.HasPrefix(indexName, "UQE_"+tableName) {
-			newIdxName := indexName[5+len(tableName) : len(indexName)]
+			newIdxName := indexName[5+len(tableName):]
 			if newIdxName != "" {
 				indexName = newIdxName
 			}

session.go

@@ -30,7 +30,7 @@ type Session struct {
 	currentTransaction     *Transaction
 	IsAutoCommit           bool
 	IsCommitedOrRollbacked bool
-	IsSqlFuc               bool
+	IsSqlFunc              bool
 	TransType              string
 	IsAutoClose            bool
 
@@ -72,7 +72,7 @@ func (session *Session) Init() {
 	session.IsAutoCommit = true
 	session.IsCommitedOrRollbacked = false
 	session.IsAutoClose = false
-	session.IsSqlFuc = false
+	session.IsSqlFunc = false
 	session.AutoResetStatement = true
 	session.prepareStmt = false
 
@@ -110,7 +110,7 @@ func (session *Session) resetStatement() {
 	if session.AutoResetStatement {
 		session.Statement.Init()
 	}
-	session.IsSqlFuc = false
+	session.IsSqlFunc = false
 }
 
 // Prepare set a flag to session that should be prepare statment before execute query
@@ -130,7 +130,7 @@ func (session *Session) Sql(query string, args ...interface{}) *Session {
 // SQL provides raw sql input parameter. When you have a complex SQL statement
 // and cannot use Where, Id, In and etc. Methods to describe, you can use SQL.
 func (session *Session) SQL(query interface{}, args ...interface{}) *Session {
-	session.IsSqlFuc = true
+	session.IsSqlFunc = true
 	session.Statement.SQL(query, args...)
 	return session
 }
@@ -257,8 +257,8 @@ func (session *Session) NoCascade() *Session {
 // UseBool automatically retrieve condition according struct, but
 // if struct has bool field, it will ignore them. So use UseBool
 // to tell system to do not ignore them.
-// If no paramters, it will use all the bool field of struct, or
-// it will use paramters's columns
+// If no parameters, it will use all the bool field of struct, or
+// it will use parameters's columns
 func (session *Session) UseBool(columns ...string) *Session {
 	session.Statement.UseBool(columns...)
 	return session
@@ -278,7 +278,7 @@ func (session *Session) ForUpdate() *Session {
 	return session
 }
 
-// Omit Only not use the paramters as select or update columns
+// Omit Only not use the parameters as select or update columns
 func (session *Session) Omit(columns ...string) *Session {
 	session.Statement.Omit(columns...)
 	return session
@@ -1012,7 +1012,7 @@ func (session *Session) str2Time(col *core.Column, data string) (outTime time.Ti
 		sd, err := strconv.ParseInt(sdata, 10, 64)
 		if err == nil {
 			x = time.Unix(sd, 0)
-			// !nashtsai! HACK mymysql driver is casuing Local location being change to CHAT and cause wrong time conversion
+			// !nashtsai! HACK mymysql driver is causing Local location being change to CHAT and cause wrong time conversion
 			if col.TimeZone == nil {
 				x = x.In(session.Engine.TZLocation)
 			} else {

session_find.go

@@ -145,7 +145,7 @@ func (session *Session) Find(rowsSlicePtr interface{}, condiBean ...interface{})
 	}
 
 	if sliceValue.Kind() != reflect.Map {
-		if session.IsSqlFuc {
+		if session.IsSqlFunc {
 			var dialect = session.Statement.Engine.Dialect()
 			rownumber := "xorm" + NewShortUUID().String()
 			sql := session.genSelectSql(dialect, rownumber)

session_get.go

@@ -61,7 +61,8 @@ func (session *Session) nocacheGet(bean interface{}, sqlStr string, args ...inte
 	defer rawRows.Close()
 
 	if rawRows.Next() {
-		if fields, err := rawRows.Columns(); err == nil {
+		fields, err := rawRows.Columns()
+		if err == nil {
 			err = session.row2Bean(rawRows, fields, len(fields), bean)
 		}
 		return true, err

session_raw.go

@@ -11,7 +11,6 @@ import (
 )
 
 func (session *Session) query(sqlStr string, paramStr ...interface{}) (resultsSlice []map[string][]byte, err error) {
-
 	session.queryPreprocess(&sqlStr, paramStr...)
 
 	if session.IsAutoCommit {

sessionplus.go

@@ -385,7 +385,7 @@ func (session *Session) SqlMapClient(sqlTagName string, args ...interface{}) *Se
 }
 
 func (session *Session) SqlTemplateClient(sqlTagName string, args ...interface{}) *Session {
-	session.IsSqlFuc = true
+	session.IsSqlFunc = true
 	if session.Engine.sqlTemplate.Template[sqlTagName] == nil {
 		if len(args) == 0 {
 			return session.Sql("")

sql_executor.go

@@ -28,7 +28,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 	sqlModel := 1
 
-	if sqlsExecutor.session.IsSqlFuc == true {
+	if sqlsExecutor.session.IsSqlFunc == true {
 		err := sqlsExecutor.session.begin()
 		if err != nil {
 			return nil, nil, err
@@ -87,7 +87,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				}
 				sqlsExecutor.session.Engine.RemoveSql(key)
 			default:
-				if sqlsExecutor.session.IsSqlFuc == true {
+				if sqlsExecutor.session.IsSqlFunc == true {
 					err1 := sqlsExecutor.session.rollback()
 					if err1 != nil {
 						return nil, nil, err1
@@ -101,7 +101,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 		if sqlModel == 1 {
 			if model_1_results.Error != nil {
-				if sqlsExecutor.session.IsSqlFuc == true {
+				if sqlsExecutor.session.IsSqlFunc == true {
 					err1 := sqlsExecutor.session.rollback()
 					if err1 != nil {
 						return nil, nil, err1
@@ -115,7 +115,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 			return resultSlice, nil, nil
 		} else if sqlModel == 2 {
 			if err != nil {
-				if sqlsExecutor.session.IsSqlFuc == true {
+				if sqlsExecutor.session.IsSqlFunc == true {
 					err1 := sqlsExecutor.session.rollback()
 					if err1 != nil {
 						return nil, nil, err1
@@ -165,7 +165,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
-						if sqlsExecutor.session.IsSqlFuc == true {
+						if sqlsExecutor.session.IsSqlFunc == true {
 							err1 := sqlsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -178,7 +178,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 				} else if sqlModel == 2 {
 					if err != nil {
-						if sqlsExecutor.session.IsSqlFuc == true {
+						if sqlsExecutor.session.IsSqlFunc == true {
 							err1 := sqlsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -196,7 +196,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 					resultMap[0]["LastInsertId"] = LastInsertId
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
-						if sqlsExecutor.session.IsSqlFuc == true {
+						if sqlsExecutor.session.IsSqlFunc == true {
 							err1 := sqlsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -220,7 +220,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				parmaSlice = sqlsExecutor.parmas.([]map[string]interface{})
 
 			default:
-				if sqlsExecutor.session.IsSqlFuc == true {
+				if sqlsExecutor.session.IsSqlFunc == true {
 					err1 := sqlsExecutor.session.rollback()
 					if err1 != nil {
 						return nil, nil, err1
@@ -261,7 +261,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
-						if sqlsExecutor.session.IsSqlFuc == true {
+						if sqlsExecutor.session.IsSqlFunc == true {
 							err1 := sqlsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -274,7 +274,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 				} else if sqlModel == 2 {
 					if err != nil {
-						if sqlsExecutor.session.IsSqlFuc == true {
+						if sqlsExecutor.session.IsSqlFunc == true {
 							err1 := sqlsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -292,7 +292,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 					resultMap[0]["LastInsertId"] = LastInsertId
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
-						if sqlsExecutor.session.IsSqlFuc == true {
+						if sqlsExecutor.session.IsSqlFunc == true {
 							err1 := sqlsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -311,7 +311,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 		}
 
-		if sqlsExecutor.session.IsSqlFuc == true {
+		if sqlsExecutor.session.IsSqlFunc == true {
 			err1 := sqlsExecutor.session.commit()
 			if err1 != nil {
 				return nil, nil, err1
@@ -346,7 +346,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
-						if sqlsExecutor.session.IsSqlFuc == true {
+						if sqlsExecutor.session.IsSqlFunc == true {
 							err1 := sqlsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -359,7 +359,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 				} else if sqlModel == 2 {
 					if err != nil {
-						if sqlsExecutor.session.IsSqlFuc == true {
+						if sqlsExecutor.session.IsSqlFunc == true {
 							err1 := sqlsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -378,7 +378,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
 
-						if sqlsExecutor.session.IsSqlFuc == true {
+						if sqlsExecutor.session.IsSqlFunc == true {
 							err1 := sqlsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -401,7 +401,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				parmasMap = sqlsExecutor.parmas.(map[string]map[string]interface{})
 
 			default:
-				if sqlsExecutor.session.IsSqlFuc == true {
+				if sqlsExecutor.session.IsSqlFunc == true {
 					err1 := sqlsExecutor.session.rollback()
 					if err1 != nil {
 						return nil, nil, err1
@@ -447,7 +447,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
-						if sqlsExecutor.session.IsSqlFuc == true {
+						if sqlsExecutor.session.IsSqlFunc == true {
 							err1 := sqlsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -460,7 +460,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 				} else if sqlModel == 2 {
 					if err != nil {
-						if sqlsExecutor.session.IsSqlFuc == true {
+						if sqlsExecutor.session.IsSqlFunc == true {
 							err1 := sqlsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -478,7 +478,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 					resultMap[0]["LastInsertId"] = LastInsertId
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
-						if sqlsExecutor.session.IsSqlFuc == true {
+						if sqlsExecutor.session.IsSqlFunc == true {
 							err1 := sqlsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -497,7 +497,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 		}
 
-		if sqlsExecutor.session.IsSqlFuc == true {
+		if sqlsExecutor.session.IsSqlFunc == true {
 			err1 := sqlsExecutor.session.commit()
 			if err1 != nil {
 				return nil, nil, err1

sqlite3_dialect.go

@@ -406,7 +406,7 @@ func (db *sqlite3) GetIndexes(tableName string) (map[string]*core.Index, error)
 
 		indexName := strings.Trim(sql[nNStart+6:nNEnd], "` []")
 		if strings.HasPrefix(indexName, "IDX_"+tableName) || strings.HasPrefix(indexName, "UQE_"+tableName) {
-			index.Name = indexName[5+len(tableName) : len(indexName)]
+			index.Name = indexName[5+len(tableName):]
 		} else {
 			index.Name = indexName
 		}

sqlmaps_executor.go

@@ -28,7 +28,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 	sqlModel := 1
 
-	if sqlMapsExecutor.session.IsSqlFuc == true {
+	if sqlMapsExecutor.session.IsSqlFunc == true {
 		err := sqlMapsExecutor.session.begin()
 		if err != nil {
 			return nil, nil, err
@@ -84,7 +84,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				}
 
 			default:
-				if sqlMapsExecutor.session.IsSqlFuc == true {
+				if sqlMapsExecutor.session.IsSqlFunc == true {
 					err1 := sqlMapsExecutor.session.rollback()
 					if err1 != nil {
 						return nil, nil, err1
@@ -98,7 +98,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 		if sqlModel == 1 {
 			if model_1_results.Error != nil {
-				if sqlMapsExecutor.session.IsSqlFuc == true {
+				if sqlMapsExecutor.session.IsSqlFunc == true {
 					err1 := sqlMapsExecutor.session.rollback()
 					if err1 != nil {
 						return nil, nil, err1
@@ -111,7 +111,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 			return resultSlice, nil, nil
 		} else if sqlModel == 2 {
 			if err != nil {
-				if sqlMapsExecutor.session.IsSqlFuc == true {
+				if sqlMapsExecutor.session.IsSqlFunc == true {
 					err1 := sqlMapsExecutor.session.rollback()
 					if err1 != nil {
 						return nil, nil, err1
@@ -162,7 +162,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
-						if sqlMapsExecutor.session.IsSqlFuc == true {
+						if sqlMapsExecutor.session.IsSqlFunc == true {
 							err1 := sqlMapsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -175,7 +175,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 				} else if sqlModel == 2 {
 					if err != nil {
-						if sqlMapsExecutor.session.IsSqlFuc == true {
+						if sqlMapsExecutor.session.IsSqlFunc == true {
 							err1 := sqlMapsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -193,7 +193,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 					resultMap[0]["LastInsertId"] = LastInsertId
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
-						if sqlMapsExecutor.session.IsSqlFuc == true {
+						if sqlMapsExecutor.session.IsSqlFunc == true {
 							err1 := sqlMapsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -217,7 +217,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				parmaSlice = sqlMapsExecutor.parmas.([]map[string]interface{})
 
 			default:
-				if sqlMapsExecutor.session.IsSqlFuc == true {
+				if sqlMapsExecutor.session.IsSqlFunc == true {
 					err1 := sqlMapsExecutor.session.rollback()
 					if err1 != nil {
 						return nil, nil, err1
@@ -257,7 +257,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
-						if sqlMapsExecutor.session.IsSqlFuc == true {
+						if sqlMapsExecutor.session.IsSqlFunc == true {
 							err1 := sqlMapsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -270,7 +270,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 				} else if sqlModel == 2 {
 					if err != nil {
-						if sqlMapsExecutor.session.IsSqlFuc == true {
+						if sqlMapsExecutor.session.IsSqlFunc == true {
 							err1 := sqlMapsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -288,7 +288,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 					resultMap[0]["LastInsertId"] = LastInsertId
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
-						if sqlMapsExecutor.session.IsSqlFuc == true {
+						if sqlMapsExecutor.session.IsSqlFunc == true {
 							err1 := sqlMapsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -307,7 +307,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 		}
 
-		if sqlMapsExecutor.session.IsSqlFuc == true {
+		if sqlMapsExecutor.session.IsSqlFunc == true {
 			err1 := sqlMapsExecutor.session.commit()
 			if err1 != nil {
 				return nil, nil, err1
@@ -341,7 +341,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
-						if sqlMapsExecutor.session.IsSqlFuc == true {
+						if sqlMapsExecutor.session.IsSqlFunc == true {
 							err1 := sqlMapsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -354,7 +354,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 				} else if sqlModel == 2 {
 					if err != nil {
-						if sqlMapsExecutor.session.IsSqlFuc == true {
+						if sqlMapsExecutor.session.IsSqlFunc == true {
 							err1 := sqlMapsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -372,7 +372,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 					resultMap[0]["LastInsertId"] = LastInsertId
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
-						if sqlMapsExecutor.session.IsSqlFuc == true {
+						if sqlMapsExecutor.session.IsSqlFunc == true {
 							err1 := sqlMapsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -396,7 +396,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				parmasMap = sqlMapsExecutor.parmas.(map[string]map[string]interface{})
 
 			default:
-				if sqlMapsExecutor.session.IsSqlFuc == true {
+				if sqlMapsExecutor.session.IsSqlFunc == true {
 					err1 := sqlMapsExecutor.session.rollback()
 					if err1 != nil {
 						return nil, nil, err1
@@ -436,7 +436,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
-						if sqlMapsExecutor.session.IsSqlFuc == true {
+						if sqlMapsExecutor.session.IsSqlFunc == true {
 							err1 := sqlMapsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -449,7 +449,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 				} else if sqlModel == 2 {
 					if err != nil {
-						if sqlMapsExecutor.session.IsSqlFuc == true {
+						if sqlMapsExecutor.session.IsSqlFunc == true {
 							err1 := sqlMapsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -467,7 +467,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 					resultMap[0]["LastInsertId"] = LastInsertId
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
-						if sqlMapsExecutor.session.IsSqlFuc == true {
+						if sqlMapsExecutor.session.IsSqlFunc == true {
 							err1 := sqlMapsExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -485,7 +485,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 			}
 		}
 
-		if sqlMapsExecutor.session.IsSqlFuc == true {
+		if sqlMapsExecutor.session.IsSqlFunc == true {
 			err1 := sqlMapsExecutor.session.commit()
 			if err1 != nil {
 				return nil, nil, err1

sqltemplates_executor.go

@@ -29,7 +29,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 	sqlModel := 1
 
-	if sqlTemplatesExecutor.session.IsSqlFuc == true {
+	if sqlTemplatesExecutor.session.IsSqlFunc == true {
 		err := sqlTemplatesExecutor.session.begin()
 		if err != nil {
 			return nil, nil, err
@@ -42,7 +42,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 		if sqlTemplatesExecutor.parmas == nil {
 			sqlStr, err = sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(nil)
 			if err != nil {
-				if sqlTemplatesExecutor.session.IsSqlFuc == true {
+				if sqlTemplatesExecutor.session.IsSqlFunc == true {
 					err1 := sqlTemplatesExecutor.session.rollback()
 					if err1 != nil {
 						return nil, nil, err1
@@ -70,7 +70,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 				sqlStr, err = sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(parmaMap[0])
 				if err != nil {
-					if sqlTemplatesExecutor.session.IsSqlFuc == true {
+					if sqlTemplatesExecutor.session.IsSqlFunc == true {
 						err1 := sqlTemplatesExecutor.session.rollback()
 						if err1 != nil {
 							return nil, nil, err1
@@ -97,7 +97,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 				sqlStr, err = sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(parmaMap)
 				if err != nil {
-					if sqlTemplatesExecutor.session.IsSqlFuc == true {
+					if sqlTemplatesExecutor.session.IsSqlFunc == true {
 						err1 := sqlTemplatesExecutor.session.rollback()
 						if err1 != nil {
 							return nil, nil, err1
@@ -165,7 +165,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 			for i, _ := range sqlkeysSlice {
 				sqlStr, err := sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkeysSlice[i]).Execute(nil)
 				if err != nil {
-					if sqlTemplatesExecutor.session.IsSqlFuc == true {
+					if sqlTemplatesExecutor.session.IsSqlFunc == true {
 						err1 := sqlTemplatesExecutor.session.rollback()
 						if err1 != nil {
 							return nil, nil, err1
@@ -189,7 +189,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
-						if sqlTemplatesExecutor.session.IsSqlFuc == true {
+						if sqlTemplatesExecutor.session.IsSqlFunc == true {
 							err1 := sqlTemplatesExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -202,7 +202,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 				} else if sqlModel == 2 {
 					if err != nil {
-						if sqlTemplatesExecutor.session.IsSqlFuc == true {
+						if sqlTemplatesExecutor.session.IsSqlFunc == true {
 							err1 := sqlTemplatesExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -220,7 +220,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 					resultMap[0]["LastInsertId"] = LastInsertId
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
-						if sqlTemplatesExecutor.session.IsSqlFuc == true {
+						if sqlTemplatesExecutor.session.IsSqlFunc == true {
 							err1 := sqlTemplatesExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -245,7 +245,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				parmaSlice = sqlTemplatesExecutor.parmas.([]map[string]interface{})
 
 			default:
-				if sqlTemplatesExecutor.session.IsSqlFuc == true {
+				if sqlTemplatesExecutor.session.IsSqlFunc == true {
 					err1 := sqlTemplatesExecutor.session.rollback()
 					if err1 != nil {
 						return nil, nil, err1
@@ -257,7 +257,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 			for i, _ := range sqlkeysSlice {
 				sqlStr, err := sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkeysSlice[i]).Execute(parmaSlice[i])
 				if err != nil {
-					if sqlTemplatesExecutor.session.IsSqlFuc == true {
+					if sqlTemplatesExecutor.session.IsSqlFunc == true {
 						err1 := sqlTemplatesExecutor.session.rollback()
 						if err1 != nil {
 							return nil, nil, err1
@@ -294,7 +294,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
-						if sqlTemplatesExecutor.session.IsSqlFuc == true {
+						if sqlTemplatesExecutor.session.IsSqlFunc == true {
 							err1 := sqlTemplatesExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -307,7 +307,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 				} else if sqlModel == 2 {
 					if err != nil {
-						if sqlTemplatesExecutor.session.IsSqlFuc == true {
+						if sqlTemplatesExecutor.session.IsSqlFunc == true {
 							err1 := sqlTemplatesExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -325,7 +325,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 					resultMap[0]["LastInsertId"] = LastInsertId
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
-						if sqlTemplatesExecutor.session.IsSqlFuc == true {
+						if sqlTemplatesExecutor.session.IsSqlFunc == true {
 							err1 := sqlTemplatesExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -344,7 +344,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 		}
 
-		if sqlTemplatesExecutor.session.IsSqlFuc == true {
+		if sqlTemplatesExecutor.session.IsSqlFunc == true {
 			err1 := sqlTemplatesExecutor.session.commit()
 			if err1 != nil {
 				return nil, nil, err1
@@ -364,7 +364,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 			for k, _ := range sqlkeysMap {
 				sqlStr, err := sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkeysMap[k]).Execute(nil)
 				if err != nil {
-					if sqlTemplatesExecutor.session.IsSqlFuc == true {
+					if sqlTemplatesExecutor.session.IsSqlFunc == true {
 						err1 := sqlTemplatesExecutor.session.rollback()
 						if err1 != nil {
 							return nil, nil, err1
@@ -388,7 +388,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
-						if sqlTemplatesExecutor.session.IsSqlFuc == true {
+						if sqlTemplatesExecutor.session.IsSqlFunc == true {
 							err1 := sqlTemplatesExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -401,7 +401,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 				} else if sqlModel == 2 {
 					if err != nil {
-						if sqlTemplatesExecutor.session.IsSqlFuc == true {
+						if sqlTemplatesExecutor.session.IsSqlFunc == true {
 							err1 := sqlTemplatesExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -419,7 +419,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 					resultMap[0]["LastInsertId"] = LastInsertId
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
-						if sqlTemplatesExecutor.session.IsSqlFuc == true {
+						if sqlTemplatesExecutor.session.IsSqlFunc == true {
 							err1 := sqlTemplatesExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -444,7 +444,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				parmasMap = sqlTemplatesExecutor.parmas.(map[string]map[string]interface{})
 
 			default:
-				if sqlTemplatesExecutor.session.IsSqlFuc == true {
+				if sqlTemplatesExecutor.session.IsSqlFunc == true {
 					err1 := sqlTemplatesExecutor.session.rollback()
 					if err1 != nil {
 						return nil, nil, err1
@@ -456,7 +456,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 			for k, _ := range sqlkeysMap {
 				sqlStr, err := sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkeysMap[k]).Execute(parmasMap[k])
 				if err != nil {
-					if sqlTemplatesExecutor.session.IsSqlFuc == true {
+					if sqlTemplatesExecutor.session.IsSqlFunc == true {
 						err1 := sqlTemplatesExecutor.session.rollback()
 						if err1 != nil {
 							return nil, nil, err1
@@ -493,7 +493,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 				if sqlModel == 1 {
 					if model_1_results.Error != nil {
-						if sqlTemplatesExecutor.session.IsSqlFuc == true {
+						if sqlTemplatesExecutor.session.IsSqlFunc == true {
 							err1 := sqlTemplatesExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -506,7 +506,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 				} else if sqlModel == 2 {
 					if err != nil {
-						if sqlTemplatesExecutor.session.IsSqlFuc == true {
+						if sqlTemplatesExecutor.session.IsSqlFunc == true {
 							err1 := sqlTemplatesExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -524,7 +524,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 					resultMap[0]["LastInsertId"] = LastInsertId
 					RowsAffected, err := model_2_results.RowsAffected()
 					if err != nil {
-						if sqlTemplatesExecutor.session.IsSqlFuc == true {
+						if sqlTemplatesExecutor.session.IsSqlFunc == true {
 							err1 := sqlTemplatesExecutor.session.rollback()
 							if err1 != nil {
 								return nil, nil, err1
@@ -543,7 +543,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 		}
 
-		if sqlTemplatesExecutor.session.IsSqlFuc == true {
+		if sqlTemplatesExecutor.session.IsSqlFunc == true {
 			err1 := sqlTemplatesExecutor.session.commit()
 			if err1 != nil {
 				return nil, nil, err1

statement.go

@@ -75,7 +75,7 @@ type Statement struct {
 	cond            builder.Cond
 }
 
-// Init reset all the statment's fields
+// Init reset all the statement's fields
 func (statement *Statement) Init() {
 	statement.RefTable = nil
 	statement.Start = 0
@@ -147,12 +147,12 @@ func (statement *Statement) SQL(query interface{}, args ...interface{}) *Stateme
 	return statement
 }
 
-// Where add Where statment
+// Where add Where statement
 func (statement *Statement) Where(query interface{}, args ...interface{}) *Statement {
 	return statement.And(query, args...)
 }
 
-// And add Where & and statment
+// And add Where & and statement
 func (statement *Statement) And(query interface{}, args ...interface{}) *Statement {
 	switch query.(type) {
 	case string:
@@ -173,7 +173,7 @@ func (statement *Statement) And(query interface{}, args ...interface{}) *Stateme
 	return statement
 }
 
-// Or add Where & Or statment
+// Or add Where & Or statement
 func (statement *Statement) Or(query interface{}, args ...interface{}) *Statement {
 	switch query.(type) {
 	case string:
@@ -193,7 +193,7 @@ func (statement *Statement) Or(query interface{}, args ...interface{}) *Statemen
 	return statement
 }
 
-// In generate "Where column IN (?) " statment
+// In generate "Where column IN (?) " statement
 func (statement *Statement) In(column string, args ...interface{}) *Statement {
 	if len(args) == 0 {
 		return statement
@@ -204,7 +204,7 @@ func (statement *Statement) In(column string, args ...interface{}) *Statement {
 	return statement
 }
 
-// NotIn generate "Where column NOT IN (?) " statment
+// NotIn generate "Where column NOT IN (?) " statement
 func (statement *Statement) NotIn(column string, args ...interface{}) *Statement {
 	if len(args) == 0 {
 		return statement
@@ -706,14 +706,14 @@ func (statement *Statement) TableName() string {
 	return statement.tableName
 }
 
-// Id generate "where id = ? " statment or for composite key "where key1 = ? and key2 = ?"
+// Id generate "where id = ? " statement or for composite key "where key1 = ? and key2 = ?"
 //
 // Deprecated: use ID instead
 func (statement *Statement) Id(id interface{}) *Statement {
 	return statement.ID(id)
 }
 
-// ID generate "where id = ? " statment or for composite key "where key1 = ? and key2 = ?"
+// ID generate "where id = ? " statement or for composite key "where key1 = ? and key2 = ?"
 func (statement *Statement) ID(id interface{}) *Statement {
 	idValue := reflect.ValueOf(id)
 	idType := reflect.TypeOf(idValue.Interface())
@@ -741,7 +741,7 @@ func (statement *Statement) ID(id interface{}) *Statement {
 	return statement
 }
 
-// Incr Generate  "Update ... Set column = column + arg" statment
+// Incr Generate  "Update ... Set column = column + arg" statement
 func (statement *Statement) Incr(column string, arg ...interface{}) *Statement {
 	k := strings.ToLower(column)
 	if len(arg) > 0 {
@@ -752,7 +752,7 @@ func (statement *Statement) Incr(column string, arg ...interface{}) *Statement {
 	return statement
 }
 
-// Decr Generate  "Update ... Set column = column - arg" statment
+// Decr Generate  "Update ... Set column = column - arg" statement
 func (statement *Statement) Decr(column string, arg ...interface{}) *Statement {
 	k := strings.ToLower(column)
 	if len(arg) > 0 {
@@ -763,24 +763,24 @@ func (statement *Statement) Decr(column string, arg ...interface{}) *Statement {
 	return statement
 }
 
-// SetExpr Generate  "Update ... Set column = {expression}" statment
+// SetExpr Generate  "Update ... Set column = {expression}" statement
 func (statement *Statement) SetExpr(column string, expression string) *Statement {
 	k := strings.ToLower(column)
 	statement.exprColumns[k] = exprParam{column, expression}
 	return statement
 }
 
-// Generate  "Update ... Set column = column + arg" statment
+// Generate  "Update ... Set column = column + arg" statement
 func (statement *Statement) getInc() map[string]incrParam {
 	return statement.incrColumns
 }
 
-// Generate  "Update ... Set column = column - arg" statment
+// Generate  "Update ... Set column = column - arg" statement
 func (statement *Statement) getDec() map[string]decrParam {
 	return statement.decrColumns
 }
 
-// Generate  "Update ... Set column = {expression}" statment
+// Generate  "Update ... Set column = {expression}" statement
 func (statement *Statement) getExpr() map[string]exprParam {
 	return statement.exprColumns
 }

statement_test.go

@@ -91,15 +91,15 @@ func BenchmarkGetFlagForColumnWithICKey_ContainsKey(b *testing.B) {
 
 	mapCols := make(map[string]bool)
 	cols := []*core.Column{
-		&core.Column{Name: `ID`},
-		&core.Column{Name: `IsDeleted`},
-		&core.Column{Name: `Caption`},
-		&core.Column{Name: `Code1`},
-		&core.Column{Name: `Code2`},
-		&core.Column{Name: `Code3`},
-		&core.Column{Name: `ParentID`},
-		&core.Column{Name: `Latitude`},
-		&core.Column{Name: `Longitude`},
+		{Name: `ID`},
+		{Name: `IsDeleted`},
+		{Name: `Caption`},
+		{Name: `Code1`},
+		{Name: `Code2`},
+		{Name: `Code3`},
+		{Name: `ParentID`},
+		{Name: `Latitude`},
+		{Name: `Longitude`},
 	}
 
 	for _, col := range cols {
@@ -125,15 +125,15 @@ func BenchmarkGetFlagForColumnWithICKey_EmptyMap(b *testing.B) {
 
 	mapCols := make(map[string]bool)
 	cols := []*core.Column{
-		&core.Column{Name: `ID`},
-		&core.Column{Name: `IsDeleted`},
-		&core.Column{Name: `Caption`},
-		&core.Column{Name: `Code1`},
-		&core.Column{Name: `Code2`},
-		&core.Column{Name: `Code3`},
-		&core.Column{Name: `ParentID`},
-		&core.Column{Name: `Latitude`},
-		&core.Column{Name: `Longitude`},
+		{Name: `ID`},
+		{Name: `IsDeleted`},
+		{Name: `Caption`},
+		{Name: `Code1`},
+		{Name: `Code2`},
+		{Name: `Code3`},
+		{Name: `ParentID`},
+		{Name: `Latitude`},
+		{Name: `Longitude`},
 	}
 
 	b.StartTimer()