Merge branch 'develop' of https://github.com/marklogic/node-client-api into develop

Author: kcoleman-marklogic

lib/query-builder.js

@@ -2258,11 +2258,16 @@ function bindDefault() {
  * Binds an empty query string to no documents or all documents.
  * @method
  * @memberof queryBuilder#
+ * @param {string} apply - a function from the all-results|no-results
+ * enumeration to control whether empty criteria matches all or no results
  * @returns {queryBuilder.EmptyBindingParam} the binding for an empty string
  * to pass to the {@link queryBuilder#parseBindings} function
  */
 function bindEmptyAs() {
-  return {'empty':{'apply': 'all-results'}};
+  if (arguments.length === 0) {
+    throw new Error('no name to bind as a constraint');
+  }
+  return {'empty':{'apply': arguments[0]}};
 }
 /**
  * The specification for a custom constraint parsing module as returned by

test-basic/documents-query.js

@@ -377,6 +377,20 @@ describe('document query', function(){
         done();
       }, done);
     });
+    it('should match an empty query', function(done){
+      db.query(
+        q.where(
+          q.parsedFrom('',
+            q.parseBindings(
+              q.bindEmptyAs('no-results')
+              ))
+          )
+        ).
+      result(function(response) {
+        response.length.should.equal(0);
+        done();
+      }, done);
+    });
   });
   describe('for a QBE where clause', function() {
     it('should match a value query', function(done){

test-basic/query-builder.js

@@ -1384,6 +1384,10 @@ describe('query-builder', function() {
         q.bindEmptyAs('all-results'),
         {empty:{'apply': 'all-results'}}
         );
+    assert.deepEqual(
+        q.bindEmptyAs('no-results'),
+        {empty:{'apply': 'no-results'}}
+        );
     assert.deepEqual(
         q.parseFunction('module1', q.bind('constraint1')),
         {custom:{parse: {