xormplus hace 9 años
padre
commit
8255eae088
Se han modificado 4 ficheros con 28 adiciones y 28 borrados
  1. 1 1
      README.md
  2. 9 9
      sql_executor.go
  3. 9 9
      sqlmaps_executor.go
  4. 9 9
      sqltemplates_executor.go

+ 1 - 1
README.md

@@ -538,7 +538,7 @@ if err != nil {
 	* 当sqlkeys为string时,则Sql执行单元为所对应的SqlMap配置项或SqlTemplate模板
 	* 当sqls为[]string或map[string]string时候,则Sql执行单元为相关元素的字符串内容
 	* 当sqlkeys为[]string或map[string]string时候,则Sql执行单元为以相关元素为key所对应的SqlMap配置项或SqlTemplate模板
-	* Sql执行单元的具体内容,必须以"select", "insert", "delete", "update", "create", "drop"为起始内容,但后续内容不会继续做检查,请合理定义Sql执行单元内容
+	* Sql执行单元的具体内容,必须以"select", "insert", "delete", "update", "create", "drop"为起始内容,但后续内容不会继续做检查,请合理定义Sql执行单元内容。当执行单元内容不是以上起始内容,则对应索引或key返回的结果集为nil,请注意对返回结果集的nil判断
 	* Sql执行单元并非单条Sql语句,当执行insert,delete,update,create,drop操作时候,可以为多条Sql语句,这里需要对应的数据库的SQL语法支持。如在一个执行单元批量执行多条Sql,返回结果集作为一组所有执行单元的大结果集中的一个元素,这个结果集的数据类型为map[string]interface{},只有2个键值对,一个键值对的key为LastInsertId,一个键值对的key为RowsAffected,请控制好执行粒度。另外不是所有数据库都支持返回LastInsertId,目前还在设计通用API能支持此功能。
 	* 当执行select操作时候,执行单元的Sql语句必须为一条,返回结果集作为一组所有执行单元的大结果集中的一个元素
 	* insert,delete,update,create,drop操作不能和select操作混合定义在同一个执行单元中

+ 9 - 9
sql_executor.go

@@ -42,7 +42,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 
 		if sqlsExecutor.parmas == nil {
 			switch sqlCmd {
-			case "select", "desc":
+			case "select":
 				model_1_results = sqlsExecutor.session.Sql(sqlStr).Query()
 				sqlModel = 1
 			case "insert", "delete", "update", "create", "drop":
@@ -67,7 +67,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				key := NewV4().String() + time.Now().String()
 				sqlsExecutor.session.Engine.AddSql(key, sqlStr)
 				switch sqlCmd {
-				case "select", "desc":
+				case "select":
 					model_1_results = sqlsExecutor.session.SqlMapClient(key, &parmaMap[0]).Query()
 					sqlModel = 1
 				case "insert", "delete", "update", "create", "drop":
@@ -92,7 +92,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				key := NewV4().String() + time.Now().String()
 				sqlsExecutor.session.Engine.AddSql(key, sqlStr)
 				switch sqlCmd {
-				case "select", "desc":
+				case "select":
 					model_1_results = sqlsExecutor.session.SqlMapClient(key, &parmaMap).Query()
 					sqlModel = 1
 				case "insert", "delete", "update", "create", "drop":
@@ -169,7 +169,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				sqlStr := strings.TrimSpace(sqlsSlice[i])
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 				switch sqlCmd {
-				case "select", "desc":
+				case "select":
 					model_1_results = sqlsExecutor.session.Sql(sqlStr).Query()
 					sqlModel = 1
 				case "insert", "delete", "update", "create", "drop":
@@ -251,7 +251,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 				if parmaSlice[i] == nil {
 					switch sqlCmd {
-					case "select", "desc":
+					case "select":
 						model_1_results = sqlsExecutor.session.Sql(sqlStr).Query()
 						sqlModel = 1
 					case "insert", "delete", "update", "create", "drop":
@@ -264,7 +264,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 					key := NewV4().String() + time.Now().String()
 					sqlsExecutor.session.Engine.AddSql(key, sqlStr)
 					switch sqlCmd {
-					case "select", "desc":
+					case "select":
 						model_1_results = sqlsExecutor.session.SqlMapClient(key, &parmaSlice[i]).Query()
 						sqlModel = 1
 					case "insert", "delete", "update", "create", "drop":
@@ -349,7 +349,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				sqlStr := strings.TrimSpace(sqlsMap[k])
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 				switch sqlCmd {
-				case "select", "desc":
+				case "select":
 					sqlModel = 1
 					model_1_results = sqlsExecutor.session.Sql(sqlStr).Query()
 
@@ -432,7 +432,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 				if parmasMap[k] == nil {
 					switch sqlCmd {
-					case "select", "desc":
+					case "select":
 						sqlModel = 1
 						model_1_results = sqlsExecutor.session.Sql(sqlStr).Query()
 
@@ -448,7 +448,7 @@ func (sqlsExecutor *SqlsExecutor) Execute() ([][]map[string]interface{}, map[str
 					sqlsExecutor.session.Engine.AddSql(key, sqlStr)
 					parmaMap := parmasMap[k]
 					switch sqlCmd {
-					case "select", "desc":
+					case "select":
 						sqlModel = 1
 						model_1_results = sqlsExecutor.session.SqlMapClient(key, &parmaMap).Query()
 

+ 9 - 9
sqlmaps_executor.go

@@ -44,7 +44,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 		if sqlMapsExecutor.parmas == nil {
 			switch sqlCmd {
-			case "select", "desc":
+			case "select":
 				model_1_results = sqlMapsExecutor.session.SqlMapClient(sqlkey).Query()
 				sqlModel = 1
 			case "insert", "delete", "update", "create", "drop":
@@ -67,7 +67,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 					return nil, nil, ErrParamsType
 				}
 				switch sqlCmd {
-				case "select", "desc":
+				case "select":
 					model_1_results = sqlMapsExecutor.session.SqlMapClient(sqlkey, &parmaMap[0]).Query()
 					sqlModel = 1
 				case "insert", "delete", "update", "create", "drop":
@@ -90,7 +90,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				}
 
 				switch sqlCmd {
-				case "select", "desc":
+				case "select":
 					model_1_results = sqlMapsExecutor.session.SqlMapClient(sqlkey, &parmaMap).Query()
 					sqlModel = 1
 				case "insert", "delete", "update", "create", "drop":
@@ -169,7 +169,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 
 				switch sqlCmd {
-				case "select", "desc":
+				case "select":
 					model_1_results = sqlMapsExecutor.session.SqlMapClient(sqlkeysSlice[i]).Query()
 					sqlModel = 1
 				case "insert", "delete", "update", "create", "drop":
@@ -253,7 +253,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 
 				if parmaSlice[i] == nil {
 					switch sqlCmd {
-					case "select", "desc":
+					case "select":
 						model_1_results = sqlMapsExecutor.session.SqlMapClient(sqlkeysSlice[i]).Query()
 						sqlModel = 1
 					case "insert", "delete", "update", "create", "drop":
@@ -264,7 +264,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 					}
 				} else {
 					switch sqlCmd {
-					case "select", "desc":
+					case "select":
 						model_1_results = sqlMapsExecutor.session.SqlMapClient(sqlkeysSlice[i], &parmaSlice[i]).Query()
 						sqlModel = 1
 					case "insert", "delete", "update", "create", "drop":
@@ -350,7 +350,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 
 				switch sqlCmd {
-				case "select", "desc":
+				case "select":
 					model_1_results = sqlMapsExecutor.session.SqlMapClient(sqlkeysMap[k]).Query()
 					sqlModel = 1
 				case "insert", "delete", "update", "create", "drop":
@@ -433,7 +433,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 				if parmasMap[k] == nil {
 					switch sqlCmd {
-					case "select", "desc":
+					case "select":
 						model_1_results = sqlMapsExecutor.session.SqlMapClient(sqlkeysMap[k]).Query()
 						sqlModel = 1
 					case "insert", "delete", "update", "create", "drop":
@@ -445,7 +445,7 @@ func (sqlMapsExecutor *SqlMapsExecutor) Execute() ([][]map[string]interface{}, m
 				} else {
 					parmaMap := parmasMap[k]
 					switch sqlCmd {
-					case "select", "desc":
+					case "select":
 						model_1_results = sqlMapsExecutor.session.SqlMapClient(sqlkeysMap[k], &parmaMap).Query()
 						sqlModel = 1
 					case "insert", "delete", "update", "create", "drop":

+ 9 - 9
sqltemplates_executor.go

@@ -53,7 +53,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 			sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 			switch sqlCmd {
-			case "select", "desc":
+			case "select":
 				model_1_results = sqlTemplatesExecutor.session.SqlTemplateClient(sqlkey).Query()
 				sqlModel = 1
 			case "insert", "delete", "update", "create", "drop":
@@ -83,7 +83,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 				switch sqlCmd {
-				case "select", "desc":
+				case "select":
 					model_1_results = sqlTemplatesExecutor.session.SqlTemplateClient(sqlkey, &parmaMap[0]).Query()
 					sqlModel = 1
 				case "insert", "delete", "update", "create", "drop":
@@ -111,7 +111,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				sqlStr = strings.TrimSpace(sqlStr)
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 				switch sqlCmd {
-				case "select", "desc":
+				case "select":
 					model_1_results = sqlTemplatesExecutor.session.SqlTemplateClient(sqlkey, &parmaMap).Query()
 					sqlModel = 1
 				case "insert", "delete", "update", "create", "drop":
@@ -181,7 +181,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 				switch sqlCmd {
-				case "select", "desc":
+				case "select":
 					model_1_results = sqlTemplatesExecutor.session.SqlTemplateClient(sqlkeysSlice[i]).Query()
 					sqlModel = 1
 				case "insert", "delete", "update", "create", "drop":
@@ -275,7 +275,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 				if parmaSlice[i] == nil {
 					switch sqlCmd {
-					case "select", "desc":
+					case "select":
 						model_1_results = sqlTemplatesExecutor.session.SqlTemplateClient(sqlkeysSlice[i]).Query()
 						sqlModel = 1
 					case "insert", "delete", "update", "create", "drop":
@@ -286,7 +286,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 					}
 				} else {
 					switch sqlCmd {
-					case "select", "desc":
+					case "select":
 						model_1_results = sqlTemplatesExecutor.session.SqlTemplateClient(sqlkeysSlice[i], &parmaSlice[i]).Query()
 						sqlModel = 1
 					case "insert", "delete", "update", "create", "drop":
@@ -382,7 +382,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 				switch sqlCmd {
-				case "select", "desc":
+				case "select":
 					model_1_results = sqlTemplatesExecutor.session.SqlTemplateClient(sqlkeysMap[k]).Query()
 					sqlModel = 1
 				case "insert", "delete", "update", "create", "drop":
@@ -475,7 +475,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				sqlCmd := strings.ToLower(strings.Split(sqlStr, " ")[0])
 				if parmasMap[k] == nil {
 					switch sqlCmd {
-					case "select", "desc":
+					case "select":
 						model_1_results = sqlTemplatesExecutor.session.SqlTemplateClient(sqlkeysMap[k]).Query()
 						sqlModel = 1
 					case "insert", "delete", "update", "create", "drop":
@@ -487,7 +487,7 @@ func (sqlTemplatesExecutor *SqlTemplatesExecutor) Execute() ([][]map[string]inte
 				} else {
 					parmaMap := parmasMap[k]
 					switch sqlCmd {
-					case "select", "desc":
+					case "select":
 						model_1_results = sqlTemplatesExecutor.session.SqlTemplateClient(sqlkeysMap[k], &parmaMap).Query()
 						sqlModel = 1
 					case "insert", "delete", "update", "create", "drop":