Merge pull request #21 from RedisGraph/parameters_support

added parameters support

Author: swilly22

client_test.go

@@ -256,3 +256,19 @@ func TestPath(t *testing.T) {
 	assert.Equal(t, d.GetProperty("population"), 126800000, "Unexpected property value.")
 
 }
+
+func TestParameterizedQuery(t *testing.T) {
+	createGraph()
+	params := []interface{}{1, 2.3, "str", true, false, nil, []interface {}{0, 1, 2}}
+	q := "RETURN $param"
+	params_map := make(map[string]interface{})
+	for index, param := range params {
+		params_map["param"] = param
+		res, err := graph.ParameterizedQuery(q, params_map);
+		if err != nil {
+			t.Error(err)
+		}
+		res.Next()
+		assert.Equal(t, res.Record().GetByIndex(0), params[index], "Unexpected parameter value")
+	}
+}

graph.go

@@ -99,6 +99,7 @@ func (g *Graph) Commit() (*QueryResult, error) {
 
 // Query executes a query against the graph.
 func (g *Graph) Query(q string) (*QueryResult, error) {
+	
 	r, err := g.Conn.Do("GRAPH.QUERY", g.Id, q, "--compact")
 	if err != nil {
 		return nil, err
@@ -107,6 +108,13 @@ func (g *Graph) Query(q string) (*QueryResult, error) {
 	return QueryResultNew(g, r)
 }
 
+func (g *Graph) ParameterizedQuery(q string, params map[string]interface{}) (*QueryResult, error) {
+	if(params != nil){
+		q = BuildParamsHeader(params) + q
+	}
+	return g.Query(q);
+}
+
 // Merge pattern
 func (g *Graph) Merge(p string) (*QueryResult, error) {
 	q := fmt.Sprintf("MERGE %s", p)

utils.go

@@ -20,6 +20,9 @@ func arrayToString(arr interface{}) interface{} {
 }
 
 func ToString(i interface{}) interface{} {
+	if(i == nil) {
+		return "null"
+	}
 	v := reflect.ValueOf(i)
 	switch reflect.TypeOf(i).Kind() {
 	case reflect.String:
@@ -67,3 +70,11 @@ func RandomString(n int) string {
 	}
 	return string(output)
 }
+
+func BuildParamsHeader(params map[string]interface{}) (string) {
+	header := "CYPHER "
+	for key, value := range params {
+		header += fmt.Sprintf("%s=%v ", key, ToString(value))
+	}
+	return header
+}