changed toString function

Author: DvirDukhan

graph.go

@@ -190,7 +190,7 @@ func (g *Graph) CallProcedure(procedure string, yield []string, args ...interfac
 
 	tmp := make([]string, 0, len(args))
 	for arg := range args {
-		tmp = append(tmp, ToString(arg).(string))
+		tmp = append(tmp, ToString(arg))
 	}
 	q += fmt.Sprintf("%s)", strings.Join(tmp, ","))
 

utils.go

@@ -4,42 +4,40 @@ import (
 	"crypto/rand"
 	"fmt"
 	"strings"
+	"strconv"
 )
 
 // go array to string is [1 2 3] for [1, 2, 3] array
 // cypher expects comma separated array
-func arrayToString(arr interface{}) interface{} {
-	v := arr.([]interface{})
-	var arrayLength = len(v)
+func arrayToString(arr []interface{}) string {
+	var arrayLength = len(arr)
 	strArray := []string{}
 	for i := 0; i < arrayLength; i++ {
-		strArray = append(strArray, fmt.Sprintf("%v", ToString(v[i])))
+		strArray = append(strArray, ToString(arr[i]))
 	}
-	return "[" + strings.Join(strArray[:], ",") + "]"
+	return "[" + strings.Join(strArray, ",") + "]"
 }
 
-func ToString(i interface{}) interface{} {
+func ToString(i interface{}) string {
 	if(i == nil) {
 		return "null"
 	}
 
 	switch i.(type) {
 	case string:
 		s := i.(string)
-		if len(s) == 0 {
-			return "\"\""
-		}
-		if s[0] != '"' {
-			s = "\"" + s
-		}
-		if s[len(s)-1] != '"' {
-			s += "\""
-		}
-		return s
-	case []interface {} :
-		return arrayToString(i)
+		return strconv.Quote(s)
+	case int:
+		return strconv.Itoa(i.(int))
+	case float64:
+		return strconv.FormatFloat(i.(float64), 'f', -1, 64)
+	case bool:
+		return strconv.FormatBool(i.(bool))
+	case []interface {}:
+		arr := i.([]interface{})
+		return arrayToString(arr)
 	default:
-		return i
+		panic("Unrecognized type to convert to string")
 	}
 }