Accept a statement object in session.run

Author: oskarhane

lib/session.js

@@ -39,16 +39,22 @@ class Session {
 
   /**
    * Run Cypher statement
-   * @param {string} statement - Cypher statement to execute
-   * @param {Object} params - Map with params to use in statement
+   * Could be called with a statement object i.e.: {statement: "MATCH ...", parameters: {param: 1}}
+   * or with the statement and parameters as separate arguments.
+   * @param {mixed} statement - Cypher statement to execute
+   * @param {Object} parameters - Map with parameters to use in statement
    * @return {Result} - New Result
    */
-  run(statement, params) {
+  run(statement, parameters) {
+    if(typeof statement === 'object' && statement.text) {
+      parameters = statement.parameters || {};
+      statement = statement.text;
+    }
     let streamObserver = new StreamObserver();
-    this._conn.run( statement, params || {}, streamObserver );
+    this._conn.run( statement, parameters || {}, streamObserver );
     this._conn.pullAll( streamObserver );
     this._conn.sync();
-    return new Result( streamObserver, statement, params );
+    return new Result( streamObserver, statement, parameters );
   }
 
   /**

test/session.test.js

@@ -22,6 +22,26 @@ describe('session', function() {
     });
   });
 
+  it('should accept a statement object ', function(done) {
+    // Given
+    var driver = neo4j.driver("neo4j://localhost");
+    var statement = {text: "RETURN 1 = {param} AS a", parameters: {param: 1}};
+
+    // When & Then
+    var records = [];
+    driver.session().run( statement ).subscribe( {
+      onNext : function( record ) {
+        records.push( record );
+      },
+      onCompleted : function( ) {
+        expect( records.length ).toBe( 1 );
+        expect( records[0]['a'] ).toBe( true );
+        driver.close();
+        done();
+      }
+    });
+  });
+
   it('should expose basic run/then/then/then ', function(done) {
     // Given
     var driver = neo4j.driver("neo4j://localhost");