Add SQL mode

Author: ibmmqmet

.gitignore

@@ -7,7 +7,8 @@ src/convH
 src/mqsmfcsv
 src/Bip*
 csq*
-/src/t2
-/src/t3
+/src/t*
 /testing/data/SMF*
 /tmp/*
+/src2/*
+/src.bak/*

README.md

@@ -29,13 +29,23 @@ thoughts on possible enhancements to the code or this repository.
 
 History
 =======
-March 2016 - Initial release
-April 2016 - Update to support MQ V9 pageset statistics
-             Improved formatting for import to Access
-             Fixed some mis-labelled columns
-June  2016 - Add the "hidden" WTASCORR field
-             Print the buildtime to help know what version is in use
-             Clearer printing of which records were unrecognised
+March 2016 (v1.0)
+* Initial release
+
+April 2016 (v1.1)
+* Update to support MQ V9 pageset statistics
+* Improved formatting for import to Access
+* Fixed some mis-labelled columns
+
+June 2016 (v1.1.1)
+* Add the "hidden" WTASCORR field
+* Print the buildtime to help know what version is in use
+* Clearer printing of which records were unrecognised
+
+June 2016 (v1.1.2)
+* Add SQL mode to generate DDL corresponding to column headings
+* printWQ now has more descriptive column names
+
 
 Pull requests
 =============

bin/aix/convH

@@ -3,6 +3,7 @@ CC=i686-w64-mingw32-gcc
 CFLAGS= -I. -m32
 PLATFLAGS=
 SRC = mqsmf.c \
+      smfDDL.c \
       smfDate.c \
       smfConv.c \
       printDEBUG.c \

bin/aix/mqsmfcsv

@@ -1,8 +1,9 @@
 
 CC=cc
-CFLAGS= -I. 
+CFLAGS= -I.
 PLATFLAGS=
 SRC = mqsmf.c \
+      smfDDL.c \
       smfDate.c \
       smfConv.c \
       printDEBUG.c \

bin/linux/convH

@@ -1,5 +1,6 @@
 CFLAGS=-nologo /D_CRT_SECURE_NO_WARNINGS /Zp1 /J
 SRC = mqsmf.c \
+      smfDDL.c \
       smfDate.c \
       smfConv.c \
       printDEBUG.c \

bin/linux/mqsmfcsv

@@ -77,6 +77,7 @@ static void Usage();
 int   debugLevel = 0;
 BOOL  addEquals = TRUE;
 BOOL  printHeaders = TRUE;
+BOOL  sqlMode = FALSE;
 commonFields_t commonF = {0};
 
 char headings[HEADINGS_LEN];  /* Ensure these are big enough for any line */
@@ -165,7 +166,7 @@ int main( int argc, char *argv[] )
   /* Parse command-line parameters                                  */
   /******************************************************************/
   printf("MQ SMF CSV - Build %s %s\n",__DATE__,__TIME__);
-  while((c = mqgetopt(argc, argv, "ad:h:i:m:o:rt:")) != EOF)
+  while((c = mqgetopt(argc, argv, "ad:h:i:m:o:rst:")) != EOF)
   {
     switch(c)
     {
@@ -193,6 +194,11 @@ int main( int argc, char *argv[] )
       case 'r':
         addEquals = 0;
         break;
+      case 's':
+        sqlMode = TRUE;
+        printHeaders = FALSE;
+        addEquals = 0;
+        break;
       case 't':
         ticker     = atoi(mqoptarg);
         break;
@@ -851,6 +857,7 @@ static void Usage(void)
   printf("  -m <Max records> End after formatting M records. Default to process all.\n");
   printf("  -o <Directory>   Where to put output files. Default to current directory.\n");
   printf("  -r               Do not print '=' on numeric-looking strings.\n");
+  printf("  -s               SQL mode - generate DDL for tables.\n");
   printf("  -t <Ticker>      Print progress message every T records.\n");
   return;
 }

bin/win/convH.exe

@@ -151,6 +151,10 @@ extern void printWQ    (wq   *);
 extern void printWTAS  (wtas *);
 extern void printWTID  (wtid *);
 
+extern void openDDL    (char *);
+extern void closeDDL   (void);
+extern void printDDL   (char *,int, int);
+
 
 /*******************************************************/
 /* Windows has some efficient macros to reverse bytes. */
@@ -206,6 +210,12 @@ extern char *strMQCHLD  (int v);
 #define HEADINGS_LEN (20000)
 #define DATA_LEN     (20000)
 
+#define DDL_I        (1)
+#define DDL_I64      (2)
+#define DDL_C        (3)
+#define DDL_SUS      (4)
+#define DDL_DATETIME (5)
+
 /**********************************************************/
 /* Macros to build the printable lines for CSV output.    */
 /* Separate macros for each data type and when we need    */
@@ -223,7 +233,7 @@ extern char *strMQCHLD  (int v);
 /*     SMFPRINTSTOP;                                      */
 /*   }                                                    */
 /**********************************************************/
-#define ADDHEAD(h) \
+#define ADDHEAD(h,type,len) \
   if (first && h)  \
   {                \
     offsetH += snprintf(&headings[offsetH],HEADINGS_LEN - offsetH, "%s,", h); \
@@ -232,6 +242,7 @@ extern char *strMQCHLD  (int v);
       printf("HEADINGS buffer needs to be bigger than %d bytes.\n",HEADINGS_LEN); \
       exit(1);                      \
     }                               \
+    printDDL(h,type,len); \
   }
 
 #define ADDDATA(fmt,...)  \
@@ -243,117 +254,123 @@ extern char *strMQCHLD  (int v);
   }
 
 #define ADDS64(h,v) \
-  ADDHEAD(h); \
+  ADDHEAD(h,DDL_I64,0); \
   ADDDATA("%lld,",conv64(v))
 
 #define ADDU64(h,v) \
-  ADDHEAD(h); \
+  ADDHEAD(h,DDL_I64,0); \
   ADDDATA("%llu,",conv64(v))
 
 #define ADDS64IDX(h,idx,v) \
   if (first) sprintf(tmpHead,"%s {%s}",h,idx); \
-  ADDHEAD(tmpHead); \
+  ADDHEAD(tmpHead,DDL_I64,0); \
   ADDDATA("%lld,",conv64(v))
 
 #define ADDU64IDX(h,idx,v) \
   if (first) sprintf(tmpHead,"%s {%s}",h,idx); \
-  ADDHEAD(tmpHead); \
+  ADDHEAD(tmpHead,DDL_I64,0); \
   ADDDATA("%llu,",conv64(v))
 
 #define ADDS32(h,v) \
-  ADDHEAD(h); \
+  ADDHEAD(h,DDL_I,0); \
   ADDDATA("%d,",conv32(v))
 
 #define ADDU32(h,v) \
-  ADDHEAD(h); \
+  ADDHEAD(h,DDL_I,0); \
   ADDDATA("%u,",conv32(v))
 
 #define ADDX32(h,v) \
-  ADDHEAD(h); \
+  ADDHEAD(h,DDL_I,0); \
   ADDDATA("%X,",conv32(v))
 
 #define ADDS32IDX(h,idx, v) \
   if (first) sprintf(tmpHead,"%s {%s}",h,idx); \
-  ADDHEAD(tmpHead); \
+  ADDHEAD(tmpHead,DDL_I,0); \
   ADDDATA("%d,",conv32(v))
 
 #define ADDU32IDX(h,idx, v) \
   if (first) sprintf(tmpHead,"%s {%s}",h,idx); \
-  ADDHEAD(tmpHead); \
+  ADDHEAD(tmpHead,DDL_I,0); \
   ADDDATA("%u,",conv32(v))
 
 #define ADDS16(h,v) \
-  ADDHEAD(h); \
+  ADDHEAD(h,DDL_I,0); \
   ADDDATA("%hd,",conv16(v))
 
 #define ADDU16(h,v) \
-  ADDHEAD(h); \
+  ADDHEAD(h,DDL_I,0); \
   ADDDATA("%hu,",conv16(v))
 
 #define ADDBYTE(h,v) \
-  ADDHEAD(h); \
+  ADDHEAD(h,DDL_I,0); \
   ADDDATA("%u,",(v))
 
 #define ADDTIME(h,v) \
-  sprintf(tmpHead,"%s(DATE),%s(TIME)",h,h); \
-  ADDHEAD(tmpHead); \
+  sprintf(tmpHead,"%s (DATE),%s (TIME)",h,h); \
+  ADDHEAD(tmpHead,DDL_DATETIME,0); \
   ADDDATA("%s,",convDate(v))
 
 #define ADDTIMEIDX(h,idx,v) \
-  sprintf(tmpHead,"%s{%s} (DATE),%s{%s}(TIME)",h,idx,h,idx); \
-  ADDHEAD(tmpHead); \
+  sprintf(tmpHead,"%s{%s} (DATE),%s{%s} (TIME)",h,idx,h,idx); \
+  ADDHEAD(tmpHead,DDL_DATETIME,0); \
   ADDDATA("%s,",convDate(v))
 
 #define ADDSTCK(h,v) \
   sprintf(tmpHead,"%s(S),%s(US)",h,h); \
-  ADDHEAD(tmpHead); \
+  ADDHEAD(tmpHead,DDL_SUS,0); \
   ADDDATA("%s,",convSecUSec(v))
 
 #define ADDSTCKIDX(h,idx,v) \
-  sprintf(tmpHead,"%s{%s} (S),%s{%s}(US)",h,idx,h,idx); \
-  ADDHEAD(tmpHead); \
+  sprintf(tmpHead,"%s{%s}(S),%s{%s}(US)",h,idx,h,idx); \
+  ADDHEAD(tmpHead,DDL_SUS,0); \
   ADDDATA("%s,",convSecUSec(v))
 
 /* Add ASCII string, known length - underpins the other ADDSTRxx macros */
-#define ADDSTRN(h,v,l) \
-  ADDHEAD(h); \
+#define ADDSTRN(h,v,l,maxlen) \
+  ADDHEAD(h,DDL_C,maxlen); \
   { char *equ=""; \
   if (looksLikeNum(l,v) && addEquals) equ="="; \
   ADDDATA("%s\"%-*.*s\",",equ,l,l,v) \
   }
 
-#define ADDSTR(h,v) \
-  ADDSTRN(h,v,strlen(v))                    /* ASCII string null terminated*/
+#define ADDSTR(h,v,maxlen) \
+  ADDSTRN(h,v,strlen(v),maxlen)             /* ASCII string null terminated*/
+
+#define ADDSTRB(h,v,len) \
+  ADDSTR(h,convBin(v,len),len*2+1)                         /* Binary string*/
 
 #define ADDSTRIDX(h,idx, v) \
   if (first) sprintf(tmpHead,"%s {%s}",h,idx); \
-  ADDSTRN(tmpHead,v,strlen(v))
+  ADDSTRN(tmpHead,v,strlen(v),)
 
 #define ADDSTREN(h,v,l) \
-  ADDSTRN(h,convStr(v,l),l)                  /* EBCDIC string, known length*/
+  ADDSTRN(h,convStr(v,l),l,l)                /* EBCDIC string, known length*/
 
 #define ADDSTRENIDX(h,idx, v,l) \
   if (first) sprintf(tmpHead,"%s {%s}",h,idx); \
   ADDSTREN(tmpHead,v,l)                      /* EBCDIC string, known length*/
 
 #define COMMON_BLOCK \
-  ADDSTR ("DATE",commonF.recordDate); \
-  ADDSTR ("TIME",commonF.recordTime); \
-  ADDSTRN("SID ",commonF.systemId,4); \
-  ADDSTRN("QMGR",commonF.qMgr,4); \
-  ADDSTRN("MQVER",commonF.mqVer,3) \
+  ADDSTR ("Date",commonF.recordDate,0); \
+  ADDSTR ("Time",commonF.recordTime,0); \
+  ADDSTRN("LPAR",commonF.systemId,4,4); \
+  ADDSTRN("QMgr",commonF.qMgr,4,4); \
+  ADDSTRN("MQ_Version",commonF.mqVer,3,3) \
   if (recordType == 115 && commonF.intstart != 0) { \
-    ADDTIME("INTSTART",commonF.intstart) \
-    ADDHEAD("INTDURN (S)"); \
+    ADDTIME("Interval_Start",commonF.intstart) \
+    ADDHEAD("Interval_Duration",DDL_I,0); \
     ADDDATA("%llu,",conv64(commonF.intduration)/1000000L) \
   }
 
 #define SMFPRINTSTART(n,p,l) \
   int offsetH=0;  \
   int offsetD=0;  \
   if (debugLevel >=1 ) printDEBUG(n,p,(l));\
-  if (first)      \
+  if (first) {    \
     fp = fopencsv(n,&newFile);\
+    if (sqlMode) \
+      openDDL(n);   \
+  } \
   if (!fp)        \
   {               \
     exit(1);      \
@@ -366,6 +383,8 @@ extern char *strMQCHLD  (int v);
     fprintf(fp,"%s",headings);\
     fprintf(fp,"\n");    \
   }                      \
+  if(first && sqlMode) \
+    closeDDL(); \
   first=FALSE;         \
   fprintf(fp,"%s",dataline);\
   fprintf(fp,"\n")
@@ -398,6 +417,7 @@ extern unsigned char  EBCDIC_TO_ASCII[];
 extern int  debugLevel;
 extern BOOL  addEquals;
 extern BOOL  printHeaders;
+extern BOOL  sqlMode;
 extern unsigned int   recordType;
 extern commonFields_t commonF;
 

bin/win/mqsmfcsv.exe

@@ -23,10 +23,10 @@ void printQCST(qcst *p)
 
   ADDTIME ("CLTM",p->qcstcltm);
   ADDSTREN("CHNM",p->qcstchnm,20);
-  ADDSTR  ("CHDP",strMQCHLD((int)p->qcstchdp));
-  ADDSTR  ("CHTY",strMQCHT((int)p->qcstchty));
-  ADDSTR  ("CHST",strMQCHS((int)p->qcstchst));
-  ADDSTR  ("STCL",strMQMON((int)p->qcststcl));
+  ADDSTR  ("CHDP",strMQCHLD((int)p->qcstchdp),20);
+  ADDSTR  ("CHTY",strMQCHT((int)p->qcstchty),20);
+  ADDSTR  ("CHST",strMQCHS((int)p->qcstchst),20);
+  ADDSTR  ("STCL",strMQMON((int)p->qcststcl),20);
   ADDSTREN("CNNM",p->qcstcnnm,48);
   ADDTIME ("STRT",p->qcststrt);
   ADDTIME ("LUDT",p->qcstludt);
@@ -54,7 +54,7 @@ void printQCST(qcst *p)
   ADDU32  ("NTMX",p->qcstntmx);
   ADDTIME ("NTDT",p->qcstntdt);
   ADDSTREN("RQMN",p->qcstrqmn,48);
-  ADDSTR  ("SLSN",convBin(p->qcstslsn,8));
+  ADDSTR  ("SLSN",convBin(p->qcstslsn,8),16);
   ADDSTREN("SLCN",p->qcstslcn,16);
   ADDX32  ("SLCS",p->qcstslcs);
   ADDU32  ("PTRC",p->qcstptrc);

mqsmfcsv.doc

@@ -24,7 +24,7 @@
 SMFPRINTGLOB;
 
 /*******************************************************************/
-/* Only include this function if building from an MQ V9 header file*/ 
+/* Only include this function if building from an MQ V9 header file*/
 /*******************************************************************/
 #ifdef QIS1IDV
 void printQIS1(qis1 *p)
@@ -66,15 +66,15 @@ void printQIS1(qis1 *p)
 
   if(flags & QIS1EXPF)
   {
-    ADDSTR("EXPAND","Yes");
+    ADDSTR("EXPAND","Yes",3);
   }
   else
   {
-    ADDSTR("EXPAND","No");
+    ADDSTR("EXPAND","No",3);
   }
 
   SMFPRINTSTOP;
 
   return;
 }
-#endif
+#endif

src/Makefile.gcc.win

@@ -33,12 +33,12 @@ void printQMAC(qmac *p, qwhc *pqwhc)
 
 
   ADDSTREN("AID ",pqwhc->qwhcaid,8);
-  ADDSTR  ("CCV ",convBin(pqwhc->qwhccv ,12));
+  ADDSTRB ("CCV ",pqwhc->qwhccv ,12);
   ADDSTREN("CCN ",pqwhc->qwhccn ,8 );
   ADDSTREN("OPID",pqwhc->qwhcopid ,8 );
-  ADDSTR  ("ATYP",strConnType(conv32(pqwhc->qwhcatyp)));
-  ADDSTR  ("TOKN",convBin(pqwhc->qwhctokn ,22));
-  ADDSTR  ("NID ",convBin(pqwhc->qwhcnid  ,16));
+  ADDSTR  ("ATYP",strConnType(conv32(pqwhc->qwhcatyp)),20);
+  ADDSTRB ("TOKN",pqwhc->qwhctokn ,22);
+  ADDSTRB ("NID ",pqwhc->qwhcnid  ,16);
 
   ADDSTCK("CPUT", p->qmaccput);