From 688ebe8167e40c05366787dd84de74a22ecd65f0 Mon Sep 17 00:00:00 2001
From: Chris Goller <goller@gmail.com>
Date: Wed, 21 Sep 2016 09:51:17 -0700
Subject: [PATCH] Update database and rp to use default parameters

---
 influx/influx.go      | 12 +-----------
 influx/influx_test.go | 11 +++++++++--
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/influx/influx.go b/influx/influx.go
index 05d24c6fd..b1bba5928 100644
--- a/influx/influx.go
+++ b/influx/influx.go
@@ -34,17 +34,7 @@ func NewClient(host string) (*Client, error) {
 // include both the database and retention policy. In-flight requests can be
 // cancelled using the provided context.
 func (c *Client) Query(ctx context.Context, query mrfusion.Query) (mrfusion.Response, error) {
-	db := ""
-	if len(query.Database) > 0 {
-		db = query.Database
-	}
-
-	rp := ""
-	if len(query.RP) > 0 {
-		rp = query.RP
-	}
-
-	q := ixClient.NewQuery(query.Command, db, rp)
+	q := ixClient.NewQuery(query.Command, query.Database, query.RP)
 	resps := make(chan (response))
 	go func() {
 		resp, err := c.ix.Query(q)
diff --git a/influx/influx_test.go b/influx/influx_test.go
index 7f16d4e94..9fed7d28c 100644
--- a/influx/influx_test.go
+++ b/influx/influx_test.go
@@ -38,7 +38,10 @@ func Test_Influx_MakesRequestsToQueryEndpoint(t *testing.T) {
 		t.Fatal("Unexpected error initializing client: err:", err)
 	}
 
-	_, err = series.Query(context.Background(), "show databases")
+	query := mrfusion.Query{
+		Command: "show databases",
+	}
+	_, err = series.Query(context.Background(), query)
 	if err != nil {
 		t.Fatal("Expected no error but was", err)
 	}
@@ -68,7 +71,11 @@ func Test_Influx_CancelsInFlightRequests(t *testing.T) {
 
 	errs := make(chan (error))
 	go func() {
-		_, err := series.Query(ctx, "show databases")
+		query := mrfusion.Query{
+			Command: "show databases",
+		}
+
+		_, err := series.Query(ctx, query)
 		errs <- err
 	}()