feat: mf_trimstr macro

fix: base_uri

all.sas

@@ -510,6 +510,7 @@ options noquotelenmax;
 
   <h4> Dependencies </h4>
   @li mf_mval.sas
+  @li mf_trimstr.sas
 
   @version 9.4 / 3.4
   @author Allan Bowe
@@ -555,7 +556,7 @@ options noquotelenmax;
   %else 0;
 %end;
 %else %if &switch=VIYARESTAPI %then %do;
-  %sysfunc(getoption(servicesbaseurl))
+  %mf_trimstr(%sysfunc(getoption(servicesbaseurl)),/)
 %end;
 %mend;/**
   @file
@@ -1290,6 +1291,44 @@ Usage:
 %macro mf_nobs(libds
 )/*/STORE SOURCE*/;
   %mf_getattrn(&libds,NLOBS)
+%mend;/**
+  @file mf_trimstr.sas
+  @brief Removes character(s) from the end, if they exist
+  @details If the designated characters exist at the end of the string, they 
+  are removed
+
+        %put %mf_trimstr(/blah/,/); * /blah;
+        %put %mf_trimstr(/blah/,h); * /blah/;
+        %put %mf_trimstr(/blah/,h/); */bla;
+
+  <h4> Dependencies </h4>
+
+
+  @param basestr The string to be modified
+  @param trimstr The string to be removed from the end of `basestr`, if it exists
+
+  @return output returns result with the value of `trimstr` removed from the end
+
+
+  @version 9.2
+  @author Allan Bowe
+
+**/
+
+%macro mf_trimstr(basestr,trimstr);
+%local trimlen trimval;
+%let trimlen=%length(%superq(trimstr));
+%let trimval=%qsubstr(%superq(basestr)
+  ,%length(%superq(basestr))-&trimlen+1
+  ,&trimlen);
+
+%if %superq(trimval)=%superq(trimstr) %then %do;
+  %qsubstr(%superq(basestr),1,%length(%superq(basestr))-&trimlen)
+%end;
+%else %do;
+  &basestr
+%end;
+
 %mend;/**
   @file
   @brief Creates a Unique ID based on system time in a friendly format
@@ -2449,11 +2488,13 @@ create table &outds as
         label x='blah';
       run;
       proc sql; describe table &syslast;
-
       %mp_getddl(work,test,flavour=tsql,showlog=YES)
 
+  <h4> Dependencies </h4>
+  @li mp_getconstraints.sas
+
   @param lib libref of the library to create DDL for.  Should be assigned.
-  @param ds dataset to create ddl for
+  @param ds dataset to create ddl for (optional)
   @param fref= the fileref to which to write the DDL.  If not preassigned, will
     be assigned to TEMP.
   @param flavour= The type of DDL to create (default=SAS). Supported=TSQL
@@ -2462,11 +2503,9 @@ create table &outds as
     ,else libref)
   @param applydttm= for non SAS DDL, choose if columns are created with native
    datetime2 format or regular decimal type
-
   @version 9.3
   @author Allan Bowe
   @source https://github.com/sasjs/core
-
 **/
 
 %macro mp_getddl(libref,ds,fref=getddl,flavour=SAS,showlog=NO,schema=
@@ -2490,6 +2529,21 @@ create table _data_ as
   ;
 %local tabinfo; %let tabinfo=&syslast;
 
+create table _data_ as
+  select * from dictionary.columns
+  where upcase(libname)="%upcase(&libref)"
+  %if %length(&ds)>0 %then %do;
+    and upcase(memname)="%upcase(&ds)"
+  %end;
+  ;
+%local colinfo; %let colinfo=&syslast;
+
+%local dsnlist;
+  select distinct upcase(memname) into: dsnlist
+  separated by ' '
+  from &syslast
+;
+
 create table _data_ as
   select * from dictionary.indexes
   where upcase(libname)="%upcase(&libref)"
@@ -2500,18 +2554,43 @@ create table _data_ as
   ;
 %local idxinfo; %let idxinfo=&syslast;
 
-create table _data_ as
+/* Extract all Primary Key and Unique data constraints */
-  select * from dictionary.columns
+%mp_getconstraints(lib=%upcase(&libref),ds=%upcase(&ds),outds=_data_)
-  where upcase(libname)="%upcase(&libref)"
+%local colconst; %let colconst=&syslast;
-  %if %length(&ds)>0 %then %do;
+
-    and upcase(memname)="%upcase(&ds)"
+%macro addConst();
+  %global constraints_used;
+  data _null_;
+    length ctype $11 constraint_name_orig $256 constraints_used $5000;
+    set &colconst (where=(table_name="&curds" and constraint_type in ('PRIMARY','UNIQUE'))) end=last;
+    file &fref mod;
+    by constraint_type constraint_name;
+    retain constraints_used;
+    constraint_name_orig=constraint_name;
+    if upcase(strip(constraint_type)) = 'PRIMARY' then ctype='PRIMARY KEY';
+    else ctype=strip(constraint_type);
+    %if &flavour=TSQL %then %do;
+      column_name=catt('[',column_name,']');
+      constraint_name=catt('[',constraint_name,']');
     %end;
-  ;
+    %else %if &flavour=PGSQL %then %do;
-%local colinfo; %let colinfo=&syslast;
+      column_name=catt('"',column_name,'"');
-%local dsnlist;
+      constraint_name=catt('"',constraint_name,'"');
-select distinct upcase(memname) into: dsnlist
+    %end;
-  separated by ' '
+    if first.constraint_name then do;
-  from &syslast;
+      constraints_used = catx(' ', constraints_used, constraint_name_orig);
+      put "   ,CONSTRAINT " constraint_name ctype "(" ;
+      put '     ' column_name;
+    end;
+  else put '     ,' column_name;
+  if last.constraint_name then do;
+    put "   )";
+    call symput('constraints_used',strip(constraints_used));
+  end;
+  run;
+  %put &=constraints_used;
+%mend;
+
 data _null_;
   file &fref;
   put "/* DDL generated by &sysuserid on %sysfunc(datetime(),datetime19.) */";
@@ -2520,7 +2599,8 @@ run;
 %local x curds;
 %if &flavour=SAS %then %do;
   data _null_;
-    file &fref;
+    file &fref mod;
+    put "/* SAS Flavour DDL for %upcase(&libref).&curds */";
     put "proc sql;";
   run;
   %do x=1 %to %sysfunc(countw(&dsnlist));
@@ -2545,23 +2625,34 @@ run;
       lab=" label="!!quote(trim(label));
       if notnull='yes' then notnul=' not null';
       put name type len fmt notnul lab;
-      if last then put ');';
     run;
 
+    /* Extra step for data constraints */
+    %addConst()
+
     data _null_;
-      length ds $128;
+      file &fref mod;
-      set &idxinfo (where=(memname="&curds")) end=last;
+      put ');';
+    run;
+  
+    /* Create Unique Indexes, but only if they were not already defined within the Constraints section. */
+    data _null_;
+      *length ds $128;
+      set &idxinfo (where=(memname="&curds" and unique='yes' and indxname not in (%sysfunc(tranwrd("&constraints_used",%str( ),%str(","))))));
       file &fref mod;
       by idxusage indxname;
-      if unique='yes' then uniq=' unique';
+/*       ds=cats(libname,'.',memname); */
-      ds=cats(libname,'.',memname);
       if first.indxname then do;
-        put 'create ' uniq ' index ' indxname;
+          put 'CREATE UNIQUE INDEX ' indxname "ON &libref..&curds (" ;
-        put '  on ' ds '(' name @@;
+          put '  ' name ;
+      end;
+      else put '  ,' name ;
+      *else put '    ,' name ;
+      if last.indxname then do;
+        put ');';
       end;
-      else put ',' name @@;
-      if last.indxname then put ');';
     run;
+
 /*
     ods output IntegrityConstraints=ic;
     proc contents data=testali out2=info;
@@ -2582,7 +2673,7 @@ run;
     %let curds=%scan(&dsnlist,&x);
     data _null_;
       file &fref mod;
-      put "/* DDL for &schema..&curds */";
+      put "/* TSQL Flavour DDL for &schema..&curds */";
     data _null_;
       file &fref mod;
       set &colinfo (where=(upcase(memname)="&curds")) end=last;
@@ -2605,31 +2696,30 @@ run;
       else if length le 8000 then fmt='[varchar]('!!cats(length)!!')';
       else fmt=cats('[varchar](max)');
       if notnull='yes' then notnul=' NOT NULL';
-      put name fmt notnul;
+      put "[" name +(-1) "]" fmt notnul;
     run;
+
+    /* Extra step for data constraints */
+    %addConst()
+
+    /* Create Unique Indexes, but only if they were not already defined within the Constraints section. */
     data _null_;
-      length ds $128;
+      *length ds $128;
-      set &idxinfo (where=(memname="&curds"));
+      set &idxinfo (where=(memname="&curds" and unique='yes' and indxname not in (%sysfunc(tranwrd("&constraints_used",%str( ),%str(","))))));
       file &fref mod;
       by idxusage indxname;
-      if unique='yes' then uniq=' unique';
+      *ds=cats(libname,'.',memname);
-      ds=cats(libname,'.',memname);
       if first.indxname then do;
-        if unique='yes' and nomiss='yes' then do;
-          put '  ,constraint [' indxname '] PRIMARY KEY';
-        end;
-        else if unique='yes' then do;
         /* add nonclustered in case of multiple unique indexes */
-          put '  ,index [' indxname '] UNIQUE NONCLUSTERED';
+        put '   ,index [' indxname +(-1) '] UNIQUE NONCLUSTERED (';
+        put '     [' name +(-1) ']';
       end;
-        put '  (';
+      else put '     ,[' name +(-1) ']';
-        put '    [' name ']';
-      end;
-      else put '    ,[' name ']';
       if last.indxname then do;
         put '   )';
       end;
     run;
+
     data _null_;
       file &fref mod;
       put ')';
@@ -2661,7 +2751,9 @@ run;
     from dictionary.libnames
     where libname="&libref" and engine='POSTGRES';
   %let schema=%sysfunc(coalescec(&schemaactual,&schema,&libref));
-
+  data _null_;
+    file &fref mod;
+    put "CREATE SCHEMA &schema;";
   %do x=1 %to %sysfunc(countw(&dsnlist));
     %let curds=%scan(&dsnlist,&x);
     data _null_;
@@ -2689,34 +2781,37 @@ run;
       else if type='num' then fmt=' DOUBLE PRECISION';
       else fmt='VARCHAR('!!cats(length)!!')';
       if notnull='yes' then notnul=' NOT NULL';
-      put name fmt notnul;
+      /* quote column names in case they represent reserved words */
-    run;
+      name2=quote(trim(name));
-    data _null_;
+      put name2 fmt notnul;
-      length ds $128;
-      set &idxinfo (where=(memname="&curds"));
-      file &fref mod;
-      by idxusage indxname;
-      if unique='yes' then uniq=' unique';
-      ds=cats(libname,'.',memname);
-      if first.indxname then do;
-        if unique='yes' and nomiss='yes' then do;
-          put '  ,PRIMARY KEY ';
-        end;
-        else if unique='yes' then do;
-          /* add nonclustered in case of multiple unique indexes */
-          put '  ,UNIQUE ';
-        end;
-        put '  (' name ;
-      end;
-      else put '    ,' name ;
-      if last.indxname then do;
-        put '  )';
-      end;
     run;
+
+    /* Extra step for data constraints */
+    %addConst()
+
     data _null_;
       file &fref mod;
       put ');';
     run;
+
+    /* Create Unique Indexes, but only if they were not already defined within the Constraints section. */
+    data _null_;
+      *length ds $128;
+      set &idxinfo (where=(memname="&curds" and unique='yes' and indxname not in (%sysfunc(tranwrd("&constraints_used",%str( ),%str(","))))));
+      file &fref mod;
+      by idxusage indxname;
+/*       ds=cats(libname,'.',memname); */
+      if first.indxname then do;
+          put 'CREATE UNIQUE INDEX "' indxname +(-1) '" ' "ON &schema..&curds (" ;
+          put '  "' name +(-1) '"' ;
+      end;
+      else put '  ,"' name +(-1) '"';
+      *else put '    ,' name ;
+      if last.indxname then do;
+        put ');';
+      end;
+    run;
+
   %end;
 %end;
 %if &showlog=YES %then %do;
@@ -2728,8 +2823,7 @@ run;
   run;
 %end;
 
-%mend;
+%mend;/**
-/**
   @file mp_getmaxvarlengths.sas
   @brief Scans a dataset to find the max length of the variable values
   @details  
@@ -3877,6 +3971,7 @@ proc sql
   %end;
 %end;
 %else %if &contentype=EXCEL %then %do;
+  /* suitable for XLS format */
   %if &platform=SASMETA %then %do;
     data _null_;
       rc=stpsrv_header('Content-type','application/vnd.ms-excel');
@@ -3889,6 +3984,19 @@ proc sql
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
+%else %if &contentype=XLSX %then %do;
+  %if &platform=SASMETA %then %do;
+    data _null_;
+      rc=stpsrv_header('Content-type','application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+      rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
+    run;
+  %end;
+  %else %if &platform=SASVIYA %then %do;
+    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
+      contenttype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' 
+      contentdisp="attachment; filename=&outname";
+  %end;
+%end;
 %else %if &contentype=TEXT %then %do;
   %if &platform=SASMETA %then %do;
     data _null_;
@@ -3928,64 +4036,6 @@ proc sql
 
 %mp_binarycopy(inloc="&inloc",outref=_webout)
 
-%mend;/**
-  @file mp_testwritespeedlibrary.sas
-  @brief Tests the write speed of a new table in a SAS library
-  @details Will create a new table of a certain size in an 
-  existing SAS library.  The table will have one column,
-  and will be subsequently deleted.
-      
-      %mp_testwritespeedlibrary(
-        lib=work
-        ,size=0.5
-        ,outds=work.results
-      )
-
-  @param lib= (WORK) The library in which to create the table
-  @param size= (0.1) The size in GB of the table to create
-  @param outds= (WORK.RESULTS) The output dataset to be created.
-
-  <h4> Dependencies </h4>
-  @li mf_getuniquename.sas
-  @li mf_existds.sas
-
-  @version 9.4
-  @author Allan Bowe
-
-**/
-
-%macro mp_testwritespeedlibrary(lib=WORK
-  ,outds=work.results
-  ,size=0.1
-)/*/STORE SOURCE*/;
-%local ds start;
-
-/* find an unused, unique name for the new table */
-%let ds=%mf_getuniquename();
-%do %until(%mf_existds(&lib..&ds)=0);
-  %let ds=%mf_getuniquename();
-%end;
-
-%let start=%sysfunc(datetime());
-
-data &lib..&ds(compress=no keep=x);
-  header=128*1024;
-  size=(1073741824/8 * &size) - header;
-  do x=1 to size;
-    output;
-  end;
-run;
-
-proc sql;
-drop table &lib..&ds;
-
-data &outds;
-  lib="&lib";
-  start_dttm=put(&start,datetime19.);
-  end_dttm=put(datetime(),datetime19.);
-  duration_seconds=end_dttm-start_dttm;
-run;
-
 %mend;/**
   @file mp_unzip.sas
   @brief Unzips a zip file
@@ -8086,6 +8136,72 @@ run;
 
 %mend;
 /**
+  @file mm_gettableid.sas
+  @brief Get the metadata id for a particular table
+  @details Provide a libref and table name to return the corresponding metadata id
+  in an output datataset.
+
+  Usage:
+
+      - get a table id
+      %mm_gettableid(libref=METALIB,ds=SOMETABLE,outds=iwant)
+
+  @param libref= The libref to search
+  @param ds= The input dataset to check
+  @param outds= the dataset to create that contains the `tableuri`
+  @param mDebug= set to 1 to show debug messages in the log
+
+  @returns outds  dataset containing `tableuri` and `tablename`
+
+  @version 9.3
+  @author Allan Bowe
+
+**/
+
+%macro mm_gettableid(
+     libref=
+    ,ds=
+    ,outds=work.mm_gettableid
+    ,mDebug=0
+)/*/STORE SOURCE*/;
+
+%local mD;
+%if &mDebug=1 %then %let mD=;
+%else %let mD=%str(*);
+%&mD.put Executing &sysmacroname..sas;
+%&mD.put _local_;
+
+data &outds;
+  length uri usingpkguri id type tableuri tablename tmpuri $256;
+  call missing(of _all_);
+  keep tableuri tablename;
+  n=1;
+  rc=0;
+  if metadata_getnobj("omsobj:SASLibrary?@Libref='&libref'",n,uri)<1 then do;
+    put "Library &libref not found";
+    stop;
+  end;
+  &mD.putlog "uri is " uri;
+  if metadata_getnasn(uri, "UsingPackages", 1, usingpkguri)>0 then do;
+    rc=metadata_resolve(usingpkguri,type,id);
+    &mD.putlog "Type is " type;
+  end;
+
+  if type='DatabaseSchema' then tmpuri=usingpkguri;
+  else tmpuri=uri;
+  
+  t=1;
+  do while(metadata_getnasn(tmpuri, "Tables", t, tableuri)>0);
+    t+1;
+    rc= metadata_getattr(tableuri, "Name", tablename);
+    &mD.putlog "Table is " tablename;
+    if upcase(tablename)="%upcase(&ds)" then do;
+      output;
+    end;
+  end;
+run;
+
+%mend;/**
   @file
   @brief Creates a dataset with all metadata tables for a particular library
   @details Will only show the tables to which a user has the requisite
@@ -9667,7 +9783,7 @@ options noquotelenmax;
     data _null_;
       set &libref1..links;
       if rel='createChild' then
-        call symputx('href',quote(trim(href)),'l');
+        call symputx('href',quote("&base_uri"!!trim(href)),'l');
     run;
   %end;
   %else %if &SYS_PROCHTTP_STATUS_CODE=404 %then %do;
@@ -9866,7 +9982,7 @@ libname &libref1 JSON fileref=&fname1;
 
 data _null_;
   set &libref1..links;
-  if rel='members' then call symputx('membercheck',quote(trim(href)),'l');
+  if rel='members' then call symputx('membercheck',quote("&base_uri"!!trim(href)),'l');
   else if rel='self' then call symputx('parentFolderUri',href,'l');
 run;
 data _null_;
@@ -10332,7 +10448,7 @@ proc http method='POST'
     in=&fname3
     out=&fname4
     &oauth_bearer
-    url="/jobDefinitions/definitions?parentFolderUri=&parentFolderUri";
+    url="&base_uri/jobDefinitions/definitions?parentFolderUri=&parentFolderUri";
     headers 'Content-Type'='application/vnd.sas.job.definition+json'
   %if &grant_type=authorization_code %then %do;
             "Authorization"="Bearer &&&access_token_var"
@@ -10626,7 +10742,7 @@ run;
 libname &libref1 JSON fileref=&fname1;
 data _null_;
   set &libref1..links;
-  if rel='members' then call symputx('mref',quote(trim(href)),'l');
+  if rel='members' then call symputx('mref',quote("&base_uri"!!trim(href)),'l');
 run;
 
 /* get the children */
@@ -10648,7 +10764,7 @@ libname &libref1a JSON fileref=&fname1a;
 data _null_;
   set &libref1a..items;
   if contenttype='jobDefinition' and upcase(name)="%upcase(&name)" then do;
-    call symputx('uri',uri,'l');
+    call symputx('uri',cats("&base_uri",uri),'l');
     call symputx('found',1,'l');
   end;
 run;

base/mf_getplatform.sas

@@ -12,6 +12,7 @@
 
   <h4> Dependencies </h4>
   @li mf_mval.sas
+  @li mf_trimstr.sas
 
   @version 9.4 / 3.4
   @author Allan Bowe
@@ -57,6 +58,6 @@
   %else 0;
 %end;
 %else %if &switch=VIYARESTAPI %then %do;
-  %sysfunc(getoption(servicesbaseurl))
+  %mf_trimstr(%sysfunc(getoption(servicesbaseurl)),/)
 %end;
 %mend;

base/mf_trimstr.sas

@@ -0,0 +1,39 @@
+/**
+  @file mf_trimstr.sas
+  @brief Removes character(s) from the end, if they exist
+  @details If the designated characters exist at the end of the string, they 
+  are removed
+
+        %put %mf_trimstr(/blah/,/); * /blah;
+        %put %mf_trimstr(/blah/,h); * /blah/;
+        %put %mf_trimstr(/blah/,h/); */bla;
+
+  <h4> Dependencies </h4>
+
+
+  @param basestr The string to be modified
+  @param trimstr The string to be removed from the end of `basestr`, if it exists
+
+  @return output returns result with the value of `trimstr` removed from the end
+
+
+  @version 9.2
+  @author Allan Bowe
+
+**/
+
+%macro mf_trimstr(basestr,trimstr);
+%local trimlen trimval;
+%let trimlen=%length(%superq(trimstr));
+%let trimval=%qsubstr(%superq(basestr)
+  ,%length(%superq(basestr))-&trimlen+1
+  ,&trimlen);
+
+%if %superq(trimval)=%superq(trimstr) %then %do;
+  %qsubstr(%superq(basestr),1,%length(%superq(basestr))-&trimlen)
+%end;
+%else %do;
+  &basestr
+%end;
+
+%mend;

base/mp_getddl.sas

@@ -68,18 +68,30 @@ create table _data_ as
   separated by ' '
   from &syslast
 ;
-quit;
+
+create table _data_ as
+  select * from dictionary.indexes
+  where upcase(libname)="%upcase(&libref)"
+  %if %length(&ds)>0 %then %do;
+    and upcase(memname)="%upcase(&ds)"
+  %end;
+  order by idxusage, indxname, indxpos
+  ;
+%local idxinfo; %let idxinfo=&syslast;
 
 /* Extract all Primary Key and Unique data constraints */
 %mp_getconstraints(lib=%upcase(&libref),ds=%upcase(&ds),outds=_data_)
 %local colconst; %let colconst=&syslast;
 
 %macro addConst();
+  %global constraints_used;
   data _null_;
-      length ctype $11;
+    length ctype $11 constraint_name_orig $256 constraints_used $5000;
     set &colconst (where=(table_name="&curds" and constraint_type in ('PRIMARY','UNIQUE'))) end=last;
     file &fref mod;
     by constraint_type constraint_name;
+    retain constraints_used;
+    constraint_name_orig=constraint_name;
     if upcase(strip(constraint_type)) = 'PRIMARY' then ctype='PRIMARY KEY';
     else ctype=strip(constraint_type);
     %if &flavour=TSQL %then %do;
@@ -91,12 +103,17 @@ quit;
       constraint_name=catt('"',constraint_name,'"');
     %end;
     if first.constraint_name then do;
+      constraints_used = catx(' ', constraints_used, constraint_name_orig);
       put "   ,CONSTRAINT " constraint_name ctype "(" ;
       put '     ' column_name;
     end;
   else put '     ,' column_name;
-	  if last.constraint_name then put "   )";
+  if last.constraint_name then do;
+    put "   )";
+    call symput('constraints_used',strip(constraints_used));
+  end;
   run;
+  %put &=constraints_used;
 %mend;
 
 data _null_;
@@ -108,13 +125,13 @@ run;
 %if &flavour=SAS %then %do;
   data _null_;
     file &fref mod;
+    put "/* SAS Flavour DDL for %upcase(&libref).&curds */";
     put "proc sql;";
   run;
   %do x=1 %to %sysfunc(countw(&dsnlist));
     %let curds=%scan(&dsnlist,&x);
     data _null_;
       file &fref mod;
-      if _n_ eq 1 then put "/* SAS Flavour DDL for %upcase(&libref).&curds */";
       length nm lab $1024;
       set &colinfo (where=(upcase(memname)="&curds")) end=last;
 
@@ -142,6 +159,25 @@ run;
       file &fref mod;
       put ');';
     run;
+  
+    /* Create Unique Indexes, but only if they were not already defined within the Constraints section. */
+    data _null_;
+      *length ds $128;
+      set &idxinfo (where=(memname="&curds" and unique='yes' and indxname not in (%sysfunc(tranwrd("&constraints_used",%str( ),%str(","))))));
+      file &fref mod;
+      by idxusage indxname;
+/*       ds=cats(libname,'.',memname); */
+      if first.indxname then do;
+          put 'CREATE UNIQUE INDEX ' indxname "ON &libref..&curds (" ;
+          put '  ' name ;
+      end;
+      else put '  ,' name ;
+      *else put '    ,' name ;
+      if last.indxname then do;
+        put ');';
+      end;
+    run;
+
 /*
     ods output IntegrityConstraints=ic;
     proc contents data=testali out2=info;
@@ -191,6 +227,24 @@ run;
     /* Extra step for data constraints */
     %addConst()
 
+    /* Create Unique Indexes, but only if they were not already defined within the Constraints section. */
+    data _null_;
+      *length ds $128;
+      set &idxinfo (where=(memname="&curds" and unique='yes' and indxname not in (%sysfunc(tranwrd("&constraints_used",%str( ),%str(","))))));
+      file &fref mod;
+      by idxusage indxname;
+      *ds=cats(libname,'.',memname);
+      if first.indxname then do;
+        /* add nonclustered in case of multiple unique indexes */
+        put '   ,index [' indxname +(-1) '] UNIQUE NONCLUSTERED (';
+        put '     [' name +(-1) ']';
+      end;
+      else put '     ,[' name +(-1) ']';
+      if last.indxname then do;
+        put '   )';
+      end;
+    run;
+
     data _null_;
       file &fref mod;
       put ')';
@@ -222,7 +276,9 @@ run;
     from dictionary.libnames
     where libname="&libref" and engine='POSTGRES';
   %let schema=%sysfunc(coalescec(&schemaactual,&schema,&libref));
-
+  data _null_;
+    file &fref mod;
+    put "CREATE SCHEMA &schema;";
   %do x=1 %to %sysfunc(countw(&dsnlist));
     %let curds=%scan(&dsnlist,&x);
     data _null_;
@@ -250,7 +306,9 @@ run;
       else if type='num' then fmt=' DOUBLE PRECISION';
       else fmt='VARCHAR('!!cats(length)!!')';
       if notnull='yes' then notnul=' NOT NULL';
-      put name fmt notnul;
+      /* quote column names in case they represent reserved words */
+      name2=quote(trim(name));
+      put name2 fmt notnul;
     run;
 
     /* Extra step for data constraints */
@@ -261,6 +319,24 @@ run;
       put ');';
     run;
 
+    /* Create Unique Indexes, but only if they were not already defined within the Constraints section. */
+    data _null_;
+      *length ds $128;
+      set &idxinfo (where=(memname="&curds" and unique='yes' and indxname not in (%sysfunc(tranwrd("&constraints_used",%str( ),%str(","))))));
+      file &fref mod;
+      by idxusage indxname;
+/*       ds=cats(libname,'.',memname); */
+      if first.indxname then do;
+          put 'CREATE UNIQUE INDEX "' indxname +(-1) '" ' "ON &schema..&curds (" ;
+          put '  "' name +(-1) '"' ;
+      end;
+      else put '  ,"' name +(-1) '"';
+      *else put '    ,' name ;
+      if last.indxname then do;
+        put ');';
+      end;
+    run;
+
   %end;
 %end;
 %if &showlog=YES %then %do;

base/mp_streamfile.sas

@@ -47,6 +47,7 @@
   %end;
 %end;
 %else %if &contentype=EXCEL %then %do;
+  /* suitable for XLS format */
   %if &platform=SASMETA %then %do;
     data _null_;
       rc=stpsrv_header('Content-type','application/vnd.ms-excel');
@@ -59,6 +60,19 @@
       contentdisp="attachment; filename=&outname";
   %end;
 %end;
+%else %if &contentype=XLSX %then %do;
+  %if &platform=SASMETA %then %do;
+    data _null_;
+      rc=stpsrv_header('Content-type','application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
+      rc=stpsrv_header('Content-disposition',"attachment; filename=&outname");
+    run;
+  %end;
+  %else %if &platform=SASVIYA %then %do;
+    filename _webout filesrvc parenturi="&SYS_JES_JOB_URI" name='_webout.xls'
+      contenttype='application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' 
+      contentdisp="attachment; filename=&outname";
+  %end;
+%end;
 %else %if &contentype=TEXT %then %do;
   %if &platform=SASMETA %then %do;
     data _null_;

meta/mm_gettableid.sas

@@ -0,0 +1,67 @@
+/**
+  @file mm_gettableid.sas
+  @brief Get the metadata id for a particular table
+  @details Provide a libref and table name to return the corresponding metadata id
+  in an output datataset.
+
+  Usage:
+
+      - get a table id
+      %mm_gettableid(libref=METALIB,ds=SOMETABLE,outds=iwant)
+
+  @param libref= The libref to search
+  @param ds= The input dataset to check
+  @param outds= the dataset to create that contains the `tableuri`
+  @param mDebug= set to 1 to show debug messages in the log
+
+  @returns outds  dataset containing `tableuri` and `tablename`
+
+  @version 9.3
+  @author Allan Bowe
+
+**/
+
+%macro mm_gettableid(
+     libref=
+    ,ds=
+    ,outds=work.mm_gettableid
+    ,mDebug=0
+)/*/STORE SOURCE*/;
+
+%local mD;
+%if &mDebug=1 %then %let mD=;
+%else %let mD=%str(*);
+%&mD.put Executing &sysmacroname..sas;
+%&mD.put _local_;
+
+data &outds;
+  length uri usingpkguri id type tableuri tablename tmpuri $256;
+  call missing(of _all_);
+  keep tableuri tablename;
+  n=1;
+  rc=0;
+  if metadata_getnobj("omsobj:SASLibrary?@Libref='&libref'",n,uri)<1 then do;
+    put "Library &libref not found";
+    stop;
+  end;
+  &mD.putlog "uri is " uri;
+  if metadata_getnasn(uri, "UsingPackages", 1, usingpkguri)>0 then do;
+    rc=metadata_resolve(usingpkguri,type,id);
+    &mD.putlog "Type is " type;
+  end;
+
+  if type='DatabaseSchema' then tmpuri=usingpkguri;
+  else tmpuri=uri;
+  
+  t=1;
+  do while(metadata_getnasn(tmpuri, "Tables", t, tableuri)>0);
+    t+1;
+    rc= metadata_getattr(tableuri, "Name", tablename);
+    &mD.putlog "Table is " tablename;
+    if upcase(tablename)="%upcase(&ds)" then do;
+      output;
+    end;
+  end;
+run;
+
+%mend;

viya/mv_createfolder.sas

@@ -96,7 +96,7 @@ options noquotelenmax;
     data _null_;
       set &libref1..links;
       if rel='createChild' then
-        call symputx('href',quote(trim(href)),'l');
+        call symputx('href',quote("&base_uri"!!trim(href)),'l');
     run;
   %end;
   %else %if &SYS_PROCHTTP_STATUS_CODE=404 %then %do;

viya/mv_createwebservice.sas

@@ -143,7 +143,7 @@ libname &libref1 JSON fileref=&fname1;
 
 data _null_;
   set &libref1..links;
-  if rel='members' then call symputx('membercheck',quote(trim(href)),'l');
+  if rel='members' then call symputx('membercheck',quote("&base_uri"!!trim(href)),'l');
   else if rel='self' then call symputx('parentFolderUri',href,'l');
 run;
 data _null_;
@@ -609,7 +609,7 @@ proc http method='POST'
     in=&fname3
     out=&fname4
     &oauth_bearer
-    url="/jobDefinitions/definitions?parentFolderUri=&parentFolderUri";
+    url="&base_uri/jobDefinitions/definitions?parentFolderUri=&parentFolderUri";
     headers 'Content-Type'='application/vnd.sas.job.definition+json'
   %if &grant_type=authorization_code %then %do;
             "Authorization"="Bearer &&&access_token_var"

viya/mv_deletejes.sas

@@ -95,7 +95,7 @@ run;
 libname &libref1 JSON fileref=&fname1;
 data _null_;
   set &libref1..links;
-  if rel='members' then call symputx('mref',quote(trim(href)),'l');
+  if rel='members' then call symputx('mref',quote("&base_uri"!!trim(href)),'l');
 run;
 
 /* get the children */
@@ -117,7 +117,7 @@ libname &libref1a JSON fileref=&fname1a;
 data _null_;
   set &libref1a..items;
   if contenttype='jobDefinition' and upcase(name)="%upcase(&name)" then do;
-    call symputx('uri',uri,'l');
+    call symputx('uri',cats("&base_uri",uri),'l');
     call symputx('found',1,'l');
   end;
 run;