From e4270300ef8b76cff7217fbe408b28adbf52fde6 Mon Sep 17 00:00:00 2001
From: Mae Kennedy <gh@co60.ca>
Date: Thu, 19 Oct 2023 17:24:06 +0000
Subject: [PATCH] Modify: existing panic in AddRow to give a hint to the issue

---
 rows.go      |  2 +-
 rows_test.go | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/rows.go b/rows.go
index 3e916ca..01ea811 100644
--- a/rows.go
+++ b/rows.go
@@ -166,7 +166,7 @@ func (r *Rows) RowError(row int, err error) *Rows {
 // of columns
 func (r *Rows) AddRow(values ...driver.Value) *Rows {
 	if len(values) != len(r.cols) {
-		panic("Expected number of values to match number of columns")
+		panic(fmt.Sprintf("Expected number of values to match number of columns: expected %d, actual %d", len(values), len(r.cols)))
 	}
 
 	row := make([]driver.Value, len(r.cols))
diff --git a/rows_test.go b/rows_test.go
index e2d57ec..80f1476 100644
--- a/rows_test.go
+++ b/rows_test.go
@@ -730,6 +730,31 @@ func TestAddRows(t *testing.T) {
 	// scanned id: 4 and title: Emily
 }
 
+func TestAddRowExpectPanic(t *testing.T) {
+	t.Parallel()
+
+	const expectedPanic = "Expected number of values to match number of columns: expected 1, actual 2"
+	values := []driver.Value{
+		"John",
+		"Jane",
+	}
+
+	defer func() {
+		if r := recover(); r != nil {
+			if r != expectedPanic {
+				t.Fatalf("panic message did not match expected: expected '%s', actual '%s'", r, expectedPanic)
+			}
+
+			return
+		}
+		t.Fatalf("expected panic: %s", expectedPanic)
+	}()
+
+	rows := NewRows([]string{"id", "name"})
+	// Note missing spread "..."
+	rows.AddRow(values)
+}
+
 func ExampleRows_AddRows() {
 	db, mock, err := New()
 	if err != nil {