diff --git a/CHANGELOG.md b/CHANGELOG.md index b0cc938..3c4752a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [6.3.1](https://git.datacontroller.io/dc/dc/compare/v6.3.0...v6.3.1) (2024-01-01) + + +### Bug Fixes + +* enabling excel uploads to tables with retained keys, also adding more validation to MPE_TABLES updates ([3efccc4](https://git.datacontroller.io/dc/dc/commit/3efccc4cf3752763d049836724f2491c287f65db)) + # [6.3.0](https://git.datacontroller.io/dc/dc/compare/v6.2.8...v6.3.0) (2023-12-04) diff --git a/package.json b/package.json index 166b722..f9f20a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dcfrontend", - "version": "6.3.0", + "version": "6.3.1", "description": "Data Controller", "devDependencies": { "@saithodev/semantic-release-gitea": "^2.1.0", diff --git a/sas/sasjs/services/editors/loadfile.sas b/sas/sasjs/services/editors/loadfile.sas index d11ec30..27df4eb 100644 --- a/sas/sasjs/services/editors/loadfile.sas +++ b/sas/sasjs/services/editors/loadfile.sas @@ -146,7 +146,7 @@ select count(*) into: nobs from &syslast; ,msg=%str(Issue assigning library &orig_lib) ) -%global txfrom txto processed; +%global txfrom txto processed rk; data _null_; set &mpelib..MPE_TABLES; @@ -154,12 +154,13 @@ data _null_; call symputx('txfrom',var_txfrom); call symputx('txto',var_txto); call symputx('processed',var_processed); + if not missing(RK_UNDERLYING) then call symputx('rk',buskey); run; %mp_lockfilecheck(libds=&orig_libds) data compare; - set &libds(drop=&txfrom &txto &processed); + set &libds(drop=&txfrom &txto &processed &rk); stop; run; diff --git a/sas/sasjs/services/hooks/mpe_tables_postedit.sas b/sas/sasjs/services/hooks/mpe_tables_postedit.sas index 8a1a4fa..d5dbe27 100644 --- a/sas/sasjs/services/hooks/mpe_tables_postedit.sas +++ b/sas/sasjs/services/hooks/mpe_tables_postedit.sas @@ -34,6 +34,7 @@ data work.staging_ds; var_processed=upcase(var_processed); close_vars=upcase(close_vars); audit_libds=upcase(audit_libds); + rk_underlying=upcase(rk_underlying); /* check for valid loadtype */ if LOADTYPE not in ('UPDATE','TXTEMPORAL','FORMAT_CAT','BITEMPORAL','REPLACE') @@ -47,6 +48,10 @@ data work.staging_ds; BUSKEY='TYPE FMTNAME FMTROW'; DSN=scan(dsn,1,'-')!!'-FC'; end; + + /* convert tabs into spaces */ + buskey=translate(buskey," ","09"x); + rk_underlying=translate(rk_underlying," ","09"x); run; %mp_abort(iftrue=(&errflag=1)