Merge pull request #248 from sasjs/mm_createdataset_update

fix: cater for case of zero cols in mm_createdataset.sas

all.sas

@@ -2269,8 +2269,8 @@ Usage:
     %end;
   %end;
 
-  /* Stored Process Server web app context */
-  %if %symexist(_METAFOLDER)
+  /* Web App Context */
+  %if %symexist(_PROGRAM)
     or "&SYSPROCESSNAME "="Compute Server "
     or &mode=INCLUDE
   %then %do;
@@ -13801,18 +13801,17 @@ run;
 
 
 %mend mm_createapplication;/**
-  @file mm_createdataset.sas
-  @brief Create a dataset from a metadata definition
+  @file
+  @brief Create an empty dataset from a metadata definition
   @details This macro was built to support viewing empty tables in
-    https://datacontroller.io - a free evaluation copy is available by
-    contacting the author (Allan Bowe).
+  https://datacontroller.io
 
   The table can be retrieved using LIBRARY.DATASET reference, or directly
   using the metadata URI.
 
   The dataset is written to the WORK library.
 
-  usage:
+  Usage:
 
       %mm_createdataset(libds=metlib.some_dataset)
 
@@ -13828,9 +13827,9 @@ run;
   @param libds= library.dataset metadata source.  Note - table names in metadata
     can be longer than 32 chars (just fyi, not an issue here)
   @param tableuri= Metadata URI of the table to be created
-  @param outds= The dataset to create, default is `work.mm_createdataset`.
-    The table name needs to be 32 chars or less as per SAS naming rules.
-  @param mdebug= set DBG to 1 to disable DEBUG messages
+  @param outds= (work.mm_createdataset) The dataset to create.  The table name
+    needs to be 32 chars or less as per SAS naming rules.
+  @param mdebug= (0) Set to 1 to enable DEBUG messages
 
   @version 9.4
   @author Allan Bowe
@@ -13856,14 +13855,23 @@ run;
   %mm_gettables(uri=&liburi,outds=&tempds2)
   data _null_;
     set &tempds2;
-    if upcase(tablename)="%upcase(%scan(&libds,2,.))";
+    where upcase(tablename)="%upcase(%scan(&libds,2,.))";
+    &dbg putlog tableuri=;
     call symputx('tableuri',tableuri);
   run;
 %end;
 
-data;run;%let tempds3=&syslast;
+data;run;
+%let tempds3=&syslast;
 %mm_getcols(tableuri=&tableuri,outds=&tempds3)
 
+%if %mf_nobs(&tempds3)=0 %then %do;
+  %put &libds (&tableuri) has no columns defined!!;
+  data &outds;
+  run;
+  %return;
+%end;
+
 data _null_;
   set &tempds3 end=last;
   if _n_=1 then call execute('data &outds;');
@@ -26841,7 +26849,8 @@ endsub;
   @file mx_createwebservice.sas
   @brief Create a web service in SAS 9, Viya or SASjs
   @details Creates a SASJS ready Stored Process in SAS 9, a Job Execution
-  Service in SAS Viya, and a Stored Program on SASjs Server
+  Service in SAS Viya, or a Stored Program on SASjs Server - depending on the
+  executing environment.
 
 Usage:
 
@@ -26863,7 +26872,9 @@ Usage:
         %webout(OBJ,example2) * Object format, easier to work with ;
         %webout(CLOSE)
     ;;;;
-    %mp_createwebservice(path=/Public/app/common,name=appInit,replace=YES)
+
+    %* create the service (including webout macro and dependencies);
+    %mx_createwebservice(path=/Public/app/common,name=appInit,replace=YES)
 
   <h4> SAS Macros </h4>
   @li mf_getplatform.sas
@@ -26882,7 +26893,6 @@ Usage:
     location
   @param [in] mDebug= (0) set to 1 to show debug messages in the log
 
-  @version 9.2
   @author Allan Bowe
 
 **/

base/mp_abort.sas

@@ -84,8 +84,8 @@
     %end;
   %end;
 
-  /* Stored Process Server web app context */
-  %if %symexist(_METAFOLDER)
+  /* Web App Context */
+  %if %symexist(_PROGRAM)
     or "&SYSPROCESSNAME "="Compute Server "
     or &mode=INCLUDE
   %then %do;

main.dox

@@ -18,7 +18,17 @@
     statements.  Those starting `mp_` are macro _procedures_, which generate
     SAS statements, and must therefore be applied accordingly.
 
- */
+*/
+
+/*! \dir ddl
+ *  \brief Data Definition Language files
+ *  \details Provides templates for commonly used tables in sasjs/core.
+    Attributes:
+
+        * OS independent
+        * No X command
+        * Prefixes: _mddl_
+*/
 
 /*! \dir fcmp
  *  \brief Macros for generating FCMP functions
@@ -94,15 +104,28 @@
 
 */
 
-/*! \dir ddl
- *  \brief Data Definition Language files
- *  \details Provides templates for commonly used tables in sasjs/core.
-   Attributes:
+/*! \dir tests/base
+ *  \brief Tests for Base macros
+ */
 
-        * OS independent
-        * No X command
-        * Prefixes: _mddl_
+/*! \dir tests/ddlonly
+ *  \brief Tests for DDL macros
+ */
 
+/*! \dir tests/sas9only
+ *  \brief Tests for SAS Metadata macros
+ */
+
+/*! \dir tests/serveronly
+ *  \brief Tests for SASjs Server macros
+ */
+
+/*! \dir tests/viyaonly
+ *  \brief Tests for Viya macros
+ */
+
+/*! \dir tests/x-platform
+ *  \brief Tests for cross-platform macros
  */
 
 /*! \dir xplatform

meta/mm_createdataset.sas

@@ -1,16 +1,15 @@
 /**
-  @file mm_createdataset.sas
-  @brief Create a dataset from a metadata definition
+  @file
+  @brief Create an empty dataset from a metadata definition
   @details This macro was built to support viewing empty tables in
-    https://datacontroller.io - a free evaluation copy is available by
-    contacting the author (Allan Bowe).
+  https://datacontroller.io
 
   The table can be retrieved using LIBRARY.DATASET reference, or directly
   using the metadata URI.
 
   The dataset is written to the WORK library.
 
-  usage:
+  Usage:
 
       %mm_createdataset(libds=metlib.some_dataset)
 
@@ -26,9 +25,9 @@
   @param libds= library.dataset metadata source.  Note - table names in metadata
     can be longer than 32 chars (just fyi, not an issue here)
   @param tableuri= Metadata URI of the table to be created
-  @param outds= The dataset to create, default is `work.mm_createdataset`.
-    The table name needs to be 32 chars or less as per SAS naming rules.
-  @param mdebug= set DBG to 1 to disable DEBUG messages
+  @param outds= (work.mm_createdataset) The dataset to create.  The table name
+    needs to be 32 chars or less as per SAS naming rules.
+  @param mdebug= (0) Set to 1 to enable DEBUG messages
 
   @version 9.4
   @author Allan Bowe
@@ -54,14 +53,23 @@
   %mm_gettables(uri=&liburi,outds=&tempds2)
   data _null_;
     set &tempds2;
-    if upcase(tablename)="%upcase(%scan(&libds,2,.))";
+    where upcase(tablename)="%upcase(%scan(&libds,2,.))";
+    &dbg putlog tableuri=;
     call symputx('tableuri',tableuri);
   run;
 %end;
 
-data;run;%let tempds3=&syslast;
+data;run;
+%let tempds3=&syslast;
 %mm_getcols(tableuri=&tableuri,outds=&tempds3)
 
+%if %mf_nobs(&tempds3)=0 %then %do;
+  %put &libds (&tableuri) has no columns defined!!;
+  data &outds;
+  run;
+  %return;
+%end;
+
 data _null_;
   set &tempds3 end=last;
   if _n_=1 then call execute('data &outds;');

sasjs/sasjsconfig.json

@@ -8,8 +8,8 @@
     "server",
     "xplatform",
     "tests/base",
-    "tests/ddl",
-    "tests/xplatform"
+    "tests/ddlonly",
+    "tests/x-platform"
   ],
   "docConfig": {
     "displayMacroCore": false,

xplatform/mx_createwebservice.sas

@@ -2,7 +2,8 @@
   @file mx_createwebservice.sas
   @brief Create a web service in SAS 9, Viya or SASjs
   @details Creates a SASJS ready Stored Process in SAS 9, a Job Execution
-  Service in SAS Viya, and a Stored Program on SASjs Server
+  Service in SAS Viya, or a Stored Program on SASjs Server - depending on the
+  executing environment.
 
 Usage:
 
@@ -24,7 +25,9 @@ Usage:
         %webout(OBJ,example2) * Object format, easier to work with ;
         %webout(CLOSE)
     ;;;;
-    %mp_createwebservice(path=/Public/app/common,name=appInit,replace=YES)
+
+    %* create the service (including webout macro and dependencies);
+    %mx_createwebservice(path=/Public/app/common,name=appInit,replace=YES)
 
   <h4> SAS Macros </h4>
   @li mf_getplatform.sas
@@ -43,7 +46,6 @@ Usage:
     location
   @param [in] mDebug= (0) set to 1 to show debug messages in the log
 
-  @version 9.2
   @author Allan Bowe
 
 **/