backport fix to 8.11.6

cpoole · Oct 21, 2022 · 957d362 · 957d362
1 parent 52af8ba
commit 957d362
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/internal/hscan/hscan.go b/internal/hscan/hscan.go
@@ -77,6 +77,8 @@ func Scan(dst interface{}, keys []interface{}, vals []interface{}) error {
 		return err
 	}
 
+	scanErrors := []error{}
+
 	// Iterate through the (key, value) sequence.
 	for i := 0; i < len(vals); i++ {
 		key, ok := keys[i].(string)
@@ -90,10 +92,14 @@ func Scan(dst interface{}, keys []interface{}, vals []interface{}) error {
 		}
 
 		if err := strct.Scan(key, val); err != nil {
-			return err
+			scanErrors = append(scanErrors, err)
 		}
 	}
 
+	if len(scanErrors) > 0 {
+		return fmt.Errorf("scan errors: %v", scanErrors)
+	}
+
 	return nil
 }
 

diff --git a/internal/hscan/hscan_test.go b/internal/hscan/hscan_test.go
@@ -175,4 +175,22 @@ var _ = Describe("Scan", func() {
 		Expect(Scan(&d, i{"bool"}, i{""})).To(HaveOccurred())
 		Expect(Scan(&d, i{"bool"}, i{"123"})).To(HaveOccurred())
 	})
+
+	It("does not stop scanning on first failure", func() {
+		var d data
+
+		keys := i{"bool", "string", "int", "uint8"}
+		vals := i{"-1", "foobar", "123", "12345"}
+
+		err := Scan(&d, keys, vals)
+		Expect(err).To(HaveOccurred())
+
+		Expect(d).To(Equal(data{
+			Bool:   false,
+			String: "foobar",
+			Int:    123,
+			Uint8:  0,
+		}))
+
+	})
 })