Merge branch 'master' into develop

Author: anu3990

CHANGELOG.md

@@ -1,5 +1,6 @@
 # CHANGELOG
 
+
 ## 3.2.0
 #### New Functionality
 
@@ -13,6 +14,7 @@
     https://github.com/advisories/GHSA-7fh5-64p2-3v2j
 
 
+
 ## 3.1.0
 #### New Functionality
 

README.md

@@ -53,6 +53,7 @@ const db = marklogic.createDatabaseClient({
     apiKey:   'changeme',
     host:     'example.beta.marklogic.com',
     authType: 'cloud',
+
     // basePath is optional.
     basePath: '/marklogic/test',
     // accessTokenDuration (in seconds) is optional and can be used to customize the expiration of the access token.

lib/marklogic.js

@@ -913,4 +913,4 @@ module.exports = {
      * @param MarkLogicClient
      */
     releaseClient: releaseClient
-};
+};

lib/rows.js

@@ -205,6 +205,40 @@ function queryRowsOperationImpl(self, builtPlan, streamType, options, bindingArg
     return operation;
   }
 
+  if (bindingArg) {
+    const keys = Object.keys(bindingArg);
+    const bindingKey = keys[0];
+    const attachments = keys[1];
+    const metadata = keys[2];
+    const query = JSON.stringify(builtPlan.export());
+    const multipartBoundary = mlutil.multipartBoundary;
+    const endpoint = '/v1/rows';
+
+    requestOptions.headers = {
+      'Content-Type': 'multipart/form-data; boundary=' + multipartBoundary,
+      Accept: 'application/json'
+    };
+    requestOptions.path = mlutil.databaseParam(connectionParams, endpoint, '?');
+
+    const operation = new Operation(
+        'binding arguments ' + endpoint, self.client, requestOptions, 'multipart', 'single'
+    );
+
+    operation.headers = {
+      'Content-Type': 'multipart/form-data; boundary=' + multipartBoundary,
+    };
+
+    operation.bindingParam = {
+      [bindingKey]: bindingArg[bindingKey],
+      query: query,
+      key: bindingKey,
+      attachments: bindingArg[attachments],
+      metadata: bindingArg[metadata]
+    };
+
+    return operation;
+  }
+
   let acceptHeader = null;
   let responseType = null;
   switch (format) {

package.json

@@ -84,4 +84,4 @@
     "jsdoc": "4.0.0",
     "sanitize-html": "2.11.0"
   }
-}
+}

test-basic/bindingFromParam.js

@@ -639,4 +639,4 @@ describe('optic-update fromParam tests', function(){
     });
 
 });
-});
+});

test-basic/lockForUpdate-test.js

@@ -123,4 +123,4 @@ describe('optic-update lockForUpdate tests', function() {
             }).catch(e => done(e));
         });
     });
-});
+});

test-basic/optic-fromDocUris.js

@@ -117,4 +117,4 @@ function checkResult(done) {
     }
     result.clear();
     done();
-}
+}

test-basic/optic-update-execute.js

@@ -131,4 +131,4 @@ function verifyDocs(done){
         })
         .then(()=> done())
         .catch(err=> done(err));
-}
+}

test-basic/rows-graphQl.js

@@ -73,4 +73,4 @@ this.timeout(6000);
         marklogic.releaseClient(db);
         done();
     });
-});
+});