Merge pull request #177 from oskarhane/tweak-auto-complete

Tweak 'auto-complete' query

Author: pe4cey

app/scripts/services/CypherTransactionBolt.coffee

@@ -93,9 +93,9 @@ angular.module('neo4jApp.services')
           q.resolve()
           q.promise
 
-        commit: (query) ->
+        commit: (query, params = null) ->
           that = @
-          statements = if query then [{statement:query}] else []
+          statements = if query then [{statement:query, parameters: params}] else []
           UDC.increment('cypher_attempts')
           q = $q.defer()
           {tx, promise, session} = Bolt.transaction(statements, @session, @tx)

app/scripts/services/CypherTransactionREST.coffee

@@ -108,8 +108,8 @@ angular.module('neo4jApp.services')
           @_requestDone parsed_result
           parsed_result
 
-        commit: (query) ->
-          statements = if query then [{statement:query}] else []
+        commit: (query, params = null) ->
+          statements = if query then [{statement:query, parameters: params}] else []
           UDC.increment('cypher_attempts')
           timer = Timer.start()
           if @id
@@ -172,4 +172,4 @@ angular.module('neo4jApp.services')
           q.promise
 
       return CypherTransactionREST
-  ]
+  ]

app/scripts/services/GraphExplorer.coffee

@@ -88,14 +88,14 @@ angular.module('neo4jApp.services')
           if newNodes.length is 0
             q.resolve()
             return q.promise
-          newNodeIds = newNodes.map((node) -> node.id)
+          newNodeIds = newNodes.map((node) -> parseInt(node.id))
           existingNodeIds = existingNodes.map((node) -> node.id).concat(newNodeIds)
           Cypher.transaction()
           .commit("""
-            MATCH (a)-[r]-(b) WHERE id(a) IN[#{existingNodeIds.join(',')}]
-            AND id(b) IN[#{newNodeIds.join(',')}]
+            MATCH (a)-[r]->(b) WHERE id(a) IN {node_ids}
+            AND id(b) IN {node_ids}
             RETURN r;"""
-          )
+          , {node_ids: newNodeIds})
           .then (result) =>
             graph.addInternalRelationships(result.relationships.map(CypherGraphModel.convertRelationship(graph)))
             q.resolve()