code review 5483088: sql: add Rows.Columns

src/pkg/exp/sql/sql_test.go

 // Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package sql
 
 import (
         "reflect"
         "strings"
         "testing"
@@ skipping 54 matching lines @@
         if err != nil {
                 t.Fatalf("Err: %v", err)
         }
         want := []row{
                 {age: 1, name: "Alice"},
                 {age: 2, name: "Bob"},
                 {age: 3, name: "Chris"},
         }
         if !reflect.DeepEqual(got, want) {
                 t.Logf(" got: %#v\nwant: %#v", got, want)
+        }
+}
+
+func TestRowsColumns(t *testing.T) {
+        db := newTestDB(t, "people")
+        defer closeDB(t, db)
+        rows, err := db.Query("SELECT|people|age,name|")
+        if err != nil {
+                t.Fatalf("Query: %v", err)
+        }
+        cols, err := rows.Columns()
+        if err != nil {
+                t.Fatalf("Columns: %v", err)
+        }
+        want := []string{"age", "name"}
+        if !reflect.DeepEqual(cols, want) {
+                t.Errorf("got %#v; want %#v", cols, want)
         }
 }
 
 func TestQueryRow(t *testing.T) {
         db := newTestDB(t, "people")
         defer closeDB(t, db)
         var name string
         var age int
 
         err := db.QueryRow("SELECT|people|age,name|age=?", 3).Scan(&age)
@@ skipping 95 matching lines @@
                 wantErr string
         }
         execTests := []execTest{
                 // Okay:
                 {[]interface{}{"Brad", 31}, ""},
                 {[]interface{}{"Brad", int64(31)}, ""},
                 {[]interface{}{"Bob", "32"}, ""},
                 {[]interface{}{7, 9}, ""},
 
                 // Invalid conversions:
-                {[]interface{}{"Brad", int64(0xFFFFFFFF)}, "db: converting Exec argument #1's type: sql/driver: value 4294967295 overflows int32"},
-                {[]interface{}{"Brad", "strconv fail"}, "db: converting Exec argument #1's type: sql/driver: value \"strconv fail\" can't be converted to int32"},
+                {[]interface{}{"Brad", int64(0xFFFFFFFF)}, "sql: converting Exec argument #1's type: sql/driver: value 4294967295 overflows int32"},
+                {[]interface{}{"Brad", "strconv fail"}, "sql: converting Exec argument #1's type: sql/driver: value \"strconv fail\" can't be converted to int32"},
 
                 // Wrong number of args:
-                {[]interface{}{}, "db: expected 2 arguments, got 0"},
-                {[]interface{}{1, 2, 3}, "db: expected 2 arguments, got 3"},
+                {[]interface{}{}, "sql: expected 2 arguments, got 0"},
+                {[]interface{}{1, 2, 3}, "sql: expected 2 arguments, got 3"},
         }
         for n, et := range execTests {
                 _, err := stmt.Exec(et.args...)
                 errStr := ""
                 if err != nil {
                         errStr = err.Error()
                 }
                 if errStr != et.wantErr {
                         t.Errorf("stmt.Execute #%d: for %v, got error %q, want error %q",
                                 n, et.args, errStr, et.wantErr)
@@ skipping 28 matching lines @@
 func TestIssue2542Deadlock(t *testing.T) {
         db := newTestDB(t, "people")
         closeDB(t, db)
         for i := 0; i < 2; i++ {
                 _, err := db.Query("SELECT|people|age,name|")
                 if err == nil {
                         t.Fatalf("expected error")
                 }
         }
 }