fix pgsql cast

Author: markus621

_example/go-gen/model_orm.go

@@ -32,10 +32,11 @@ func (v *exec) Params(args ...any) {
 
 	switch v.D {
 	case PgSQLDialect:
-		v.P = append(v.P, pgCastTypes(args))
+		applyPGSqlCastTypes(args)
 	default:
-		v.P = append(v.P, args)
 	}
+
+	v.P = append(v.P, args)
 }
 
 func (v *exec) Bind(call func(rowsAffected, lastInsertId int64) error) {

orm/orm_stmt_exec.go

@@ -23,10 +23,11 @@ type query struct {
 func (v *query) SQL(query string, args ...any) {
 	switch v.D {
 	case PgSQLDialect:
-		v.Q, v.P = query, pgCastTypes(args)
+		applyPGSqlCastTypes(args)
 	default:
-		v.Q, v.P = query, args
 	}
+
+	v.Q, v.P = query, args
 }
 
 func (v *query) Bind(call func(bind Scanner) error) {
@@ -45,10 +46,11 @@ type scan struct {
 func (v *scan) Scan(args ...any) error {
 	switch v.D {
 	case PgSQLDialect:
-		return v.S.Scan(pgCastTypes(args)...)
+		applyPGSqlCastTypes(args)
 	default:
-		return v.S.Scan(args...)
 	}
+
+	return v.S.Scan(args...)
 }
 
 type (

orm/orm_stmt_query.go

@@ -6,13 +6,28 @@
 package orm
 
 import (
+	"database/sql"
 	"database/sql/driver"
 	"encoding/json"
 	"fmt"
+	"reflect"
+	"time"
 
 	"github.com/lib/pq"
 )
 
+type (
+	TypeScanValuer interface {
+		driver.Valuer
+		sql.Scanner
+	}
+
+	TypeJSONb interface {
+		json.Marshaler
+		json.Unmarshaler
+	}
+)
+
 type jsonb struct {
 	Any any
 }
@@ -48,49 +63,35 @@ func (jb *jsonb) Value() (driver.Value, error) {
 	return driver.Value(b), nil
 }
 
-func pgCastTypes(args []any) []any {
-	out := make([]any, 0, len(args))
-	for _, arg := range args {
-		out = append(out, pgCastType(arg))
-	}
-	return out
-}
+func applyPGSqlCastTypes(args []any) {
+	count := len(args)
 
-func pgCastType(arg any) any {
-	switch a := arg.(type) {
-	case json.Marshaler, json.Unmarshaler:
-		return &jsonb{Any: a}
+	for i := 0; i < count; i++ {
+		if reflect.ValueOf(args[i]).Kind() == reflect.Slice {
+			args[i] = pq.Array(args[i])
+			continue
+		}
 
-	case []bool:
-		return (*pq.BoolArray)(&a)
-	case []float64:
-		return (*pq.Float64Array)(&a)
-	case []float32:
-		return (*pq.Float32Array)(&a)
-	case []int64:
-		return (*pq.Int64Array)(&a)
-	case []int32:
-		return (*pq.Int32Array)(&a)
-	case []string:
-		return (*pq.StringArray)(&a)
-	case [][]byte:
-		return (*pq.ByteaArray)(&a)
-
-	case *[]bool:
-		return (*pq.BoolArray)(a)
-	case *[]float64:
-		return (*pq.Float64Array)(a)
-	case *[]float32:
-		return (*pq.Float32Array)(a)
-	case *[]int64:
-		return (*pq.Int64Array)(a)
-	case *[]int32:
-		return (*pq.Int32Array)(a)
-	case *[]string:
-		return (*pq.StringArray)(a)
-	case *[][]byte:
-		return (*pq.ByteaArray)(a)
+		switch args[i].(type) {
+		case TypeScanValuer:
+			// ---
+		case []byte, string, *[]byte, *string:
+			// ---
+		case int, int8, int16, int32, int64, *int, *int8, *int16, *int32, *int64:
+			// ---
+		case uint, uint8, uint16, uint32, uint64, *uint, *uint8, *uint16, *uint32, *uint64:
+			// ---
+		case float32, float64, *float32, *float64:
+			// ---
+		case bool, *bool:
+			// ---
+		case complex64, complex128, *complex64, *complex128:
+			// ---
+		case time.Time, *time.Time:
+			// ---
+		case TypeJSONb:
+			args[i] = &jsonb{Any: args[i]}
+		default:
+		}
 	}
-
-	return arg
 }