Skip to content

Commit 5c2beb6

Browse files
author
DvirDukhan
committed
fixed PR
1 parent c1c8bc6 commit 5c2beb6

File tree

2 files changed

+29
-26
lines changed

2 files changed

+29
-26
lines changed

client_test.go

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -120,26 +120,16 @@ func TestArray(t *testing.T) {
120120
graph.Flush()
121121
graph.Query("MATCH (n) DELETE n")
122122

123-
a := NodeNew("Person", "a", nil)
124-
b := NodeNew("Person", "b", nil)
125-
126-
a.SetProperty("name", "a")
127-
a.SetProperty("age", 32)
128-
a.SetProperty("array", []interface{}{0, 1, 2})
129-
130-
b.SetProperty("name", "b")
131-
b.SetProperty("age", 30)
132-
b.SetProperty("array", []interface{}{3, 4, 5})
133-
134-
q := "CREATE (:person{name:'a',age:32,array:[0,1,2]}), CREATE (:person{name:'b',age:30,array:[3,4,5]})"
123+
q := "CREATE (:person{name:'a',age:32,array:[0,1,2]})"
135124
res, err := graph.Query(q)
136125
if err != nil {
137126
t.Error(err)
138127
}
139128

140-
_, err = graph.Commit()
129+
q = "CREATE (:person{name:'b',age:30,array:[3,4,5]})"
130+
res, err = graph.Query(q)
141131
if err != nil {
142-
panic(err)
132+
t.Error(err)
143133
}
144134

145135
q = "WITH [0,1,2] as x return x"
@@ -171,6 +161,19 @@ func TestArray(t *testing.T) {
171161

172162
assert.Equal(t, 1, len(res.results), "expecting 1 results record")
173163

164+
a := NodeNew("person", "", nil)
165+
b := NodeNew("person", "", nil)
166+
167+
a.SetProperty("name", "a")
168+
a.SetProperty("age", 32)
169+
a.SetProperty("array", []interface{}{0, 1, 2})
170+
a.ID = 3
171+
172+
b.SetProperty("name", "b")
173+
b.SetProperty("age", 30)
174+
b.SetProperty("array", []interface{}{3, 4, 5})
175+
b.ID = 2
176+
174177
assert.ElementsMatchf(t, []interface{}{a, b}, res.results[0][0], "arrays not equal")
175178

176179
}

node.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,30 @@ type Node struct {
1111
Label string
1212
Alias string
1313
Properties map[string]interface{}
14-
graph *Graph
14+
graph *Graph
1515
}
1616

1717
func NodeNew(label string, alias string, properties map[string]interface{}) *Node {
1818

19-
p := properties
19+
p := properties
2020
if p == nil {
2121
p = make(map[string]interface{})
2222
}
2323

24-
return &Node{
25-
Label: label,
26-
Alias: alias,
27-
Properties: p,
28-
graph: nil,
29-
}
24+
return &Node{
25+
Label: label,
26+
Alias: alias,
27+
Properties: p,
28+
graph: nil,
29+
}
3030
}
3131

3232
func (n *Node) SetProperty(key string, value interface{}) {
3333
n.Properties[key] = value
3434
}
3535

3636
func (n Node) GetProperty(key string) interface{} {
37-
v,_ := n.Properties[key]
37+
v, _ := n.Properties[key]
3838
return v
3939
}
4040

@@ -45,7 +45,7 @@ func (n Node) String() string {
4545

4646
p := make([]string, 0, len(n.Properties))
4747
for k, v := range n.Properties {
48-
p = append(p, fmt.Sprintf("%s:%v", k, QuoteString(v)))
48+
p = append(p, fmt.Sprintf("%s:%v", k, ToString(v)))
4949
}
5050

5151
s := fmt.Sprintf("{%s}", strings.Join(p, ","))
@@ -55,7 +55,7 @@ func (n Node) String() string {
5555
// String makes Node satisfy the Stringer interface.
5656
func (n Node) Encode() string {
5757
s := []string{"("}
58-
58+
5959
if n.Alias != "" {
6060
s = append(s, n.Alias)
6161
}
@@ -67,7 +67,7 @@ func (n Node) Encode() string {
6767
if len(n.Properties) > 0 {
6868
p := make([]string, 0, len(n.Properties))
6969
for k, v := range n.Properties {
70-
p = append(p, fmt.Sprintf("%s:%v", k, QuoteString(v)))
70+
p = append(p, fmt.Sprintf("%s:%v", k, ToString(v)))
7171
}
7272

7373
s = append(s, "{")

0 commit comments

Comments
 (0)