Merge pull request #101 from neo-technology/1.1-merge-schema-proc

Reduce number of queries to a single one for :schema

Author: pe4cey

app/scripts/services/Bolt.coffee

@@ -198,15 +198,15 @@ angular.module('neo4jApp.services')
         else
           indexString = "Indexes"
           for index in indexes
-            indexString += "\n  #{index.get('description').replace('INDEX','')} #{index.get('state').toUpperCase()}"
-            if index.get("type") == "node_unique_property"
+            indexString += "\n  #{index.description.replace('INDEX','')} #{index.state.toUpperCase()}"
+            if index.type == "node_unique_property"
               indexString += " (for uniqueness constraint)"
         if (constraints.length == 0)
           constraintsString = "No constraints"
         else
           constraintsString = "Constraints"
           for constraint in constraints
-            constraintsString += "\n  #{constraint.get('description').replace('CONSTRAINT','')}"
+            constraintsString += "\n  #{constraint.description.replace('CONSTRAINT','')}"
         return "#{indexString}\n\n#{constraintsString}\n"
 
       boltResultToRESTResult = (result) ->

app/scripts/services/UtilityBolt.coffee

@@ -31,12 +31,18 @@ angular.module('neo4jApp.services')
         clearConnection: -> Bolt.clearConnection()
         getSchema: ->
           q = $q.defer()
-          $q.all([
-            Bolt.callProcedure("db.indexes"),
-            Bolt.callProcedure("db.constraints"),
-          ]).then((data) ->
-            q.resolve(Bolt.constructSchemaResult data[0], data[1])
-          )
+          Bolt.boltTransaction(
+            "CALL db.indexes() YIELD description, state, type " +
+            "WITH COLLECT({description: description, state: state, type: type}) AS indexes " +
+            "RETURN 'indexes' AS name, indexes AS items " +
+            "UNION " +
+            "CALL db.constraints() YIELD description " +
+            "WITH COLLECT({description: description}) AS constraints " + 
+            "RETURN 'constraints' AS name, constraints AS items"
+          ).promise.then((result) ->
+            return q.resolve(Bolt.constructSchemaResult([], [])) unless result.records.length
+            q.resolve(Bolt.constructSchemaResult result.records[0].get('items'), result.records[1].get('items'))
+          ).catch( (e) -> q.reject Bolt.constructResult e)
           q.promise
 
         getMeta: ->