From 678ce976357ef6a60a603d0b0f9d661f8db353c2 Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Wed, 4 Oct 2017 17:26:14 +0200 Subject: [PATCH] database/sql: fix unreachable code in ColumnTypes test Before this change the ct == 0 check could never be true. Moreover the values were not properly indirected. Change-Id: Ice47e36e3492babc4b47d2f9099e8772be231c96 Reviewed-on: https://go-review.googlesource.com/68130 Reviewed-by: Daniel Theophanes Run-TryBot: Daniel Theophanes TryBot-Result: Gobot Gobot --- src/database/sql/sql_test.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/database/sql/sql_test.go b/src/database/sql/sql_test.go index fe7c3278c7..046d95aff4 100644 --- a/src/database/sql/sql_test.go +++ b/src/database/sql/sql_test.go @@ -726,15 +726,15 @@ func TestRowsColumnTypes(t *testing.T) { if err != nil { t.Fatalf("failed to scan values in %v", err) } - ct++ - if ct == 0 { - if values[0].(string) != "Bob" { - t.Errorf("Expected Bob, got %v", values[0]) + if ct == 1 { + if age := *values[0].(*int32); age != 2 { + t.Errorf("Expected 2, got %v", age) } - if values[1].(int) != 2 { - t.Errorf("Expected 2, got %v", values[1]) + if name := *values[1].(*string); name != "Bob" { + t.Errorf("Expected Bob, got %v", name) } } + ct++ } if ct != 3 { t.Errorf("expected 3 rows, got %d", ct)