新增批量处理方法

sqlmap.go

@@ -46,21 +46,21 @@ func (engine *Engine) InitSqlMap(options ...SqlMapOptions) error {
 		opt.Extension = ".xml"
 	}
 
-	engine.SqlMap.Extension = opt.Extension
+	engine.sqlMap.Extension = opt.Extension
 
 	var err error
-	if engine.SqlMap.SqlMapRootDir == "" {
+	if engine.sqlMap.SqlMapRootDir == "" {
 		cfg, err := goconfig.LoadConfigFile("./sql/xormcfg.ini")
 		if err != nil {
 			return err
 		}
-		engine.SqlMap.SqlMapRootDir, err = cfg.GetValue("", "SqlMapRootDir")
+		engine.sqlMap.SqlMapRootDir, err = cfg.GetValue("", "SqlMapRootDir")
 		if err != nil {
 			return err
 		}
 	}
 
-	err = filepath.Walk(engine.SqlMap.SqlMapRootDir, engine.SqlMap.walkFunc)
+	err = filepath.Walk(engine.sqlMap.SqlMapRootDir, engine.sqlMap.walkFunc)
 	if err != nil {
 		return err
 	}
@@ -69,10 +69,10 @@ func (engine *Engine) InitSqlMap(options ...SqlMapOptions) error {
 }
 
 func (engine *Engine) LoadSqlMap(filepath string) error {
-	if len(engine.SqlMap.Extension) == 0 {
-		engine.SqlMap.Extension = ".xml"
+	if len(engine.sqlMap.Extension) == 0 {
+		engine.sqlMap.Extension = ".xml"
 	}
-	if strings.HasSuffix(filepath, engine.SqlMap.Extension) {
+	if strings.HasSuffix(filepath, engine.sqlMap.Extension) {
 		err := engine.loadSqlMap(filepath)
 		if err != nil {
 			return err
@@ -83,11 +83,11 @@ func (engine *Engine) LoadSqlMap(filepath string) error {
 }
 
 func (engine *Engine) BatchLoadSqlMap(filepathSlice []string) error {
-	if len(engine.SqlMap.Extension) == 0 {
-		engine.SqlMap.Extension = ".xml"
+	if len(engine.sqlMap.Extension) == 0 {
+		engine.sqlMap.Extension = ".xml"
 	}
 	for _, filepath := range filepathSlice {
-		if strings.HasSuffix(filepath, engine.SqlMap.Extension) {
+		if strings.HasSuffix(filepath, engine.sqlMap.Extension) {
 			err := engine.loadSqlMap(filepath)
 			if err != nil {
 				return err
@@ -99,10 +99,10 @@ func (engine *Engine) BatchLoadSqlMap(filepathSlice []string) error {
 }
 
 func (engine *Engine) ReloadSqlMap(filepath string) error {
-	if len(engine.SqlMap.Extension) == 0 {
-		engine.SqlMap.Extension = ".xml"
+	if len(engine.sqlMap.Extension) == 0 {
+		engine.sqlMap.Extension = ".xml"
 	}
-	if strings.HasSuffix(filepath, engine.SqlMap.Extension) {
+	if strings.HasSuffix(filepath, engine.sqlMap.Extension) {
 		err := engine.reloadSqlMap(filepath)
 		if err != nil {
 			return err
@@ -113,11 +113,11 @@ func (engine *Engine) ReloadSqlMap(filepath string) error {
 }
 
 func (engine *Engine) BatchReloadSqlMap(filepathSlice []string) error {
-	if len(engine.SqlMap.Extension) == 0 {
-		engine.SqlMap.Extension = ".xml"
+	if len(engine.sqlMap.Extension) == 0 {
+		engine.sqlMap.Extension = ".xml"
 	}
 	for _, filepath := range filepathSlice {
-		if strings.HasSuffix(filepath, engine.SqlMap.Extension) {
+		if strings.HasSuffix(filepath, engine.sqlMap.Extension) {
 			err := engine.loadSqlMap(filepath)
 			if err != nil {
 				return err
@@ -139,7 +139,7 @@ func (engine *Engine) loadSqlMap(filepath string) error {
 		return nil
 	}
 
-	err = engine.SqlMap.paresSql(filepath)
+	err = engine.sqlMap.paresSql(filepath)
 	if err != nil {
 		return err
 	}
@@ -157,7 +157,7 @@ func (engine *Engine) reloadSqlMap(filepath string) error {
 	if info.IsDir() {
 		return nil
 	}
-	err = engine.SqlMap.paresSql(filepath)
+	err = engine.sqlMap.paresSql(filepath)
 	if err != nil {
 		return err
 	}
@@ -208,7 +208,7 @@ func (sqlMap *SqlMap) paresSql(filepath string) error {
 }
 
 func (engine *Engine) AddSql(key string, sql string) {
-	engine.SqlMap.addSql(key, sql)
+	engine.sqlMap.addSql(key, sql)
 }
 
 func (sqlMap *SqlMap) addSql(key string, sql string) {
@@ -217,7 +217,7 @@ func (sqlMap *SqlMap) addSql(key string, sql string) {
 }
 
 func (engine *Engine) UpdateSql(key string, sql string) {
-	engine.SqlMap.updateSql(key, sql)
+	engine.sqlMap.updateSql(key, sql)
 }
 
 func (sqlMap *SqlMap) updateSql(key string, sql string) {
@@ -226,7 +226,7 @@ func (sqlMap *SqlMap) updateSql(key string, sql string) {
 }
 
 func (engine *Engine) RemoveSql(key string) {
-	engine.SqlMap.removeSql(key)
+	engine.sqlMap.removeSql(key)
 }
 
 func (sqlMap *SqlMap) removeSql(key string) {
@@ -235,7 +235,7 @@ func (sqlMap *SqlMap) removeSql(key string) {
 }
 
 func (engine *Engine) BatchAddSql(sqlStrMap map[string]string) {
-	engine.SqlMap.batchAddSql(sqlStrMap)
+	engine.sqlMap.batchAddSql(sqlStrMap)
 }
 
 func (sqlMap *SqlMap) batchAddSql(sqlStrMap map[string]string) {
@@ -246,7 +246,7 @@ func (sqlMap *SqlMap) batchAddSql(sqlStrMap map[string]string) {
 }
 
 func (engine *Engine) BatchUpdateSql(sqlStrMap map[string]string) {
-	engine.SqlMap.batchUpdateSql(sqlStrMap)
+	engine.sqlMap.batchUpdateSql(sqlStrMap)
 }
 
 func (sqlMap *SqlMap) batchUpdateSql(sqlStrMap map[string]string) {
@@ -257,7 +257,7 @@ func (sqlMap *SqlMap) batchUpdateSql(sqlStrMap map[string]string) {
 }
 
 func (engine *Engine) BatchRemoveSql(key []string) {
-	engine.SqlMap.batchRemoveSql(key)
+	engine.sqlMap.batchRemoveSql(key)
 }
 
 func (sqlMap *SqlMap) batchRemoveSql(key []string) {

sqltemplate.go

@@ -37,18 +37,18 @@ func (engine *Engine) InitSqlTemplate(options ...SqlTemplateOptions) error {
 	}
 
 	var err error
-	if engine.SqlTemplate.SqlTemplateRootDir == "" {
+	if engine.sqlTemplate.SqlTemplateRootDir == "" {
 		cfg, err := goconfig.LoadConfigFile("./sql/xormcfg.ini")
 		if err != nil {
 			return err
 		}
-		engine.SqlTemplate.SqlTemplateRootDir, err = cfg.GetValue("", "SqlTemplateRootDir")
+		engine.sqlTemplate.SqlTemplateRootDir, err = cfg.GetValue("", "SqlTemplateRootDir")
 		if err != nil {
 			return err
 		}
 	}
 
-	err = filepath.Walk(engine.SqlTemplate.SqlTemplateRootDir, engine.SqlTemplate.walkFunc)
+	err = filepath.Walk(engine.sqlTemplate.SqlTemplateRootDir, engine.sqlTemplate.walkFunc)
 	if err != nil {
 		return err
 	}
@@ -57,10 +57,10 @@ func (engine *Engine) InitSqlTemplate(options ...SqlTemplateOptions) error {
 }
 
 func (engine *Engine) LoadSqlTemplate(filepath string) error {
-	if len(engine.SqlTemplate.Extension) == 0 {
-		engine.SqlTemplate.Extension = ".stpl"
+	if len(engine.sqlTemplate.Extension) == 0 {
+		engine.sqlTemplate.Extension = ".stpl"
 	}
-	if strings.HasSuffix(filepath, engine.SqlTemplate.Extension) {
+	if strings.HasSuffix(filepath, engine.sqlTemplate.Extension) {
 		err := engine.loadSqlTemplate(filepath)
 		if err != nil {
 			return err
@@ -71,11 +71,11 @@ func (engine *Engine) LoadSqlTemplate(filepath string) error {
 }
 
 func (engine *Engine) BatchLoadSqlTemplate(filepathSlice []string) error {
-	if len(engine.SqlTemplate.Extension) == 0 {
-		engine.SqlTemplate.Extension = ".stpl"
+	if len(engine.sqlTemplate.Extension) == 0 {
+		engine.sqlTemplate.Extension = ".stpl"
 	}
 	for _, filepath := range filepathSlice {
-		if strings.HasSuffix(filepath, engine.SqlTemplate.Extension) {
+		if strings.HasSuffix(filepath, engine.sqlTemplate.Extension) {
 			err := engine.loadSqlTemplate(filepath)
 			if err != nil {
 				return err
@@ -87,10 +87,10 @@ func (engine *Engine) BatchLoadSqlTemplate(filepathSlice []string) error {
 }
 
 func (engine *Engine) ReloadSqlTemplate(filepath string) error {
-	if len(engine.SqlTemplate.Extension) == 0 {
-		engine.SqlTemplate.Extension = ".stpl"
+	if len(engine.sqlTemplate.Extension) == 0 {
+		engine.sqlTemplate.Extension = ".stpl"
 	}
-	if strings.HasSuffix(filepath, engine.SqlTemplate.Extension) {
+	if strings.HasSuffix(filepath, engine.sqlTemplate.Extension) {
 		err := engine.reloadSqlTemplate(filepath)
 		if err != nil {
 			return err
@@ -101,11 +101,11 @@ func (engine *Engine) ReloadSqlTemplate(filepath string) error {
 }
 
 func (engine *Engine) BatchReloadSqlTemplate(filepathSlice []string) error {
-	if len(engine.SqlTemplate.Extension) == 0 {
-		engine.SqlTemplate.Extension = ".stpl"
+	if len(engine.sqlTemplate.Extension) == 0 {
+		engine.sqlTemplate.Extension = ".stpl"
 	}
 	for _, filepath := range filepathSlice {
-		if strings.HasSuffix(filepath, engine.SqlTemplate.Extension) {
+		if strings.HasSuffix(filepath, engine.sqlTemplate.Extension) {
 			err := engine.loadSqlTemplate(filepath)
 			if err != nil {
 				return err
@@ -126,7 +126,7 @@ func (engine *Engine) loadSqlTemplate(filepath string) error {
 		return nil
 	}
 
-	err = engine.SqlTemplate.paresSqlTemplate(info.Name(), filepath)
+	err = engine.sqlTemplate.paresSqlTemplate(info.Name(), filepath)
 	if err != nil {
 		return err
 	}
@@ -144,7 +144,7 @@ func (engine *Engine) reloadSqlTemplate(filepath string) error {
 		return nil
 	}
 
-	err = engine.SqlTemplate.paresSqlTemplate(info.Name(), filepath)
+	err = engine.sqlTemplate.paresSqlTemplate(info.Name(), filepath)
 	if err != nil {
 		return err
 	}
@@ -183,7 +183,7 @@ func (sqlTemplate *SqlTemplate) paresSqlTemplate(filename string, filepath strin
 }
 
 func (engine *Engine) AddSqlTemplate(key string, sqlTemplateStr string) error {
-	return engine.SqlTemplate.addSqlTemplate(key, sqlTemplateStr)
+	return engine.sqlTemplate.addSqlTemplate(key, sqlTemplateStr)
 
 }
 
@@ -201,7 +201,7 @@ func (sqlTemplate *SqlTemplate) addSqlTemplate(key string, sqlTemplateStr string
 }
 
 func (engine *Engine) UpdateSqlTemplate(key string, sqlTemplateStr string) error {
-	return engine.SqlTemplate.updateSqlTemplate(key, sqlTemplateStr)
+	return engine.sqlTemplate.updateSqlTemplate(key, sqlTemplateStr)
 }
 
 func (sqlTemplate *SqlTemplate) updateSqlTemplate(key string, sqlTemplateStr string) error {
@@ -218,7 +218,7 @@ func (sqlTemplate *SqlTemplate) updateSqlTemplate(key string, sqlTemplateStr str
 }
 
 func (engine *Engine) RemoveSqlTemplate(key string) {
-	engine.SqlTemplate.removeSqlTemplate(key)
+	engine.sqlTemplate.removeSqlTemplate(key)
 }
 
 func (sqlTemplate *SqlTemplate) removeSqlTemplate(key string) {
@@ -227,7 +227,7 @@ func (sqlTemplate *SqlTemplate) removeSqlTemplate(key string) {
 }
 
 func (engine *Engine) BatchAddSqlTemplate(key string, sqlTemplateStrMap map[string]string) error {
-	return engine.SqlTemplate.batchAddSqlTemplate(key, sqlTemplateStrMap)
+	return engine.sqlTemplate.batchAddSqlTemplate(key, sqlTemplateStrMap)
 
 }
 
@@ -247,7 +247,7 @@ func (sqlTemplate *SqlTemplate) batchAddSqlTemplate(key string, sqlTemplateStrMa
 }
 
 func (engine *Engine) BatchUpdateSqlTemplate(key string, sqlTemplateStrMap map[string]string) error {
-	return engine.SqlTemplate.batchAddSqlTemplate(key, sqlTemplateStrMap)
+	return engine.sqlTemplate.batchAddSqlTemplate(key, sqlTemplateStrMap)
 
 }
 
@@ -267,7 +267,7 @@ func (sqlTemplate *SqlTemplate) batchUpdateSqlTemplate(key string, sqlTemplateSt
 }
 
 func (engine *Engine) BatchRemoveSqlTemplate(key []string) {
-	engine.SqlTemplate.batchRemoveSqlTemplate(key)
+	engine.sqlTemplate.batchRemoveSqlTemplate(key)
 }
 
 func (sqlTemplate *SqlTemplate) batchRemoveSqlTemplate(key []string) {