Merge pull request #107 from sasjs/hashdclogic

fix: adding iftrue switch to mp_hashdataset

.git-hooks/pre-commit

@@ -1,2 +1,11 @@
 #!/bin/sh
 sasjs lint
+
+# Avoid commits to the master branch
+BRANCH=`git rev-parse --abbrev-ref HEAD`
+
+if [[ "$BRANCH" =~ ^(master|main|develop)$ ]]; then
+  echo "You are on branch $BRANCH. Are you sure you want to commit to this branch?"
+  echo "If so, commit with -n to bypass the pre-commit hook."
+  exit 1
+fi

all.sas

@@ -6169,6 +6169,7 @@ create table &outds as
 
   @param [in] libds dataset to hash
   @param [in] salt= Provide a salt (could be, for instance, the dataset name)
+  @param [in] iftrue= A condition under which the macro should be executed.
   @param [out] outds= (work.mf_hashdataset) The output dataset to create. This
   will contain one column (hashkey) with one observation (a hex32.
   representation of the input hash)
@@ -6183,10 +6184,14 @@ create table &outds as
 %macro mp_hashdataset(
   libds,
   outds=,
-  salt=
+  salt=,
+  iftrue=%str(1=1)
 )/*/STORE SOURCE*/;
+
+  %if not(%eval(%unquote(&iftrue))) %then %return;
+
   %if %mf_getattrn(&libds,NLOBS)=0 %then %do;
-    %put %str(WARN)ING: Dataset &libds is empty;, or is not a dataset;
+    %put %str(WARN)ING: Dataset &libds is empty, or is not a dataset;
   %end;
   %else %if %mf_getattrn(&libds,NLOBS)<0 %then %do;
     %put %str(ERR)OR: Dataset &libds is not a dataset;
@@ -6367,15 +6372,15 @@ filename &tempref clear;
     compress=CHAR           /* default is none so ensure we have something!   */
     datastmtchk=ALLKEYWORDS /* protection from overwriting input datasets     */
     errorcheck=STRICT       /* catch errors in libname/filename statements    */
-    fmterr                  /* ensure error when a format cannot be found     */
+    fmterr                  /* ensure err   when a format cannot be found     */
-    mergenoby=ERROR         /*
+    mergenoby=%str(ERR)OR   /* Throw err   when a merge has no BY variables   */
     missing=.    /* some sites change this which causes hard to detect errors */
     noquotelenmax           /* avoid warnings for long strings                */
     noreplace               /* avoid overwriting permanent datasets           */
     ps=max                  /* reduce log size slightly                       */
     validmemname=COMPATIBLE /* avoid special characters etc in table names    */
     validvarname=V7         /* avoid special characters etc in variable names */
-    varlenchk=ERROR         /* fail hard if truncation (data loss) can result */
+    varlenchk=%str(ERR)OR   /* fail hard if truncation (data loss) can result */
   ;
 
 %mend mp_init;/**

base/mp_hashdataset.sas

@@ -21,6 +21,7 @@
 
   @param [in] libds dataset to hash
   @param [in] salt= Provide a salt (could be, for instance, the dataset name)
+  @param [in] iftrue= A condition under which the macro should be executed.
   @param [out] outds= (work.mf_hashdataset) The output dataset to create. This
   will contain one column (hashkey) with one observation (a hex32.
   representation of the input hash)
@@ -35,10 +36,14 @@
 %macro mp_hashdataset(
   libds,
   outds=,
-  salt=
+  salt=,
+  iftrue=%str(1=1)
 )/*/STORE SOURCE*/;
+
+  %if not(%eval(%unquote(&iftrue))) %then %return;
+
   %if %mf_getattrn(&libds,NLOBS)=0 %then %do;
-    %put %str(WARN)ING: Dataset &libds is empty;, or is not a dataset;
+    %put %str(WARN)ING: Dataset &libds is empty, or is not a dataset;
   %end;
   %else %if %mf_getattrn(&libds,NLOBS)<0 %then %do;
     %put %str(ERR)OR: Dataset &libds is not a dataset;

base/mp_init.sas

@@ -40,15 +40,15 @@
     compress=CHAR           /* default is none so ensure we have something!   */
     datastmtchk=ALLKEYWORDS /* protection from overwriting input datasets     */
     errorcheck=STRICT       /* catch errors in libname/filename statements    */
-    fmterr                  /* ensure error when a format cannot be found     */
+    fmterr                  /* ensure err   when a format cannot be found     */
-    mergenoby=ERROR         /*
+    mergenoby=%str(ERR)OR   /* Throw err   when a merge has no BY variables   */
     missing=.    /* some sites change this which causes hard to detect errors */
     noquotelenmax           /* avoid warnings for long strings                */
     noreplace               /* avoid overwriting permanent datasets           */
     ps=max                  /* reduce log size slightly                       */
     validmemname=COMPATIBLE /* avoid special characters etc in table names    */
     validvarname=V7         /* avoid special characters etc in variable names */
-    varlenchk=ERROR         /* fail hard if truncation (data loss) can result */
+    varlenchk=%str(ERR)OR   /* fail hard if truncation (data loss) can result */
   ;
 
 %mend mp_init;