chore: updating all.sas

.all-contributorsrc

@@ -153,15 +153,6 @@
       "contributions": [
         "code"
       ]
-    },
-    {
-      "login": "andyjessen",
-      "name": "andyjessen",
-      "avatar_url": "https://avatars.githubusercontent.com/u/62343929?v=4",
-      "profile": "https://github.com/andyjessen",
-      "contributions": [
-        "doc"
-      ]
     }
   ],
   "contributorsPerLine": 7,

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,4 +15,4 @@ What code changes have been made to achieve the intent.
 - [ ] Code is formatted correctly (`sasjs lint`).
 - [ ] Any new functionality has been unit tested.
 - [ ] All unit tests are passing (`sasjs test`).
-- [ ] The PR desc or underlying commits follow the [Conventional Commit](https://www.conventionalcommits.org) standard
+- [ ] `all.sas` has been regenerated (`python3 build.py`)

README.md

@@ -248,7 +248,7 @@ The following repositories are also worth checking out:
 
 ## Contributors ✨
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-15-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-14-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
 
@@ -275,9 +275,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/henrik-forsell"><img src="https://avatars.githubusercontent.com/u/109935936?v=4?s=100" width="100px;" alt="Henrik Forsell"/><br /><sub><b>Henrik Forsell</b></sub></a><br /><a href="https://github.com/sasjs/core/commits?author=henrik-forsell" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://rudvfaden.github.io/"><img src="https://avatars.githubusercontent.com/u/2445577?v=4?s=100" width="100px;" alt="Rud Faden"/><br /><sub><b>Rud Faden</b></sub></a><br /><a href="https://github.com/sasjs/core/commits?author=rudvfaden" title="Code">💻</a></td>
     </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/andyjessen"><img src="https://avatars.githubusercontent.com/u/62343929?v=4?s=100" width="100px;" alt="andyjessen"/><br /><sub><b>andyjessen</b></sub></a><br /><a href="https://github.com/sasjs/core/commits?author=andyjessen" title="Documentation">📖</a></td>
-    </tr>
   </tbody>
 </table>
 

all.sas

@@ -1684,7 +1684,7 @@ Usage:
 
   Usage:
 
-      %put %mf_isblank(&var);
+      %put mf_isblank(&var);
 
   inspiration:
   https://support.sas.com/resources/papers/proceedings09/022-2009.pdf
@@ -4189,8 +4189,8 @@ data &cntlout/nonote2err;
   end;
 
   /* create row marker. Data cannot be sorted without it! */
-  if first.fmtname then fmtrow=1;
+  if first.fmtname then fmtrow=0;
-  else fmtrow+1;
+  fmtrow+1;
 
 run;
 proc sort;
@@ -5541,21 +5541,13 @@ data _null_;
     header = cats(coalescec(varlabel(dsid,i),varnm),dlm);
   %end;
   %else %if &headerformat=SASJS %then %do;
-    vlen=varlen(dsid,i);
+    if vartype(dsid,i)='C' then header=cats(varnm,':$char',varlen(dsid,i),'.');
-    if vartype(dsid,i)='C' then header=cats(varnm,':$char',vlen,'.');
     else do;
       vfmt=coalescec(varfmt(dsid,i),'0');
       fmttype=mcf_getfmttype(vfmt);
       if fmttype='DATE' then header=cats(varnm,':date9.');
       else if fmttype='DATETIME' then header=cats(varnm,':E8601DT26.6');
       else if fmttype='TIME' then header=cats(varnm,':TIME12.');
-      /**
-        * there is not much point importing a short length numeric like this,
-        * eg with best4., as the resulting variable will still be stored as
-        * length 8.  We need a length or format statement to ensure variable
-        * is creatd with the smaller length...
-        **/
-      else if vlen<8 then header=cats(varnm,':best',vlen,'.');
       else header=cats(varnm,':best.');
     end;
   %end;
@@ -5582,7 +5574,6 @@ data _null_;
   set &ds end=last;
 %do i=1 %to &vcnt;
   %let var=%scan(&varlist,&i);
-  %local vlen&i;
   %if %mf_getvartype(&ds,&var)=C %then %do;
     %let dsv1=%mf_getuniquename(prefix=csvcol1_);
     %let dsv2=%mf_getuniquename(prefix=csvcol2_);
@@ -6386,14 +6377,15 @@ drop table &ds1, &ds2;
 /**
   * Sanitise the values based on valid value lists, then strip out
   * quotes, commas, periods and spaces.
+  * Only numeric values should remain
   */
 %local reason_cd nobs;
 %let nobs=0;
 data &outds;
   /*length GROUP_LOGIC SUBGROUP_LOGIC $3 SUBGROUP_ID 8 VARIABLE_NM $32
     OPERATOR_NM $10 RAW_VALUE $4000;*/
-  set &inds end=last;
+  set &inds;
-  length reason_cd $4032 vtype vtype2 $1 vnum dsid 8 tmp $4000;
+  length reason_cd $4032 vtype $1 vnum dsid 8 tmp $4000;
   drop tmp;
 
   /* quick check to ensure column exists */
@@ -6409,8 +6401,7 @@ data &outds;
   end;
 
   /* need to open the dataset to get the column type */
-  retain dsid;
+  dsid=open("&targetds","i");
-  if _n_=1 then dsid=open("&targetds","i");
   if dsid>0 then do;
     vnum=varnum(dsid,VARIABLE_NM);
     if vnum<1 then do;
@@ -6420,19 +6411,11 @@ data &outds;
       call symputx('reason_cd',reason_cd,'l');
       call symputx('nobs',_n_,'l');
       output;
-      goto endstep;
+      return;
     end;
     /* now we can get the type */
     else vtype=vartype(dsid,vnum);
   end;
-  else do;
-      REASON_CD=cats("Could not open &targetds");
-      putlog REASON_CD= dsid=;
-      call symputx('reason_cd',reason_cd,'l');
-      call symputx('nobs',_n_,'l');
-      output;
-      stop;
-  end;
 
   /* closed list checks */
   if GROUP_LOGIC not in ('AND','OR') then do;
@@ -6467,40 +6450,15 @@ data &outds;
   end;
 
   /* special missing logic */
-  if vtype='N' & OPERATOR_NM in ('=','>','<','<=','>=','NE','GE','LE') then do;
+  if vtype='N'
-    if cats(upcase(raw_value)) in (
+    and OPERATOR_NM in ('=','>','<','<=','>=','NE','GE','LE')
+    and cats(upcase(raw_value)) in (
       '.','.A','.B','.C','.D','.E','.F','.G','.H','.I','.J','.K','.L','.M','.N'
       '.N','.O','.P','.Q','.R','.S','.T','.U','.V','.W','.X','.Y','.Z','._'
     )
-    then do;
+  then do;
-      /* valid numeric - exit data step loop */
+    /* valid numeric - exit data step loop */
-      return;
+    return;
-    end;
-    else if subpad(upcase(raw_value),1,1) in (
-      'A','B','C','D','E','F','G','H','I','J','K','L','M','N'
-      'N','O','P','Q','R','S','T','U','V','W','X','Y','Z','_'
-    )
-    then do;
-      /* check if the raw_value contains a valid variable NAME */
-      vnum=varnum(dsid,subpad(raw_value,1,32));
-      if vnum>0 then do;
-        /* now we can get the type */
-        vtype2=vartype(dsid,vnum);
-        /* check type matches */
-        if vtype2=vtype then do;
-          /* valid target var - exit loop */
-          return;
-        end;
-        else do;
-          REASON_CD=cats("Compared Type (",vtype2,") is not (",vtype,")");
-          putlog REASON_CD= dsid=;
-          call symputx('reason_cd',reason_cd,'l');
-          call symputx('nobs',_n_,'l');
-          output;
-          goto endstep;
-        end;
-      end;
-    end;
   end;
 
   /* special logic */
@@ -6522,32 +6480,6 @@ data &outds;
     if vtype='N' then do i=1 to countc(raw_value1, ',')+1;
       tmp=scan(raw_value1,i,',');
       if cats(tmp) ne '.' and input(tmp, ?? 8.) eq . then do;
-        if OPERATOR_NM ='BETWEEN' and subpad(upcase(tmp),1,1) in (
-          'A','B','C','D','E','F','G','H','I','J','K','L','M','N'
-          'N','O','P','Q','R','S','T','U','V','W','X','Y','Z','_'
-        )
-        then do;
-          /* check if the raw_value contains a valid variable NAME */
-          /* is not valid syntax for IN or NOT IN */
-          vnum=varnum(dsid,subpad(tmp,1,32));
-          if vnum>0 then do;
-            /* now we can get the type */
-            vtype2=vartype(dsid,vnum);
-            /* check type matches */
-            if vtype2=vtype then do;
-              /* valid target var - exit loop */
-              return;
-            end;
-            else do;
-              REASON_CD=cats("Compared Type (",vtype2,") is not (",vtype,")");
-              putlog REASON_CD= dsid=;
-              call symputx('reason_cd',reason_cd,'l');
-              call symputx('nobs',_n_,'l');
-              output;
-              goto endstep;
-            end;
-          end;
-        end;
         REASON_CD='Non Numeric value provided';
         putlog REASON_CD= OPERATOR_NM= raw_value= raw_value1= ;
         call symputx('reason_cd',reason_cd,'l');
@@ -6572,42 +6504,14 @@ data &outds;
 
   /* output records that contain values other than digits and spaces */
   if notdigit(compress(raw_value3,' '))>0 then do;
-    if vtype='C' and subpad(upcase(raw_value),1,1) in (
-      'A','B','C','D','E','F','G','H','I','J','K','L','M','N'
-      'N','O','P','Q','R','S','T','U','V','W','X','Y','Z','_'
-    )
-    then do;
-      /* check if the raw_value contains a valid variable NAME */
-      vnum=varnum(dsid,subpad(raw_value,1,32));
-      if vnum>0 then do;
-        /* now we can get the type */
-        vtype2=vartype(dsid,vnum);
-        /* check type matches */
-        if vtype2=vtype then do;
-          /* valid target var - exit loop */
-          return;
-        end;
-        else do;
-          REASON_CD=cats("Compared Char Type (",vtype2,") is not (",vtype,")");
-          putlog REASON_CD= dsid=;
-          call symputx('reason_cd',reason_cd,'l');
-          call symputx('nobs',_n_,'l');
-          output;
-          goto endstep;
-        end;
-      end;
-    end;
-
     putlog raw_value3= $hex32.;
     REASON_CD=cats('Invalid RAW_VALUE:',raw_value);
-    putlog (_all_)(=);
+    putlog REASON_CD= raw_value= raw_value1= raw_value2= raw_value3=;
     call symputx('reason_cd',reason_cd,'l');
     call symputx('nobs',_n_,'l');
     output;
   end;
 
-  endstep:
-  if last then rc=close(dsid);
 run;
 
 
@@ -10249,9 +10153,6 @@ select distinct lowcase(memname)
   format, to prevent loss of data - UNLESS the input dataset contains a marker
   column, specifying that a particular row needs to be deleted (`delete_col=`).
 
-  Positions of formats are made using the FMTROW variable - this must be present
-  and unique (on TYPE / FMTNAME / FMTROW).
-
   This macro can also be used to identify which records would be (or were)
   considered new, modified or deleted (`loadtarget=`) by creating the following
   tables:
@@ -10260,7 +10161,7 @@ select distinct lowcase(memname)
   @li work.outds_del
   @li work.outds_mod
 
-  For example usage, see test (under Related Macros)
+  For example usage, see mp_loadformat.test.sas
 
   @param [in] libcat The format catalog to be loaded
   @param [in] libds The staging table to load
@@ -10277,15 +10178,12 @@ select distinct lowcase(memname)
   @param [in] mdebug= (0) Set to 1 to enable DEBUG messages and preserve outputs
 
   <h4> SAS Macros </h4>
-  @li mf_existds.sas
-  @li mf_existvar.sas
   @li mf_getuniquename.sas
   @li mf_nobs.sas
   @li mp_abort.sas
   @li mp_aligndecimal.sas
   @li mp_cntlout.sas
   @li mp_lockanytable.sas
-  @li mp_md5.sas
   @li mp_storediffs.sas
 
   <h4> Related Macros </h4>
@@ -10329,16 +10227,6 @@ select distinct lowcase(memname)
 %let libcat=%scan(&libcat,1,-);
 
 /* perform input validations */
-%mp_abort(
-  iftrue=(%mf_existds(&libds)=0)
-  ,mac=&sysmacroname
-  ,msg=%str(&libds could not be found)
-)
-%mp_abort(
-  iftrue=(%mf_existvar(&libds,FMTROW)=0)
-  ,mac=&sysmacroname
-  ,msg=%str(FMTROW not found in &libds)
-)
 %let err=0;
 %let msg=0;
 data _null_;
@@ -10359,6 +10247,13 @@ data _null_;
       stop;
     end;
   end;
+  else if name='LIBDS' then do;
+    if exist(value) le 0 then do;
+      call symputx('msg',"Unable to open staging table: "!!value);
+      call symputx('err',1);
+      stop;
+    end;
+  end;
   else if (name=:'OUTDS' or name in ('DELETE_COL','LOCKLIBDS','AUDITLIBDS'))
   and missing(value) then do;
     call symputx('msg',"missing value in var: "!!name);
@@ -10366,14 +10261,6 @@ data _null_;
     stop;
   end;
 run;
-data _null_;
-  set &libds;
-  if missing(fmtrow) then do;
-    call symputx('msg',"missing fmtrow in format: "!!FMTNAME);
-    call symputx('err',1);
-    stop;
-  end;
-run;
 
 %mp_abort(
   iftrue=(&err ne 0)
@@ -10381,15 +10268,6 @@ run;
   ,msg=%str(&msg)
 )
 
-%local cnt;
-proc sql noprint;
-select count(distinct catx('|',type,fmtname,fmtrow)) into: cnt from &libds;
-%mp_abort(
-  iftrue=(&cnt ne %mf_nobs(&libds))
-  ,mac=&sysmacroname
-  ,msg=%str(Non-unique primary key on &libds)
-)
-
 /**
   * First, extract only relevant formats from the catalog
   */
@@ -10443,6 +10321,12 @@ data &inlibds/nonote2err;
     %mp_aligndecimal(end,width=16)
   end;
 
+  /* update row marker - retain new var as fmtrow may already be in libds */
+  if first.fmtname then row=1;
+  else row+1;
+  drop row;
+  fmtrow=row;
+
   fmthash=%mp_md5(cvars=&cvars, nvars=&nvars);
 run;
 
@@ -14292,22 +14176,6 @@ ods package close;
   (given various practical restrictions) are described here to enable
   consistency when dealing with format data.
 
-  The HLO variable may have a number of values, documented here due to the
-  256 char label description length limit:
-
-    F=Standard format/informat.
-    H=Range ending value is HIGH.
-    I=Numeric informat.
-    J=Justification for an informat.
-    L=Range starting value is LOW.
-    M=MultiLabel.
-    N=Format or informat has no ranges, including no OTHER= range.
-    O=Range is OTHER.
-    R=ROUND option is in effect.
-    S=Specifies that NOTSORTED is in effect.
-    U=Specifies that the UPCASE option for an informat be used.
-
-
 **/
 
 
@@ -14315,11 +14183,9 @@ ods package close;
 
   proc sql;
   create table &libds(
-    TYPE char(1) label=
+    TYPE char(1) label='Type of format - either N (num fmt), C (char fmt), I (num infmt) or J (char infmt)'
-'Format Type: either N (num fmt), C (char fmt), I (num infmt) or J (char infmt)'
     ,FMTNAME char(32)     label='Format name'
-    ,FMTROW num label=
+    ,FMTROW num label='CALCULATED Position of record by FMTNAME (reqd for multilabel formats)'
-'CALCULATED Position of record by FMTNAME (reqd for multilabel formats)'
     ,START char(32767)    label='Starting value for format'
     /*
       Keep lengths of START and END the same to avoid this err:
@@ -14339,8 +14205,18 @@ ods package close;
     ,NOEDIT num length=3  label='Is picture string noedit?'
     ,SEXCL char(1)        label='Start exclusion'
     ,EEXCL char(1)        label='End exclusion'
-    ,HLO char(13) label=
+    ,HLO char(13)         label='Additional information.
-'More info: https://core.sasjs.io/mddl__sas__cntlout_8sas_source.html'
+F=Standard format/informat.
+H=Range ending value is HIGH.
+I=Numeric informat.
+J=Justification for an informat.
+L=Range starting value is LOW.
+M=MultiLabel.
+N=Format or informat has no ranges, including no OTHER= range.
+O=Range is OTHER.
+R=ROUND option is in effect.
+S=Specifies that NOTSORTED is in effect.
+U=Specifies that the UPCASE option for an informat be used.'
     ,DECSEP char(1)       label='Decimal separator'
     ,DIG3SEP char(1)      label='Three-digit separator'
     ,DATATYPE char(8)     label='Date/time/datetime?'
@@ -14674,7 +14550,7 @@ run;
   %end;
 %end;
 %else %if &engine=ODBC %then %do;
-  %&mD.put NOTE: Retrieving ODBC connection details;
+  &mD.%put NOTE: Retrieving ODBC connection details;
   data _null_;
     length connx_uri conprop_uri value datasource up_uri schema domprop_uri authdomain $256.;
     call missing (of _all_);

base/mf_isblank.sas

@@ -7,7 +7,7 @@
 
   Usage:
 
-      %put %mf_isblank(&var);
+      %put mf_isblank(&var);
 
   inspiration:
   https://support.sas.com/resources/papers/proceedings09/022-2009.pdf

base/mp_cntlout.sas

@@ -79,8 +79,8 @@ data &cntlout/nonote2err;
   end;
 
   /* create row marker. Data cannot be sorted without it! */
-  if first.fmtname then fmtrow=1;
+  if first.fmtname then fmtrow=0;
-  else fmtrow+1;
+  fmtrow+1;
 
 run;
 proc sort;

base/mp_ds2csv.sas

@@ -118,21 +118,13 @@ data _null_;
     header = cats(coalescec(varlabel(dsid,i),varnm),dlm);
   %end;
   %else %if &headerformat=SASJS %then %do;
-    vlen=varlen(dsid,i);
+    if vartype(dsid,i)='C' then header=cats(varnm,':$char',varlen(dsid,i),'.');
-    if vartype(dsid,i)='C' then header=cats(varnm,':$char',vlen,'.');
     else do;
       vfmt=coalescec(varfmt(dsid,i),'0');
       fmttype=mcf_getfmttype(vfmt);
       if fmttype='DATE' then header=cats(varnm,':date9.');
       else if fmttype='DATETIME' then header=cats(varnm,':E8601DT26.6');
       else if fmttype='TIME' then header=cats(varnm,':TIME12.');
-      /**
-        * there is not much point importing a short length numeric like this,
-        * eg with best4., as the resulting variable will still be stored as
-        * length 8.  We need a length or format statement to ensure variable
-        * is creatd with the smaller length...
-        **/
-      else if vlen<8 then header=cats(varnm,':best',vlen,'.');
       else header=cats(varnm,':best.');
     end;
   %end;
@@ -159,7 +151,6 @@ data _null_;
   set &ds end=last;
 %do i=1 %to &vcnt;
   %let var=%scan(&varlist,&i);
-  %local vlen&i;
   %if %mf_getvartype(&ds,&var)=C %then %do;
     %let dsv1=%mf_getuniquename(prefix=csvcol1_);
     %let dsv2=%mf_getuniquename(prefix=csvcol2_);

base/mp_filtercheck.sas

@@ -86,14 +86,15 @@
 /**
   * Sanitise the values based on valid value lists, then strip out
   * quotes, commas, periods and spaces.
+  * Only numeric values should remain
   */
 %local reason_cd nobs;
 %let nobs=0;
 data &outds;
   /*length GROUP_LOGIC SUBGROUP_LOGIC $3 SUBGROUP_ID 8 VARIABLE_NM $32
     OPERATOR_NM $10 RAW_VALUE $4000;*/
-  set &inds end=last;
+  set &inds;
-  length reason_cd $4032 vtype vtype2 $1 vnum dsid 8 tmp $4000;
+  length reason_cd $4032 vtype $1 vnum dsid 8 tmp $4000;
   drop tmp;
 
   /* quick check to ensure column exists */
@@ -109,8 +110,7 @@ data &outds;
   end;
 
   /* need to open the dataset to get the column type */
-  retain dsid;
+  dsid=open("&targetds","i");
-  if _n_=1 then dsid=open("&targetds","i");
   if dsid>0 then do;
     vnum=varnum(dsid,VARIABLE_NM);
     if vnum<1 then do;
@@ -120,19 +120,11 @@ data &outds;
       call symputx('reason_cd',reason_cd,'l');
       call symputx('nobs',_n_,'l');
       output;
-      goto endstep;
+      return;
     end;
     /* now we can get the type */
     else vtype=vartype(dsid,vnum);
   end;
-  else do;
-      REASON_CD=cats("Could not open &targetds");
-      putlog REASON_CD= dsid=;
-      call symputx('reason_cd',reason_cd,'l');
-      call symputx('nobs',_n_,'l');
-      output;
-      stop;
-  end;
 
   /* closed list checks */
   if GROUP_LOGIC not in ('AND','OR') then do;
@@ -167,40 +159,15 @@ data &outds;
   end;
 
   /* special missing logic */
-  if vtype='N' & OPERATOR_NM in ('=','>','<','<=','>=','NE','GE','LE') then do;
+  if vtype='N'
-    if cats(upcase(raw_value)) in (
+    and OPERATOR_NM in ('=','>','<','<=','>=','NE','GE','LE')
+    and cats(upcase(raw_value)) in (
       '.','.A','.B','.C','.D','.E','.F','.G','.H','.I','.J','.K','.L','.M','.N'
       '.N','.O','.P','.Q','.R','.S','.T','.U','.V','.W','.X','.Y','.Z','._'
     )
-    then do;
+  then do;
-      /* valid numeric - exit data step loop */
+    /* valid numeric - exit data step loop */
-      return;
+    return;
-    end;
-    else if subpad(upcase(raw_value),1,1) in (
-      'A','B','C','D','E','F','G','H','I','J','K','L','M','N'
-      'N','O','P','Q','R','S','T','U','V','W','X','Y','Z','_'
-    )
-    then do;
-      /* check if the raw_value contains a valid variable NAME */
-      vnum=varnum(dsid,subpad(raw_value,1,32));
-      if vnum>0 then do;
-        /* now we can get the type */
-        vtype2=vartype(dsid,vnum);
-        /* check type matches */
-        if vtype2=vtype then do;
-          /* valid target var - exit loop */
-          return;
-        end;
-        else do;
-          REASON_CD=cats("Compared Type (",vtype2,") is not (",vtype,")");
-          putlog REASON_CD= dsid=;
-          call symputx('reason_cd',reason_cd,'l');
-          call symputx('nobs',_n_,'l');
-          output;
-          goto endstep;
-        end;
-      end;
-    end;
   end;
 
   /* special logic */
@@ -222,32 +189,6 @@ data &outds;
     if vtype='N' then do i=1 to countc(raw_value1, ',')+1;
       tmp=scan(raw_value1,i,',');
       if cats(tmp) ne '.' and input(tmp, ?? 8.) eq . then do;
-        if OPERATOR_NM ='BETWEEN' and subpad(upcase(tmp),1,1) in (
-          'A','B','C','D','E','F','G','H','I','J','K','L','M','N'
-          'N','O','P','Q','R','S','T','U','V','W','X','Y','Z','_'
-        )
-        then do;
-          /* check if the raw_value contains a valid variable NAME */
-          /* is not valid syntax for IN or NOT IN */
-          vnum=varnum(dsid,subpad(tmp,1,32));
-          if vnum>0 then do;
-            /* now we can get the type */
-            vtype2=vartype(dsid,vnum);
-            /* check type matches */
-            if vtype2=vtype then do;
-              /* valid target var - exit loop */
-              return;
-            end;
-            else do;
-              REASON_CD=cats("Compared Type (",vtype2,") is not (",vtype,")");
-              putlog REASON_CD= dsid=;
-              call symputx('reason_cd',reason_cd,'l');
-              call symputx('nobs',_n_,'l');
-              output;
-              goto endstep;
-            end;
-          end;
-        end;
         REASON_CD='Non Numeric value provided';
         putlog REASON_CD= OPERATOR_NM= raw_value= raw_value1= ;
         call symputx('reason_cd',reason_cd,'l');
@@ -272,42 +213,14 @@ data &outds;
 
   /* output records that contain values other than digits and spaces */
   if notdigit(compress(raw_value3,' '))>0 then do;
-    if vtype='C' and subpad(upcase(raw_value),1,1) in (
-      'A','B','C','D','E','F','G','H','I','J','K','L','M','N'
-      'N','O','P','Q','R','S','T','U','V','W','X','Y','Z','_'
-    )
-    then do;
-      /* check if the raw_value contains a valid variable NAME */
-      vnum=varnum(dsid,subpad(raw_value,1,32));
-      if vnum>0 then do;
-        /* now we can get the type */
-        vtype2=vartype(dsid,vnum);
-        /* check type matches */
-        if vtype2=vtype then do;
-          /* valid target var - exit loop */
-          return;
-        end;
-        else do;
-          REASON_CD=cats("Compared Char Type (",vtype2,") is not (",vtype,")");
-          putlog REASON_CD= dsid=;
-          call symputx('reason_cd',reason_cd,'l');
-          call symputx('nobs',_n_,'l');
-          output;
-          goto endstep;
-        end;
-      end;
-    end;
-
     putlog raw_value3= $hex32.;
     REASON_CD=cats('Invalid RAW_VALUE:',raw_value);
-    putlog (_all_)(=);
+    putlog REASON_CD= raw_value= raw_value1= raw_value2= raw_value3=;
     call symputx('reason_cd',reason_cd,'l');
     call symputx('nobs',_n_,'l');
     output;
   end;
 
-  endstep:
-  if last then rc=close(dsid);
 run;
 
 

base/mp_loadformat.sas

@@ -9,9 +9,6 @@
   format, to prevent loss of data - UNLESS the input dataset contains a marker
   column, specifying that a particular row needs to be deleted (`delete_col=`).
 
-  Positions of formats are made using the FMTROW variable - this must be present
-  and unique (on TYPE / FMTNAME / FMTROW).
-
   This macro can also be used to identify which records would be (or were)
   considered new, modified or deleted (`loadtarget=`) by creating the following
   tables:
@@ -20,7 +17,7 @@
   @li work.outds_del
   @li work.outds_mod
 
-  For example usage, see test (under Related Macros)
+  For example usage, see mp_loadformat.test.sas
 
   @param [in] libcat The format catalog to be loaded
   @param [in] libds The staging table to load
@@ -37,15 +34,12 @@
   @param [in] mdebug= (0) Set to 1 to enable DEBUG messages and preserve outputs
 
   <h4> SAS Macros </h4>
-  @li mf_existds.sas
-  @li mf_existvar.sas
   @li mf_getuniquename.sas
   @li mf_nobs.sas
   @li mp_abort.sas
   @li mp_aligndecimal.sas
   @li mp_cntlout.sas
   @li mp_lockanytable.sas
-  @li mp_md5.sas
   @li mp_storediffs.sas
 
   <h4> Related Macros </h4>
@@ -89,16 +83,6 @@
 %let libcat=%scan(&libcat,1,-);
 
 /* perform input validations */
-%mp_abort(
-  iftrue=(%mf_existds(&libds)=0)
-  ,mac=&sysmacroname
-  ,msg=%str(&libds could not be found)
-)
-%mp_abort(
-  iftrue=(%mf_existvar(&libds,FMTROW)=0)
-  ,mac=&sysmacroname
-  ,msg=%str(FMTROW not found in &libds)
-)
 %let err=0;
 %let msg=0;
 data _null_;
@@ -119,6 +103,13 @@ data _null_;
       stop;
     end;
   end;
+  else if name='LIBDS' then do;
+    if exist(value) le 0 then do;
+      call symputx('msg',"Unable to open staging table: "!!value);
+      call symputx('err',1);
+      stop;
+    end;
+  end;
   else if (name=:'OUTDS' or name in ('DELETE_COL','LOCKLIBDS','AUDITLIBDS'))
   and missing(value) then do;
     call symputx('msg',"missing value in var: "!!name);
@@ -126,14 +117,6 @@ data _null_;
     stop;
   end;
 run;
-data _null_;
-  set &libds;
-  if missing(fmtrow) then do;
-    call symputx('msg',"missing fmtrow in format: "!!FMTNAME);
-    call symputx('err',1);
-    stop;
-  end;
-run;
 
 %mp_abort(
   iftrue=(&err ne 0)
@@ -141,15 +124,6 @@ run;
   ,msg=%str(&msg)
 )
 
-%local cnt;
-proc sql noprint;
-select count(distinct catx('|',type,fmtname,fmtrow)) into: cnt from &libds;
-%mp_abort(
-  iftrue=(&cnt ne %mf_nobs(&libds))
-  ,mac=&sysmacroname
-  ,msg=%str(Non-unique primary key on &libds)
-)
-
 /**
   * First, extract only relevant formats from the catalog
   */
@@ -203,6 +177,12 @@ data &inlibds/nonote2err;
     %mp_aligndecimal(end,width=16)
   end;
 
+  /* update row marker - retain new var as fmtrow may already be in libds */
+  if first.fmtname then row=1;
+  else row+1;
+  drop row;
+  fmtrow=row;
+
   fmthash=%mp_md5(cvars=&cvars, nvars=&nvars);
 run;
 

ddl/mddl_sas_cntlout.sas

@@ -6,22 +6,6 @@
   (given various practical restrictions) are described here to enable
   consistency when dealing with format data.
 
-  The HLO variable may have a number of values, documented here due to the
-  256 char label description length limit:
-
-    F=Standard format/informat.
-    H=Range ending value is HIGH.
-    I=Numeric informat.
-    J=Justification for an informat.
-    L=Range starting value is LOW.
-    M=MultiLabel.
-    N=Format or informat has no ranges, including no OTHER= range.
-    O=Range is OTHER.
-    R=ROUND option is in effect.
-    S=Specifies that NOTSORTED is in effect.
-    U=Specifies that the UPCASE option for an informat be used.
-
-
 **/
 
 
@@ -29,11 +13,9 @@
 
   proc sql;
   create table &libds(
-    TYPE char(1) label=
+    TYPE char(1) label='Type of format - either N (num fmt), C (char fmt), I (num infmt) or J (char infmt)'
-'Format Type: either N (num fmt), C (char fmt), I (num infmt) or J (char infmt)'
     ,FMTNAME char(32)     label='Format name'
-    ,FMTROW num label=
+    ,FMTROW num label='CALCULATED Position of record by FMTNAME (reqd for multilabel formats)'
-'CALCULATED Position of record by FMTNAME (reqd for multilabel formats)'
     ,START char(32767)    label='Starting value for format'
     /*
       Keep lengths of START and END the same to avoid this err:
@@ -53,8 +35,18 @@
     ,NOEDIT num length=3  label='Is picture string noedit?'
     ,SEXCL char(1)        label='Start exclusion'
     ,EEXCL char(1)        label='End exclusion'
-    ,HLO char(13) label=
+    ,HLO char(13)         label='Additional information.
-'More info: https://core.sasjs.io/mddl__sas__cntlout_8sas_source.html'
+F=Standard format/informat.
+H=Range ending value is HIGH.
+I=Numeric informat.
+J=Justification for an informat.
+L=Range starting value is LOW.
+M=MultiLabel.
+N=Format or informat has no ranges, including no OTHER= range.
+O=Range is OTHER.
+R=ROUND option is in effect.
+S=Specifies that NOTSORTED is in effect.
+U=Specifies that the UPCASE option for an informat be used.'
     ,DECSEP char(1)       label='Decimal separator'
     ,DIG3SEP char(1)      label='Three-digit separator'
     ,DATATYPE char(8)     label='Date/time/datetime?'

meta/mm_assigndirectlib.sas

@@ -210,7 +210,7 @@ run;
   %end;
 %end;
 %else %if &engine=ODBC %then %do;
-  %&mD.put NOTE: Retrieving ODBC connection details;
+  &mD.%put NOTE: Retrieving ODBC connection details;
   data _null_;
     length connx_uri conprop_uri value datasource up_uri schema domprop_uri authdomain $256.;
     call missing (of _all_);

sasjs/sasjsconfig.json

@@ -67,7 +67,7 @@
     },
     {
       "name": "server",
-      "serverUrl": "https://sas.4gl.io",
+      "serverUrl": "https://sas9.4gl.io",
       "serverType": "SASJS",
       "httpsAgentOptions": {
         "allowInsecureRequests": false

tests/base/mp_ds2csv.test.2.sas

@@ -1,43 +0,0 @@
-/**
-  @file
-  @brief Testing mp_ds2csv.sas macro
-
-  <h4> SAS Macros </h4>
-  @li mp_ds2csv.sas
-  @li mp_assert.sas
-  @li mp_assertscope.sas
-
-**/
-
-data work.shortnum;
-  length a 3 b 4 c 8;
-  a=1;b=2;c=3;
-  output;
-  stop;
-run;
-
-/**
-  * Test 1 - default CSV
-  */
-
-%mp_ds2csv(work.shortnum,outfile="&sasjswork/test1.csv",headerformat=SASJS)
-
-%let test1b=FAIL;
-data _null_;
-  infile "&sasjswork/test1.csv";
-  input;
-  list;
-  if _n_=1 then call symputx('test1a',_infile_);
-  else if _infile_=:'1,2,3' then call symputx('test1b','PASS');
-run;
-
-%mp_assert(
-  iftrue=("&test1a"="A:best3. B:best4. C:best."),
-  desc=Checking header row Test 1,
-  outds=work.test_results
-)
-%mp_assert(
-  iftrue=("&test1b"="PASS"),
-  desc=Checking data row Test 1,
-  outds=work.test_results
-)

tests/base/mp_filtercheck.test.sas

@@ -53,10 +53,7 @@ AND,AND,1,age,=,.A
 AND,AND,1,height,<,.B
 AND,AND,1,age,IN,"(.a,.b,.)"
 AND,AND,1,age,IN,"(.A)"
-AND,AND,1,AGE,=,AGE
+
-AND,AND,1,AGE,<,Weight
-AND,AND,1,AGE,BETWEEN,"HEIGHT AND WEIGHT"
-AND,OR,2,Name,=,name
 ;;;;
 run;
 
@@ -207,26 +204,3 @@ run;
   outds=work.test_results
 )
 %let syscc=0;
-
-
-/* invalid IN value (cannot use var names) */
-data work.inds;
-  infile datalines4 dsd;
-  input GROUP_LOGIC:$3. SUBGROUP_LOGIC:$3. SUBGROUP_ID:8. VARIABLE_NM:$32.
-    OPERATOR_NM:$10. RAW_VALUE:$4000.;
-datalines4;
-AND,AND,1,AGE,NOT IN,"(height, age)"
-;;;;
-run;
-
-%mp_filtercheck(work.inds,
-  targetds=work.class,
-  outds=work.badrecords,
-  abort=NO
-)
-%let syscc=0;
-%mp_assertdsobs(work.badrecords,
-  desc=Invalid IN syntax,
-  test=HASOBS,
-  outds=work.test_results
-)

tests/base/mp_loadformat.test.1.sas

@@ -189,10 +189,8 @@ data work.stagedata3;
     if last.fmtname then do;
       output; /* 6 new records */
       x=_n_;
-      x+1;start=cats("mod",x);end=start;label='newlabel1';fmtrow=fmtrow+1;
+      x+1;start=cats("mod",x);end=start;label='newlabel1';output;
-      output;
+      x+1;start=cats("mod",x);end=start;label='newlabel2';output;
-      x+1;start=cats("mod",x);end=start;label='newlabel2';fmtrow=fmtrow+2;
-      output;
     end;
     else if fmtrow le 3 then do; /* 9 more changed values */
       start= cats("mod",_n_);

tests/base/mp_loadformat.test.2.sas

@@ -58,9 +58,6 @@ proc format library=&cat1;
   value agemlb (multilabel)
     19-120='Adults'
     1-18='Children'
-    0-1='Preschool'
-    1-2='Preschool'
-    2-3='Preschool'
     1-4='Preschool';
   value agemlc (multilabel notsorted)
     19-120='Adults'
@@ -70,19 +67,16 @@ run;
 
 %mp_cntlout(libcat=&cat1,cntlout=work.cntlout1)
 %mp_assertdsobs(work.cntlout1,
-  desc=Has 19 records,
+  desc=Has 16 records,
-  test=EQUALS 19
+  test=EQUALS 16
 )
 
 data work.stagedata3;
   set work.cntlout1;
   if fmtname='AGEMLA' and label ne 'Preschool' then deleteme='Yes';
   if fmtname='AGEMLB' and label = 'Preschool' then label='Kids';
-  if fmtname='GENDERML' and label='Farmale' then do;
+  if fmtname='GENDERML' and label='Farmale' then output;
-    output;
+  output;
-    fmtrow=101; output;
-  end;
-  else output;
 run;
 
 
@@ -119,17 +113,14 @@ run;
 
 %let check1=0;
 %let check2=0;
-%let check3=0;
 data test;
   set work.cntlout2;
   where fmtname='GENDERML';
-  putlog fmtrow= label=;
   if _n_=4 and label='Farmale' then call symputx('check1',1);
-  if _n_=5 and label ne 'Farmale' then call symputx('check2',1);
+  if _n_=5 and label='Farmale' then call symputx('check2',1);
-  if _n_=8 and label = 'Farmale' then call symputx('check3',1);
 run;
 %mp_assert(
-  iftrue=(&check1=1 and &check2=1 and &check3=1),
+  iftrue=(&check1=1 and &check2=1),
   desc=Ensuring Farmale values retain their order,
   outds=work.test_results
 )