Unit tests for redaction and generate-view.

Author: anu3990

lib/plan-builder.js

@@ -81,8 +81,11 @@ bldrgen.AccessPlan.prototype.col = function(...args) {
 class Builder extends bldrgen.PlanBuilder {
   constructor() {
     super({});
-    bldrgen.rdt = (bldrgen.rdt !== void 0) ? bldrgen.rdt : new RdtExpr();
+    if(this.rdt === void 0) {
+      this.rdt = new RdtExpr();
+    }
   }
+
   prefixer(base) {
     const self = this;
 
@@ -115,114 +118,96 @@ class RdtExpr {
    * Controls features such as the length and type of the generated value.
    * @method planBuilder#maskDeterministic
    * @since 2.7.0
-   * @param { PlanColumnName } [column] - The name of the column to be defined.
-   *  This can be either a string or the return value from PlanBuilder.col(), PlanBuilder.viewCol() or PlanBuilder.schemaCol().
-   * @param { Item } [options] - An object with name-value pairs specific to the redaction method.
+   * @param args - Options for redacting.
    * @returns { planBuilder.PlanExprCol }
    */
-  maskDeterministic(column, options) {
-    return redactimpl('maskDeterministic', 'mask-deterministic', column, options);
+  maskDeterministic(...args) {
+    return redactimpl('maskDeterministic', 'mask-deterministic',1,args);
   }
   /** This function replaces values with random text. The masking value can vary across repeated application to the same input value.
    * Controls the length of the generated value and type of replacement text (numbers or letters).
    * @method planBuilder#maskRandom
    * @since 2.7.0
-   * @param { PlanColumnName } [column] - The name of the column to be defined.
-   *  This can be either a string or the return value from PlanBuilder.col(), PlanBuilder.viewCol() or PlanBuilder.schemaCol().
-   * @param { Item } [options] - An object with name-value pairs specific to the redaction method.
+   * @param args - Options for redacting.
    * @returns { planBuilder.PlanExprCol }
    */
-  maskRandom(column, options) {
-    return redactimpl('maskRandom', 'mask-random', column, options);
+  maskRandom(...args) {
+    return redactimpl('maskRandom', 'mask-random', 1, args);
   }
   /** This function redacts data that matches the pattern of a dateTime value. Controls the expected input format and the masking dateTime format.
    * @method planBuilder#redactDatetime
    * @since 2.7.0
-   * @param { PlanColumnName } [column] - The name of the column to be defined.
-   *  This can be either a string or the return value from PlanBuilder.col(), PlanBuilder.viewCol() or PlanBuilder.schemaCol().
-   * @param { Item } [options] - An object with name-value pairs specific to the redaction method.
+   * @param args - Options for redacting.
    * @returns { planBuilder.PlanExprCol }
    */
-  redactDatetime(column, options) {
-    return redactimpl('redactDatetime', 'redact-datetime', column, options);
+  redactDatetime(...args) {
+    return redactimpl('redactDatetime', 'redact-datetime',2, args);
   }
   /** This function redacts data that matches the pattern of an email address.
    * Controls whether to mask the entire address, only the username, or only the domain name.
    * @method planBuilder#redactEmail
    * @since 2.7.0
-   * @param { PlanColumnName } [column] - The name of the column to be defined.
-   *  This can be either a string or the return value from PlanBuilder.col(), PlanBuilder.viewCol() or PlanBuilder.schemaCol().
-   * @param { Item } [options] - An object with name-value pairs specific to the redaction method.
+   * @param args - Options for redacting.
    * @returns { planBuilder.PlanExprCol }
    */
-  redactEmail(column, options) {
-    return redactimpl('redactEmail', 'redact-email', column, options);
+  redactEmail(...args) {
+    return redactimpl('redactEmail', 'redact-email', 1, args);
   }
   /** This function redacts data that matches the pattern of an IPv4 address. Controls what character to use as a masking character.
    * @method planBuilder#redactIpv4
    * @since 2.7.0
-   * @param { PlanColumnName } [column] - The name of the column to be defined.
-   *  This can be either a string or the return value from PlanBuilder.col(), PlanBuilder.viewCol() or PlanBuilder.schemaCol().
-   * @param { Item } [options] - An object with name-value pairs specific to the redaction method.
+   * @param args - Options for redacting.
    * @returns { planBuilder.PlanExprCol }
    */
-  redactIpv4(column, options) {
-    return redactimpl('redactIpv4', 'redact-ipv4', column, options);
+  redactIpv4(...args) {
+    return redactimpl('redactIpv4', 'redact-ipv4', 1, args);
   }
   /** This function replaces values with random numbers. Controls the data type, range, and format of the masking values.
    * @method planBuilder#redactNumber
    * @since 2.7.0
-   * @param { PlanColumnName } [column] - The name of the column to be defined.
-   *  This can be either a string or the return value from PlanBuilder.col(), PlanBuilder.viewCol() or PlanBuilder.schemaCol().
-   * @param { Item } [options] - An object with name-value pairs specific to the redaction method.
+   * @param args - Options for redacting.
    * @returns { planBuilder.PlanExprCol }
    */
-  redactNumber(column, options) {
-    return redactimpl('redactNumber', 'redact-number', column, options);
+  redactNumber(...args) {
+    return redactimpl('redactNumber', 'redact-number', 1, args);
   }
   /** This function redacts data that matches a given regular expression. You must specify the regular expression and the masking text.
    * @method planBuilder#redactRegex
    * @since 2.7.0
-   * @param { PlanColumnName } [column] - The name of the column to be defined.
-   *  This can be either a string or the return value from PlanBuilder.col(), PlanBuilder.viewCol() or PlanBuilder.schemaCol().
-   * @param { Item } [options] - An object with name-value pairs specific to the redaction method.
+   * @param args - Options for redacting.
    * @returns { planBuilder.PlanExprCol }
    */
-  redactRegex(column, options) {
-    return redactimpl('redactRegex', 'redact-regex', column, options);
+  redactRegex(...args) {
+    return redactimpl('redactRegex', 'redact-regex', 2, args);
   }
   /** This function redacts data that matches the pattern of a US Social Security Number (SSN).
    * Controls whether or not to preserve the last 4 digits and what character to use as a masking character.
    * @method planBuilder#redactUsSsn
    * @since 2.7.0
-   * @param { PlanColumnName } [column] - The name of the column to be defined.
-   *  This can be either a string or the return value from PlanBuilder.col(), PlanBuilder.viewCol() or PlanBuilder.schemaCol().
-   * @param { Item } [options] - An object with name-value pairs specific to the redaction method.
+   * @param args - Options for redacting.
    * @returns { planBuilder.PlanExprCol }
    */
-  redactUsSsn(column, options) {
-    return redactimpl('redactUsSsn', 'redact-us-ssn', column, options);
+  redactUsSsn(...args) {
+    return redactimpl('redactUsSsn', 'redact-us-ssn', 1, args);
   }
   /** This function redacts data that matches the pattern of a US telephone number.
    * Controls whether or not to preserve the last 4 digits and what character to use as a masking character.
    * @method planBuilder#redactUsPhone
    * @since 2.7.0
-   * @param { PlanColumnName } [column] - The name of the column to be defined.
-   *  This can be either a string or the return value from PlanBuilder.col(), PlanBuilder.viewCol() or PlanBuilder.schemaCol().
-   * @param { Item } [options] - An object with name-value pairs specific to the redaction method.
+   * @param args - Options for redacting.
    * @returns { planBuilder.PlanExprCol }
    */
-  redactUsPhone(column, options) {
-    return redactimpl('redactUsPhone', 'redact-us-phone', column, options);
+  redactUsPhone(...args) {
+    return redactimpl('redactUsPhone', 'redact-us-phone', 1, args);
   }
 }
 
-function redactimpl(clientName, serverName, column, options) {
-  const namer = bldrbase.getNamer(options, 'column');
+function redactimpl(clientName, serverName, minArity, args) {
+  const namer = bldrbase.getNamer(args, 'column');
   const paramdefs = [['column', [bldrgen.PlanColumn, types.XsString], true, false], ['option', [], false, false]];
   const checkedArgs = (namer !== null) ?
-      bldrbase.makeNamedArgs(namer, `PlanBuilder.${clientName}`, 2, new Set(['column', 'expression']), paramdefs, options) :
-      bldrbase.makePositionalArgs(`PlanBuilder.${clientName}`, 2, false, paramdefs, options);
+      bldrbase.makeNamedArgs(namer, `PlanBuilder.${clientName}`, minArity, new Set(['column', 'options']), paramdefs, args) :
+      bldrbase.makePositionalArgs(`PlanBuilder.${clientName}`, minArity, false, paramdefs, args);
   return new bldrgen.PlanExprCol('ordt', serverName, checkedArgs);
 }
 

lib/rows.js

@@ -378,7 +378,9 @@ Rows.prototype.generateView = function generateViewRows(builtPlan, schema, view,
     'Accept': acceptHeader
   };
 
-  requestOptions.path = '/v1/rows?output=generateView';
+  const endpoint = '/v1/rows?output=generateView&schemaName='+schema+'&viewName='+view;
+  requestOptions.path    = mlutil.databaseParam(connectionParams, endpoint, '&');
+
 
   const operation = new Operation(
       'generate view', this.client, requestOptions, 'single', 'single');

test-basic/endpoint-caller.js

@@ -35,8 +35,7 @@ describe('Endpoint caller', function() {
                 done();
             })
             .catch(err => {
-                expect.fail(err.toString());
-                done();
+                done(err);
             });
     });
 
@@ -53,8 +52,7 @@ describe('Endpoint caller', function() {
                 done();
             })
             .catch(err => {
-                expect.fail(err.toString());
-                done();
+                done(err);
             });
     });
 
@@ -73,8 +71,7 @@ describe('Endpoint caller', function() {
                 done();
             })
             .catch(err => {
-                expect.fail(err.toString());
-                done();
+                done(err);
             });
     });
 
@@ -93,8 +90,7 @@ describe('Endpoint caller', function() {
                 done();
             })
             .catch(err => {
-                expect.fail(err.toString());
-                done();
+                done(err);
             });
     });
 });

test-basic/plan-processors.js

@@ -327,4 +327,17 @@ describe('processor', function() {
       );}, Error, 'schema cannot be null or empty');
       done();
   });
+    it('generateView with literals', function(done) {
+        generateView(
+            p.fromLiterals([
+                {id:1, val: 2},
+                {id:2, val: 4}
+            ]),
+            'opticUnitTest', 'musicianView'
+        ).then(function(output) {
+            should.exist(output);
+            done();
+        })
+            .catch(err => {console.log(err); done(err);});
+    });
 });