清除冗余代码

sql_executor.go

@@ -54,16 +54,8 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 		} else {
 			switch sqlsExecutor.parmas.(type) {
 			case []map[string]interface{}:
-				parmaMap, ok := sqlsExecutor.parmas.([]map[string]interface{})
-				if !ok {
-					if sqlsExecutor.session.IsSqlFuc == true {
-						err1 := sqlsExecutor.session.Rollback()
-						if err1 != nil {
-							return nil, nil, err1
-						}
-					}
-					return nil, nil, ErrParamsType
-				}
+				parmaMap, _ := sqlsExecutor.parmas.([]map[string]interface{})
+
 				key := NewV4().String() + time.Now().String()
 				sqlsExecutor.session.Engine.AddSql(key, sqlStr)
 				switch sqlCmd {
@@ -79,16 +71,8 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				}
 				sqlsExecutor.session.Engine.RemoveSql(key)
 			case map[string]interface{}:
-				parmaMap, ok := sqlsExecutor.parmas.(map[string]interface{})
-				if !ok {
-					if sqlsExecutor.session.IsSqlFuc == true {
-						err1 := sqlsExecutor.session.Rollback()
-						if err1 != nil {
-							return nil, nil, err1
-						}
-					}
-					return nil, nil, ErrParamsType
-				}
+				parmaMap, _ := sqlsExecutor.parmas.(map[string]interface{})
+
 				key := NewV4().String() + time.Now().String()
 				sqlsExecutor.session.Engine.AddSql(key, sqlStr)
 				switch sqlCmd {
@@ -190,7 +174,6 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 						return nil, nil, model_1_results.Error
 					}
 
-					resultSlice[i] = make([]map[string]interface{}, len(model_1_results.Results))
 					resultSlice[i] = model_1_results.Results
 
 				} else if sqlModel == 2 {
@@ -287,7 +270,6 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 						return nil, nil, model_1_results.Error
 					}
 
-					resultSlice[i] = make([]map[string]interface{}, len(model_1_results.Results))
 					resultSlice[i] = model_1_results.Results
 
 				} else if sqlModel == 2 {
@@ -348,6 +330,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 			for k, _ := range sqlsMap {
 				sqlStr := strings.TrimSpace(sqlsMap[k])
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
+
 				switch sqlCmd {
 				case "select":
 					sqlModel = 1
@@ -372,7 +355,6 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 						return nil, nil, model_1_results.Error
 					}
 
-					resultsMap[k] = make([]map[string]interface{}, len(model_1_results.Results))
 					resultsMap[k] = model_1_results.Results
 
 				} else if sqlModel == 2 {
@@ -395,6 +377,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 {
 							err1 := sqlsExecutor.session.Rollback()
 							if err1 != nil {
@@ -473,7 +456,6 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 						return nil, nil, model_1_results.Error
 					}
 
-					resultsMap[k] = make([]map[string]interface{}, len(model_1_results.Results))
 					resultsMap[k] = model_1_results.Results
 
 				} else if sqlModel == 2 {

sqlmaps_executor.go

@@ -56,16 +56,8 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 		} else {
 			switch sqlMapsExecutor.parmas.(type) {
 			case []map[string]interface{}:
-				parmaMap, ok := sqlMapsExecutor.parmas.([]map[string]interface{})
-				if !ok {
-					if sqlMapsExecutor.session.IsSqlFuc == true {
-						err1 := sqlMapsExecutor.session.Rollback()
-						if err1 != nil {
-							return nil, nil, err1
-						}
-					}
-					return nil, nil, ErrParamsType
-				}
+				parmaMap, _ := sqlMapsExecutor.parmas.([]map[string]interface{})
+
 				switch sqlCmd {
 				case "select":
 					model_1_results = sqlMapsExecutor.session.SqlMapClient(sqlkey, &parmaMap[0]).Query()
@@ -78,16 +70,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				}
 
 			case map[string]interface{}:
-				parmaMap, ok := sqlMapsExecutor.parmas.(map[string]interface{})
-				if !ok {
-					if sqlMapsExecutor.session.IsSqlFuc == true {
-						err1 := sqlMapsExecutor.session.Rollback()
-						if err1 != nil {
-							return nil, nil, err1
-						}
-					}
-					return nil, nil, ErrParamsType
-				}
+				parmaMap, _ := sqlMapsExecutor.parmas.(map[string]interface{})
 
 				switch sqlCmd {
 				case "select":
@@ -124,7 +107,6 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				return nil, nil, model_1_results.Error
 			}
 
-			resultSlice[0] = make([]map[string]interface{}, len(model_1_results.Results))
 			resultSlice[0] = model_1_results.Results
 			return resultSlice, nil, nil
 		} else if sqlModel == 2 {
@@ -189,7 +171,6 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 						return nil, nil, model_1_results.Error
 					}
 
-					resultSlice[i] = make([]map[string]interface{}, len(model_1_results.Results))
 					resultSlice[i] = model_1_results.Results
 
 				} else if sqlModel == 2 {
@@ -285,7 +266,6 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 						return nil, nil, model_1_results.Error
 					}
 
-					resultSlice[i] = make([]map[string]interface{}, len(model_1_results.Results))
 					resultSlice[i] = model_1_results.Results
 
 				} else if sqlModel == 2 {
@@ -370,7 +350,6 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 						return nil, nil, model_1_results.Error
 					}
 
-					resultsMap[k] = make([]map[string]interface{}, len(model_1_results.Results))
 					resultsMap[k] = model_1_results.Results
 
 				} else if sqlModel == 2 {
@@ -466,7 +445,6 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 						return nil, nil, model_1_results.Error
 					}
 
-					resultsMap[k] = make([]map[string]interface{}, len(model_1_results.Results))
 					resultsMap[k] = model_1_results.Results
 
 				} else if sqlModel == 2 {

sqltemplates_executor.go

@@ -65,10 +65,8 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 		} else {
 			switch sqlTemplatesExecutor.parmas.(type) {
 			case []map[string]interface{}:
-				parmaMap, ok := sqlTemplatesExecutor.parmas.([]map[string]interface{})
-				if !ok {
-					return nil, nil, ErrParamsType
-				}
+				parmaMap, _ := sqlTemplatesExecutor.parmas.([]map[string]interface{})
+
 				sqlStr, err := sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(parmaMap[0])
 				if err != nil {
 					if sqlTemplatesExecutor.session.IsSqlFuc == true {
@@ -94,10 +92,8 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				}
 
 			case map[string]interface{}:
-				parmaMap, ok := sqlTemplatesExecutor.parmas.(map[string]interface{})
-				if !ok {
-					return nil, nil, ErrParamsType
-				}
+				parmaMap, _ := sqlTemplatesExecutor.parmas.(map[string]interface{})
+
 				sqlStr, err := sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(parmaMap)
 				if err != nil {
 					if sqlTemplatesExecutor.session.IsSqlFuc == true {
@@ -133,7 +129,6 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				return nil, nil, model_1_results.Error
 			}
 
-			resultSlice[0] = make([]map[string]interface{}, len(model_1_results.Results))
 			resultSlice[0] = model_1_results.Results
 			return resultSlice, nil, nil
 		} else if sqlModel == 2 {
@@ -202,7 +197,6 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 						return nil, nil, model_1_results.Error
 					}
 
-					resultSlice[i] = make([]map[string]interface{}, len(model_1_results.Results))
 					resultSlice[i] = model_1_results.Results
 
 				} else if sqlModel == 2 {
@@ -308,7 +302,6 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 						return nil, nil, model_1_results.Error
 					}
 
-					resultSlice[i] = make([]map[string]interface{}, len(model_1_results.Results))
 					resultSlice[i] = model_1_results.Results
 
 				} else if sqlModel == 2 {
@@ -403,7 +396,6 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 						return nil, nil, model_1_results.Error
 					}
 
-					resultsMap[k] = make([]map[string]interface{}, len(model_1_results.Results))
 					resultsMap[k] = model_1_results.Results
 
 				} else if sqlModel == 2 {
@@ -509,7 +501,6 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 						return nil, nil, model_1_results.Error
 					}
 
-					resultsMap[k] = make([]map[string]interface{}, len(model_1_results.Results))
 					resultsMap[k] = model_1_results.Results
 
 				} else if sqlModel == 2 {