Rename Query to SelectRows

pgx-vs-pq
Jack Christensen 2013-04-19 16:18:11 -05:00
parent 9a5c299563
commit bf86100fec
2 changed files with 4 additions and 4 deletions

View File

@ -128,7 +128,7 @@ func (c *Connection) Select(sql string, onDataRow func(*messageReader, []fieldDe
panic("Unreachable") panic("Unreachable")
} }
func (c *Connection) Query(sql string) (rows []map[string]string, err error) { func (c *Connection) SelectRows(sql string) (rows []map[string]string, err error) {
rows = make([]map[string]string, 0, 8) rows = make([]map[string]string, 0, 8)
onDataRow := func(r *messageReader, fields []fieldDescription) error { onDataRow := func(r *messageReader, fields []fieldDescription) error {
rows = append(rows, c.rxDataRow(r, fields)) rows = append(rows, c.rxDataRow(r, fields))

View File

@ -38,12 +38,12 @@ func TestConnect(t *testing.T) {
} }
var rows []map[string]string var rows []map[string]string
rows, err = conn.Query("select current_database()") rows, err = conn.SelectRows("select current_database()")
if err != nil || rows[0]["current_database"] != "pgx_test" { if err != nil || rows[0]["current_database"] != "pgx_test" {
t.Error("Did not connect to specified database (pgx_text)") t.Error("Did not connect to specified database (pgx_text)")
} }
rows, err = conn.Query("select current_user") rows, err = conn.SelectRows("select current_user")
if err != nil || rows[0]["current_user"] != "pgx_none" { if err != nil || rows[0]["current_user"] != "pgx_none" {
t.Error("Did not connect as specified user (pgx_none)") t.Error("Did not connect as specified user (pgx_none)")
} }
@ -136,7 +136,7 @@ func TestSelect(t *testing.T) {
func TestQuery(t *testing.T) { func TestQuery(t *testing.T) {
conn := getSharedConnection() conn := getSharedConnection()
rows, err := conn.Query("select 'Jack' as name") rows, err := conn.SelectRows("select 'Jack' as name")
if err != nil { if err != nil {
t.Fatal("Query failed") t.Fatal("Query failed")
} }