Refactor loader

Author: minhduc140583

loader.go

@@ -10,6 +10,44 @@ import (
 	"strings"
 )
 
+func BuildFields(modelType reflect.Type) string {
+	columns := GetFields(modelType)
+	return strings.Join(columns, ",")
+}
+func GetFields(modelType reflect.Type) []string {
+	m := modelType
+	if m.Kind() == reflect.Ptr {
+		m = m.Elem()
+	}
+	numField := m.NumField()
+	columns := make([]string, 0)
+	for idx := 0; idx < numField; idx++ {
+		field := m.Field(idx)
+		tag, _ := field.Tag.Lookup("gorm")
+		if !strings.Contains(tag, IgnoreReadWrite) {
+			if has := strings.Contains(tag, "column"); has {
+				json := field.Name
+				col := json
+				str1 := strings.Split(tag, ";")
+				num := len(str1)
+				for i := 0; i < num; i++ {
+					str2 := strings.Split(str1[i], ":")
+					for j := 0; j < len(str2); j++ {
+						if str2[j] == "column" {
+							col = str2[j+1]
+							columns = append(columns, col)
+						}
+					}
+				}
+			}
+		}
+	}
+	return columns
+}
+func BuildQuery(table string, modelType reflect.Type) string {
+	columns := GetFields(modelType)
+	return "select " + strings.Join(columns, ",") + " from " + table + " "
+}
 func InitFields(modelType reflect.Type, db *sql.DB) (map[string]int, string, func(i int) string, string, error) {
 	fieldsIndex, err := GetColumnIndexes(modelType)
 	if err != nil {

sql_util.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 )
 
+const IgnoreReadWrite = "-"
 const txs = "tx"
 
 type Executor interface {

util.go

@@ -10,8 +10,6 @@ import (
 	"time"
 )
 
-const IgnoreReadWrite = "-"
-
 type BatchStatement struct {
 	Query         string
 	Values        []interface{}
@@ -54,44 +52,6 @@ func BuildQueryBySchema(table string, schema *Schema) string {
 	}
 	return "select " + strings.Join(columns, ",") + " from " + table + " "
 }
-func BuildFields(modelType reflect.Type) string {
-	columns := GetFields(modelType)
-	return strings.Join(columns, ",")
-}
-func GetFields(modelType reflect.Type) []string {
-	m := modelType
-	if m.Kind() == reflect.Ptr {
-		m = m.Elem()
-	}
-	numField := m.NumField()
-	columns := make([]string, 0)
-	for idx := 0; idx < numField; idx++ {
-		field := m.Field(idx)
-		tag, _ := field.Tag.Lookup("gorm")
-		if !strings.Contains(tag, IgnoreReadWrite) {
-			if has := strings.Contains(tag, "column"); has {
-				json := field.Name
-				col := json
-				str1 := strings.Split(tag, ";")
-				num := len(str1)
-				for i := 0; i < num; i++ {
-					str2 := strings.Split(str1[i], ":")
-					for j := 0; j < len(str2); j++ {
-						if str2[j] == "column" {
-							col = str2[j+1]
-							columns = append(columns, col)
-						}
-					}
-				}
-			}
-		}
-	}
-	return columns
-}
-func BuildQuery(table string, modelType reflect.Type) string {
-	columns := GetFields(modelType)
-	return "select " + strings.Join(columns, ",") + " from " + table + " "
-}
 func CreateSchema(modelType reflect.Type) *Schema {
 	m := modelType
 	if m.Kind() == reflect.Ptr {