Browse Source

清除冗余代码

xormplus 9 years ago
parent
commit
b5b2861ad5
2 changed files with 4 additions and 4 deletions
  1. 0 1
      dataset.go
  2. 4 3
      sqltemplates_executor.go

+ 0 - 1
dataset.go

@@ -55,7 +55,6 @@ func NewDatasetWithData(headers []string, data interface{}) (*tablib.Dataset, er
 		} else {
 			return tablib.NewDatasetWithData(headers, nil), nil
 		}
-		return nil, ErrParamsType
 	default:
 		return nil, ErrParamsType
 	}

+ 4 - 3
sqltemplates_executor.go

@@ -25,6 +25,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 	var model_1_results *ResultMap
 	var model_2_results sql.Result
 	var err error
+	var sqlStr string
 
 	sqlModel := 1
 
@@ -39,7 +40,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 	case string:
 		sqlkey := strings.TrimSpace(sqlTemplatesExecutor.sqlkeys.(string))
 		if sqlTemplatesExecutor.parmas == nil {
-			sqlStr, err := sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(nil)
+			sqlStr, err = sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(nil)
 			if err != nil {
 				if sqlTemplatesExecutor.session.IsSqlFuc == true {
 					err1 := sqlTemplatesExecutor.session.Rollback()
@@ -67,7 +68,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 			case []map[string]interface{}:
 				parmaMap, _ := sqlTemplatesExecutor.parmas.([]map[string]interface{})
 
-				sqlStr, err := sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(parmaMap[0])
+				sqlStr, err = sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(parmaMap[0])
 				if err != nil {
 					if sqlTemplatesExecutor.session.IsSqlFuc == true {
 						err1 := sqlTemplatesExecutor.session.Rollback()
@@ -94,7 +95,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 			case map[string]interface{}:
 				parmaMap, _ := sqlTemplatesExecutor.parmas.(map[string]interface{})
 
-				sqlStr, err := sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(parmaMap)
+				sqlStr, err = sqlTemplatesExecutor.session.Engine.GetSqlTemplate(sqlkey).Execute(parmaMap)
 				if err != nil {
 					if sqlTemplatesExecutor.session.IsSqlFuc == true {
 						err1 := sqlTemplatesExecutor.session.Rollback()