From 8b7c3507fe0c8f6e921ee2de2c170ef93eeb7275 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Sun, 24 Oct 2021 13:14:37 +0200
Subject: upstep bun to v1.0.14 (#291)

---
 vendor/github.com/uptrace/bun/schema/scan.go | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'vendor/github.com/uptrace/bun/schema/scan.go')

diff --git a/vendor/github.com/uptrace/bun/schema/scan.go b/vendor/github.com/uptrace/bun/schema/scan.go
index 60ad27d53..30abcfc35 100644
--- a/vendor/github.com/uptrace/bun/schema/scan.go
+++ b/vendor/github.com/uptrace/bun/schema/scan.go
@@ -8,6 +8,7 @@ import (
 	"reflect"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/vmihailenco/msgpack/v5"
@@ -52,6 +53,8 @@ func init() {
 	}
 }
 
+var scannerMap sync.Map
+
 func FieldScanner(dialect Dialect, field *Field) ScannerFunc {
 	if field.Tag.HasOption("msgpack") {
 		return scanMsgpack
@@ -65,10 +68,23 @@ func FieldScanner(dialect Dialect, field *Field) ScannerFunc {
 			return scanJSONIntoInterface
 		}
 	}
-	return dialect.Scanner(field.StructField.Type)
+	return Scanner(field.StructField.Type)
 }
 
 func Scanner(typ reflect.Type) ScannerFunc {
+	if v, ok := scannerMap.Load(typ); ok {
+		return v.(ScannerFunc)
+	}
+
+	fn := scanner(typ)
+
+	if v, ok := scannerMap.LoadOrStore(typ, fn); ok {
+		return v.(ScannerFunc)
+	}
+	return fn
+}
+
+func scanner(typ reflect.Type) ScannerFunc {
 	kind := typ.Kind()
 
 	if kind == reflect.Ptr {
-- 
cgit v1.2.3