- Refactor code

Author: kietnguyentuan69

code.go

@@ -50,41 +50,45 @@ type DynamicSqlCodeLoader struct {
 	DB             *sql.DB
 	Query          string
 	ParameterCount int
-	HandleDriver   bool
 	Driver         string
 }
+
 func NewDefaultDynamicSqlCodeLoader(db *sql.DB, query string) *DynamicSqlCodeLoader {
 	driver := GetDriver(db)
-	return &DynamicSqlCodeLoader{DB: db, Query: query, ParameterCount: 0, HandleDriver: true, Driver: driver}
+	return &DynamicSqlCodeLoader{DB: db, Query: query, ParameterCount: 0, Driver: driver}
+	return NewDynamicSqlCodeLoader(db, query, 0, true)
 }
 func NewDynamicSqlCodeLoader(db *sql.DB, query string, parameterCount int, handleDriver bool) *DynamicSqlCodeLoader {
 	driver := GetDriver(db)
-	return &DynamicSqlCodeLoader{DB: db, Query: query, ParameterCount: parameterCount, HandleDriver: handleDriver, Driver: driver}
-}
-func (l DynamicSqlCodeLoader) Load(ctx context.Context, master string) ([]CodeModel, error) {
-	models := make([]CodeModel, 0)
-	params := make([]interface{}, 0)
-	params = append(params, master)
-	if l.ParameterCount > 1 {
-		for i := 2; i <= l.ParameterCount; i++ {
-			params = append(params, master)
-		}
+	if parameterCount <= 0 {
+		parameterCount = 1
 	}
-	driver := l.Driver
-	if l.HandleDriver {
+	if handleDriver {
 		if driver == DriverOracle || driver == DriverPostgres {
 			var x string
 			if driver == DriverOracle {
 				x = ":val"
 			} else {
 				x = "$"
 			}
-			for i := 0; i < len(params); i++ {
+			for i := 0; i < parameterCount; i++ {
 				count := i + 1
-				l.Query = strings.Replace(l.Query, "?", x + strconv.Itoa(count), 1)
+				query = strings.Replace(query, "?", x+strconv.Itoa(count), 1)
 			}
 		}
 	}
+	return &DynamicSqlCodeLoader{DB: db, Query: query, ParameterCount: parameterCount, Driver: driver}
+}
+func (l DynamicSqlCodeLoader) Load(ctx context.Context, master string) ([]CodeModel, error) {
+	models := make([]CodeModel, 0)
+	params := make([]interface{}, 0)
+	params = append(params, master)
+	if l.ParameterCount > 1 {
+		for i := 2; i <= l.ParameterCount; i++ {
+			params = append(params, master)
+		}
+	}
+	driver := l.Driver
 	rows, er1 := l.DB.Query(l.Query, params...)
 	if er1 != nil {
 		return models, er1
@@ -167,7 +171,7 @@ func (l SqlCodeLoader) Load(ctx context.Context, master string) ([]CodeModel, er
 			p2 = fmt.Sprintf("%s = $%d", c.Status, i)
 		} else if l.Driver == DriverOracle {
 			p1 = fmt.Sprintf("%s = :val%d", c.Status, i)
-		}else {
+		} else {
 			p2 = fmt.Sprintf("%s = ?", c.Status)
 		}
 		values = append(values, c.Active)
@@ -190,9 +194,9 @@ func (l SqlCodeLoader) Load(ctx context.Context, master string) ([]CodeModel, er
 		}
 	}
 	if len(sql2) > 0 {
-		if l.Driver == DriverOracle || l.Driver  == DriverPostgres {
+		if l.Driver == DriverOracle || l.Driver == DriverPostgres {
 			var x string
-			if l.Driver  == DriverOracle {
+			if l.Driver == DriverOracle {
 				x = ":val"
 			} else {
 				x = "$"