1 files changed, 9 insertions, 73 deletions

diff --git a/vendor/github.com/uptrace/bun/dialect/pgdialect/dialect.go b/vendor/github.com/uptrace/bun/dialect/pgdialect/dialect.go
index 837c2d8ab..bac38972f 100644
--- a/vendor/github.com/uptrace/bun/dialect/pgdialect/dialect.go
+++ b/vendor/github.com/uptrace/bun/dialect/pgdialect/dialect.go
@@ -2,10 +2,7 @@ package pgdialect
 
 import (
 	"database/sql"
-	"reflect"
 	"strconv"
-	"sync"
-	"time"
 
 	"github.com/uptrace/bun/dialect"
 	"github.com/uptrace/bun/dialect/feature"
@@ -13,12 +10,13 @@ import (
 	"github.com/uptrace/bun/schema"
 )
 
+var pgDialect = New()
+
 type Dialect struct {
+	schema.BaseDialect
+
 	tables   *schema.Tables
 	features feature.Feature
-
-	appenderMap sync.Map
-	scannerMap  sync.Map
 }
 
 func New() *Dialect {
@@ -71,7 +69,7 @@ func (d *Dialect) onField(field *schema.Field) {
 	}
 
 	if field.Tag.HasOption("array") {
-		field.Append = arrayAppender(field.StructField.Type)
+		field.Append = d.arrayAppender(field.StructField.Type)
 		field.Scan = arrayScanner(field.StructField.Type)
 	}
 }
@@ -80,72 +78,10 @@ func (d *Dialect) IdentQuote() byte {
 	return '"'
 }
 
-func (d *Dialect) Append(fmter schema.Formatter, b []byte, v interface{}) []byte {
-	switch v := v.(type) {
-	case nil:
-		return dialect.AppendNull(b)
-	case bool:
-		return dialect.AppendBool(b, v)
-	case int:
-		return strconv.AppendInt(b, int64(v), 10)
-	case int32:
-		return strconv.AppendInt(b, int64(v), 10)
-	case int64:
-		return strconv.AppendInt(b, v, 10)
-	case uint:
-		return strconv.AppendInt(b, int64(v), 10)
-	case uint32:
-		return strconv.AppendInt(b, int64(v), 10)
-	case uint64:
-		return strconv.AppendInt(b, int64(v), 10)
-	case float32:
-		return dialect.AppendFloat32(b, v)
-	case float64:
-		return dialect.AppendFloat64(b, v)
-	case string:
-		return dialect.AppendString(b, v)
-	case time.Time:
-		return dialect.AppendTime(b, v)
-	case []byte:
-		return dialect.AppendBytes(b, v)
-	case schema.QueryAppender:
-		return schema.AppendQueryAppender(fmter, b, v)
-	default:
-		vv := reflect.ValueOf(v)
-		if vv.Kind() == reflect.Ptr && vv.IsNil() {
-			return dialect.AppendNull(b)
-		}
-		appender := d.Appender(vv.Type())
-		return appender(fmter, b, vv)
-	}
+func (d *Dialect) AppendUint32(b []byte, n uint32) []byte {
+	return strconv.AppendInt(b, int64(int32(n)), 10)
 }
 
-func (d *Dialect) Appender(typ reflect.Type) schema.AppenderFunc {
-	if v, ok := d.appenderMap.Load(typ); ok {
-		return v.(schema.AppenderFunc)
-	}
-
-	fn := schema.Appender(typ, customAppender)
-
-	if v, ok := d.appenderMap.LoadOrStore(typ, fn); ok {
-		return v.(schema.AppenderFunc)
-	}
-	return fn
-}
-
-func (d *Dialect) FieldAppender(field *schema.Field) schema.AppenderFunc {
-	return schema.FieldAppender(d, field)
-}
-
-func (d *Dialect) Scanner(typ reflect.Type) schema.ScannerFunc {
-	if v, ok := d.scannerMap.Load(typ); ok {
-		return v.(schema.ScannerFunc)
-	}
-
-	fn := scanner(typ)
-
-	if v, ok := d.scannerMap.LoadOrStore(typ, fn); ok {
-		return v.(schema.ScannerFunc)
-	}
-	return fn
+func (d *Dialect) AppendUint64(b []byte, n uint64) []byte {
+	return strconv.AppendInt(b, int64(n), 10)
 }