From bf86100fec9e2f852b317ac77fdda65e444da19e Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Fri, 19 Apr 2013 16:18:11 -0500 Subject: [PATCH] Rename Query to SelectRows --- conn.go | 2 +- conn_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conn.go b/conn.go index 3c350b5f..a124357b 100644 --- a/conn.go +++ b/conn.go @@ -128,7 +128,7 @@ func (c *Connection) Select(sql string, onDataRow func(*messageReader, []fieldDe 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) onDataRow := func(r *messageReader, fields []fieldDescription) error { rows = append(rows, c.rxDataRow(r, fields)) diff --git a/conn_test.go b/conn_test.go index 870bbd30..71bde223 100644 --- a/conn_test.go +++ b/conn_test.go @@ -38,12 +38,12 @@ func TestConnect(t *testing.T) { } 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" { 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" { t.Error("Did not connect as specified user (pgx_none)") } @@ -136,7 +136,7 @@ func TestSelect(t *testing.T) { func TestQuery(t *testing.T) { conn := getSharedConnection() - rows, err := conn.Query("select 'Jack' as name") + rows, err := conn.SelectRows("select 'Jack' as name") if err != nil { t.Fatal("Query failed") }