Fix bug Generic Repository and Action Log

Author: minhduc140583

action/action_log.go

@@ -4,15 +4,45 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"reflect"
+	"strconv"
 	"strings"
 	"time"
-
-	q "github.com/core-go/sql"
 )
 
+func BuildParam(i int) string {
+	return "?"
+}
+func BuildOracleParam(i int) string {
+	return ":" + strconv.Itoa(i)
+}
+func BuildMsSqlParam(i int) string {
+	return "@p" + strconv.Itoa(i)
+}
+func BuildDollarParam(i int) string {
+	return "$" + strconv.Itoa(i)
+}
+func GetBuild(db *sql.DB) func(i int) string {
+	driver := reflect.TypeOf(db.Driver()).String()
+	switch driver {
+	case "*pq.Driver":
+		return BuildDollarParam
+	case "*godror.drv":
+		return BuildOracleParam
+	case "*mssql.Driver":
+		return BuildMsSqlParam
+	default:
+		return BuildParam
+	}
+}
+
+type DBConfig struct {
+	DataSourceName string `yaml:"data_source_name" mapstructure:"data_source_name" json:"dataSourceName,omitempty" gorm:"column:datasourcename" bson:"dataSourceName,omitempty" dynamodbav:"dataSourceName,omitempty" firestore:"dataSourceName,omitempty"`
+	Driver         string `yaml:"driver" mapstructure:"driver" json:"driver,omitempty" gorm:"column:driver" bson:"driver,omitempty" dynamodbav:"driver,omitempty" firestore:"driver,omitempty"`
+}
 type ActionLogConf struct {
 	Log    bool            `yaml:"log" mapstructure:"log" json:"log,omitempty" gorm:"column:log" bson:"log,omitempty" dynamodbav:"log,omitempty" firestore:"log,omitempty"`
-	DB     q.Config        `yaml:"db" mapstructure:"db" json:"db,omitempty" gorm:"column:db" bson:"db,omitempty" dynamodbav:"db,omitempty" firestore:"db,omitempty"`
+	DB     DBConfig        `yaml:"db" mapstructure:"db" json:"db,omitempty" gorm:"column:db" bson:"db,omitempty" dynamodbav:"db,omitempty" firestore:"db,omitempty"`
 	Schema ActionLogSchema `yaml:"schema" mapstructure:"schema" json:"schema,omitempty" gorm:"column:schema" bson:"schema,omitempty" dynamodbav:"schema,omitempty" firestore:"schema,omitempty"`
 	Config ActionLogConfig `yaml:"config" mapstructure:"config" json:"config,omitempty" gorm:"column:config" bson:"config,omitempty" dynamodbav:"config,omitempty" firestore:"config,omitempty"`
 }
@@ -42,7 +72,6 @@ type ActionLogWriter struct {
 	Schema     ActionLogSchema
 	Generate   func(ctx context.Context) (string, error)
 	BuildParam func(i int) string
-	Driver     string
 }
 
 func NewSqlActionLogWriter(database *sql.DB, tableName string, config ActionLogConfig, s ActionLogSchema, options ...func(context.Context) (string, error)) *ActionLogWriter {
@@ -60,7 +89,6 @@ func NewActionLogWriter(database *sql.DB, tableName string, config ActionLogConf
 	s.Timestamp = strings.ToLower(s.Timestamp)
 	s.Status = strings.ToLower(s.Status)
 	s.Desc = strings.ToLower(s.Desc)
-	driver := q.GetDriver(database)
 	if len(s.Id) == 0 {
 		s.Id = "id"
 	}
@@ -86,9 +114,9 @@ func NewActionLogWriter(database *sql.DB, tableName string, config ActionLogConf
 	if len(options) > 0 && options[0] != nil {
 		buildParam = options[0]
 	} else {
-		buildParam = q.GetBuild(database)
+		buildParam = GetBuild(database)
 	}
-	writer := ActionLogWriter{Database: database, Table: tableName, Config: config, Schema: s, Generate: generate, BuildParam: buildParam, Driver: driver}
+	writer := ActionLogWriter{Database: database, Table: tableName, Config: config, Schema: s, Generate: generate, BuildParam: buildParam}
 	return &writer
 }
 
@@ -122,7 +150,7 @@ func (s *ActionLogWriter) Write(ctx context.Context, resource string, action str
 			log[k] = v
 		}
 	}
-	query, vars := BuildInsertSQL(s.Database, s.Table, log, s.BuildParam)
+	query, vars := BuildInsertSQL(s.Table, log, s.BuildParam)
 	_, err := s.Database.ExecContext(ctx, query, vars...)
 	return err
 }
@@ -154,18 +182,11 @@ func GetString(ctx context.Context, key string) string {
 	}
 	return ""
 }
-func BuildInsertSQL(db *sql.DB, tableName string, model map[string]interface{}, options ...func(i int) string) (string, []interface{}) {
-	driver := q.GetDriver(db)
-	var buildParam func(i int) string
-	if len(options) > 0 && options[0] != nil {
-		buildParam = options[0]
-	} else {
-		buildParam = q.GetBuild(db)
-	}
+func BuildInsertSQL(tableName string, model map[string]interface{}, buildParam func(i int) string) (string, []interface{}) {
 	var cols []string
 	var values []interface{}
 	for col, v := range model {
-		cols = append(cols, QuoteString(col, driver))
+		cols = append(cols, col)
 		values = append(values, v)
 	}
 	column := fmt.Sprintf("(%v)", strings.Join(cols, ","))
@@ -176,13 +197,6 @@ func BuildInsertSQL(db *sql.DB, tableName string, model map[string]interface{},
 		arrValue = append(arrValue, param)
 	}
 	value := fmt.Sprintf("(%v)", strings.Join(arrValue, ","))
-	strSQL := fmt.Sprintf("insert into %v %v values %v", QuoteString(tableName, driver), column, value)
+	strSQL := fmt.Sprintf("insert into %v %v values %v", tableName, column, value)
 	return strSQL, values
 }
-
-func QuoteString(name string, driver string) string {
-	if driver == q.DriverPostgres {
-		name = `"` + name + `"`
-	}
-	return name
-}

adapter/adapter.go

@@ -20,12 +20,18 @@ type Adapter[T any, K any] struct {
 }
 
 func NewAdapter[T any, K any](db *sql.DB, tableName string, opts ...func(int) string) (*Adapter[T, K], error) {
-	return NewSqlAdapterWithVersionAndArray[T, K](db, tableName, "", nil, opts...)
+	return NewAdapterWithVersionAndArray[T, K](db, tableName, "", nil, opts...)
 }
 func NewAdapterWithVersion[T any, K any](db *sql.DB, tableName string, versionField string, opts ...func(int) string) (*Adapter[T, K], error) {
-	return NewSqlAdapterWithVersionAndArray[T, K](db, tableName, versionField, nil, opts...)
+	return NewAdapterWithVersionAndArray[T, K](db, tableName, versionField, nil, opts...)
 }
-func NewSqlAdapterWithVersionAndArray[T any, K any](db *sql.DB, tableName string, versionField string, toArray func(interface{}) interface {
+func NewAdapterWithArray[T any, K any](db *sql.DB, tableName string, toArray func(interface{}) interface {
+	driver.Valuer
+	sql.Scanner
+}, opts ...func(int) string) (*Adapter[T, K], error) {
+	return NewAdapterWithVersionAndArray[T, K](db, tableName, "", toArray, opts...)
+}
+func NewAdapterWithVersionAndArray[T any, K any](db *sql.DB, tableName string, versionField string, toArray func(interface{}) interface {
 	driver.Valuer
 	sql.Scanner
 }, opts ...func(int) string) (*Adapter[T, K], error) {
@@ -58,6 +64,7 @@ func NewSqlAdapterWithVersionAndArray[T any, K any](db *sql.DB, tableName string
 	fields := q.BuildFieldsBySchema(adapter.Schema)
 	return &Adapter[T, K]{adapter, fieldsIndex, fields, idMap}, nil
 }
+
 func (a *Adapter[T, K]) All(ctx context.Context) ([]T, error) {
 	var objs []T
 	query := fmt.Sprintf("select %s from %s", a.Fields, a.Table)
@@ -91,7 +98,7 @@ func (a *Adapter[T, K]) Load(ctx context.Context, id K) (*T, error) {
 	query := fmt.Sprintf("select %s from %s ", a.Fields, a.Table)
 	query1, args := q.BuildFindByIdWithDB(a.DB, query, ip, a.JsonColumnMap, a.Keys, a.BuildParam)
 	tx := q.GetExec(ctx, a.DB, a.TxKey)
-	err := q.Query(ctx, tx, a.Map, &objs, query1, args...)
+	err := q.QueryWithArray(ctx, tx, a.Map, &objs, a.ToArray, query1, args...)
 	if err != nil {
 		return nil, err
 	}

adapter/search.go

@@ -30,7 +30,7 @@ func NewSearchAdapterWithArray[T any, K any, F any](db *sql.DB, table string, bu
 	driver.Valuer
 	sql.Scanner
 }, versionField string, buildParam func(int) string, opts ...func(*T)) (*SearchAdapter[T, K, F], error) {
-	adapter, err := NewSqlAdapterWithVersionAndArray[T, K](db, table, versionField, toArray, buildParam)
+	adapter, err := NewAdapterWithVersionAndArray[T, K](db, table, versionField, toArray, buildParam)
 	if err != nil {
 		return nil, err
 	}

query/loader.go

@@ -24,7 +24,7 @@ type Loader[T any, K any] struct {
 	Keys          []string
 	BuildParam    func(i int) string
 	Map           func(*T)
-	toArray       func(interface{}) interface {
+	ToArray       func(interface{}) interface {
 		driver.Valuer
 		sql.Scanner
 	}
@@ -88,7 +88,7 @@ func NewLoaderWithMapAndArray[T any, K any](db *sql.DB, tableName string, toArra
 func (a *Loader[T, K]) All(ctx context.Context) ([]T, error) {
 	var objs []T
 	query := fmt.Sprintf("select %s from %s", a.Fields, a.Table)
-	err := q.Query(ctx, a.DB, a.FieldMap, &objs, query)
+	err := q.QueryWithArray(ctx, a.DB, a.FieldMap, &objs, a.ToArray, query)
 	if a.Map != nil {
 		l := len(objs)
 		for i := 0; i < l; i++ {
@@ -122,7 +122,7 @@ func (a *Loader[T, K]) Load(ctx context.Context, id K) (*T, error) {
 	var objs []T
 	query := fmt.Sprintf("select %s from %s ", a.Fields, a.Table)
 	query1, args := q.BuildFindByIdWithDB(a.DB, query, ip, a.JsonColumnMap, a.Keys, a.BuildParam)
-	err := q.Query(ctx, a.DB, a.FieldMap, &objs, query1, args...)
+	err := q.QueryWithArray(ctx, a.DB, a.FieldMap, &objs, a.ToArray, query1, args...)
 	if err != nil {
 		return nil, err
 	}

query/query.go

@@ -14,10 +14,6 @@ type Query[T any, K any, F any] struct {
 	BuildQuery func(F) (string, []interface{})
 	Mp         func(*T)
 	Map        map[string]int
-	ToArray    func(interface{}) interface {
-		driver.Valuer
-		sql.Scanner
-	}
 }
 
 func NewQuery[T any, K any, F any](db *sql.DB, table string, buildQuery func(F) (string, []interface{}), opts ...func(*T)) (*Query[T, K, F], error) {
@@ -41,7 +37,7 @@ func NewQueryWithArray[T any, K any, F any](db *sql.DB, table string, buildQuery
 	if err != nil {
 		return nil, err
 	}
-	builder := &Query[T, K, F]{Loader: adapter, Map: fieldsIndex, BuildQuery: buildQuery, Mp: mp, ToArray: toArray}
+	builder := &Query[T, K, F]{Loader: adapter, Map: fieldsIndex, BuildQuery: buildQuery, Mp: mp}
 	return builder, nil
 }
 

repository/repository.go

@@ -20,12 +20,18 @@ type Repository[T any, K any] struct {
 }
 
 func NewRepository[T any, K any](db *sql.DB, tableName string, opts ...func(int) string) (*Repository[T, K], error) {
-	return NewSqlRepositoryWithVersionAndArray[T, K](db, tableName, "", nil, opts...)
+	return NewRepositoryWithVersionAndArray[T, K](db, tableName, "", nil, opts...)
 }
 func NewRepositoryWithVersion[T any, K any](db *sql.DB, tableName string, versionField string, opts ...func(int) string) (*Repository[T, K], error) {
-	return NewSqlRepositoryWithVersionAndArray[T, K](db, tableName, versionField, nil, opts...)
+	return NewRepositoryWithVersionAndArray[T, K](db, tableName, versionField, nil, opts...)
 }
-func NewSqlRepositoryWithVersionAndArray[T any, K any](db *sql.DB, tableName string, versionField string, toArray func(interface{}) interface {
+func NewSqlRepositoryWithArray[T any, K any](db *sql.DB, tableName string, toArray func(interface{}) interface {
+	driver.Valuer
+	sql.Scanner
+}, opts ...func(int) string) (*Repository[T, K], error) {
+	return NewRepositoryWithVersionAndArray[T, K](db, tableName, "", toArray, opts...)
+}
+func NewRepositoryWithVersionAndArray[T any, K any](db *sql.DB, tableName string, versionField string, toArray func(interface{}) interface {
 	driver.Valuer
 	sql.Scanner
 }, opts ...func(int) string) (*Repository[T, K], error) {
@@ -58,6 +64,7 @@ func NewSqlRepositoryWithVersionAndArray[T any, K any](db *sql.DB, tableName str
 	fields := q.BuildFieldsBySchema(repo.Schema)
 	return &Repository[T, K]{repo, fieldsIndex, fields, idMap}, nil
 }
+
 func (a *Repository[T, K]) All(ctx context.Context) ([]T, error) {
 	var objs []T
 	query := fmt.Sprintf("select %s from %s", a.Fields, a.Table)
@@ -91,7 +98,7 @@ func (a *Repository[T, K]) Load(ctx context.Context, id K) (*T, error) {
 	query := fmt.Sprintf("select %s from %s ", a.Fields, a.Table)
 	query1, args := q.BuildFindByIdWithDB(a.DB, query, ip, a.JsonColumnMap, a.Keys, a.BuildParam)
 	tx := q.GetExec(ctx, a.DB, a.TxKey)
-	err := q.Query(ctx, tx, a.Map, &objs, query1, args...)
+	err := q.QueryWithArray(ctx, tx, a.Map, &objs, a.ToArray, query1, args...)
 	if err != nil {
 		return nil, err
 	}

repository/search.go

@@ -30,7 +30,7 @@ func NewSearchRepositoryWithArray[T any, K any, F any](db *sql.DB, table string,
 	driver.Valuer
 	sql.Scanner
 }, versionField string, buildParam func(int) string, opts ...func(*T)) (*SearchRepository[T, K, F], error) {
-	repo, err := NewSqlRepositoryWithVersionAndArray[T, K](db, table, versionField, toArray, buildParam)
+	repo, err := NewRepositoryWithVersionAndArray[T, K](db, table, versionField, toArray, buildParam)
 	if err != nil {
 		return nil, err
 	}