mirror of
https://github.com/sasjs/core.git
synced 2025-12-10 22:14:35 +00:00
fix: mp_loadformat updates by FMTROW
Previously, FMTROW was not being honoured when adding / deleting individual format records. Updated tests and added additional validations to ensure FMTROW is provided correctly at the input stage.
This commit is contained in:
51
all.sas
51
all.sas
@@ -4189,8 +4189,8 @@ data &cntlout/nonote2err;
|
||||
end;
|
||||
|
||||
/* create row marker. Data cannot be sorted without it! */
|
||||
if first.fmtname then fmtrow=0;
|
||||
fmtrow+1;
|
||||
if first.fmtname then fmtrow=1;
|
||||
else fmtrow+1;
|
||||
|
||||
run;
|
||||
proc sort;
|
||||
@@ -10153,6 +10153,9 @@ 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:
|
||||
@@ -10161,7 +10164,7 @@ select distinct lowcase(memname)
|
||||
@li work.outds_del
|
||||
@li work.outds_mod
|
||||
|
||||
For example usage, see mp_loadformat.test.sas
|
||||
For example usage, see test (under Related Macros)
|
||||
|
||||
@param [in] libcat The format catalog to be loaded
|
||||
@param [in] libds The staging table to load
|
||||
@@ -10178,6 +10181,8 @@ 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
|
||||
@@ -10228,6 +10233,16 @@ 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_;
|
||||
@@ -10248,13 +10263,6 @@ 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);
|
||||
@@ -10262,6 +10270,14 @@ 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)
|
||||
@@ -10269,6 +10285,15 @@ 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
|
||||
*/
|
||||
@@ -10322,12 +10347,6 @@ 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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user