Better MySQL options

Author: ibmmqmet

bin/aix/convH

@@ -120,6 +120,7 @@ BOOL  streamOutput = FALSE;
 BOOL  streamInput = TRUE;
 char *ddlTemplateOpen = NULL;
 char *ddlTemplateClose = NULL;
+char *ddlQuote = "";
 commonFields_t commonF = {0};
 enum outputFormat_e outputFormat = OF_CSV;
 FILE *infoStream;
@@ -244,13 +245,25 @@ int main( int argc, char *argv[] )
   /******************************************************************/
   /* Parse command-line parameters                                  */
   /******************************************************************/
-  while((c = mqgetopt(argc, argv, "acd:e:f:h:i:m:o:p:rst:")) != EOF)
+  while((c = mqgetopt(argc, argv, "ab:cd:e:f:h:i:m:o:p:rst:")) != EOF)
   {
     switch(c)
     {
       case 'a':
         append = TRUE;
         break;
+      case 'b': /* 'b' for dataBase */
+        for (i=0;i<strlen(mqoptarg);i++)
+          mqoptarg[i] = toupper(mqoptarg[i]);
+        if (!strcmp(mqoptarg,"MYSQL")) {
+          ddlQuote="`";
+          ddlTemplateOpen = "-";
+        } else if (!strcmp(mqoptarg,"DB2")) {
+          ddlQuote="";
+        } else {
+          error = TRUE;
+        }
+        break;
       case 'c':
         resumeCheckPoint = TRUE;
         append = TRUE;
@@ -1325,10 +1338,12 @@ static void Usage(void)
   fprintf(infoStream,"Usage: mqsmfcsv [-o <output dir>] [-a] [ -d <level> ]\n");
   fprintf(infoStream,"         [-h yes|no] [ -i <input file> [-m <max records>]\n");
   fprintf(infoStream,"         [-f RDW | NORDW | JSON | SQL | CSV ] \n");
+  fprintf(infoStream,"         [-b Db2 | MySQL ] \n");
   fprintf(infoStream,"         [-p <template DDL file prefix>  ] \n");
   fprintf(infoStream,"         [-e <template DDL file ending>  ] \n");
   fprintf(infoStream,"         [-r] [-c] [-t <ticker>]\n");
   fprintf(infoStream,"  -a               Append to files if they exist. Default is overwrite.\n");
+  fprintf(infoStream,"  -b <Database>    Database DDL format can be Db2 or MySQL. Default is Db2.\n");
   fprintf(infoStream,"  -c               Recover after aborted run by using the checkpoint.\n");
   fprintf(infoStream,"  -d <Level>       Debug by dumping binary records (Level = 1 or 2).\n");
   fprintf(infoStream,"  -f               File formats. Default to RDW for input, CSV for output.\n");

bin/aix/mqsmfcsv

@@ -439,6 +439,7 @@ extern char tmpHead[];
 extern FILE *infoStream;
 extern char *ddlTemplateOpen;
 extern char *ddlTemplateClose;
+extern char *ddlQuote;
 
 enum outputFormat_e { OF_CSV=0, OF_SQL=1, OF_JSON=2 };
 extern enum outputFormat_e outputFormat;

bin/linux/mqsmfcsv

@@ -19,23 +19,23 @@ void printQMST(qmst *p)
 {
   SMFPRINTSTART("QMST", p, conv16(p->qmstll));
 
-  ADDS32("MQOpen",p->qmstopen);
-  ADDS32("MQClose",p->qmstclos);
-  ADDS32("MQGet ",p->qmstget );
-  ADDS32("MQPut" ,p->qmstput );
-  ADDS32("MQPut1",p->qmstput1);
-  ADDS32("MQInq ",p->qmstinq );
+  ADDS32("Open",p->qmstopen);
+  ADDS32("Close",p->qmstclos);
+  ADDS32("Get ",p->qmstget );
+  ADDS32("Put" ,p->qmstput );
+  ADDS32("Put1",p->qmstput1);
+  ADDS32("Inq ",p->qmstinq );
   ADDS32("Inql",p->qmstinql);
-  ADDS32("MQSet ",p->qmstset );
+  ADDS32("Set ",p->qmstset );
   ADDS32("Endw",p->qmstendw);
   ADDS32("Close_Handles",p->qmstcalh);
   if (conv16(p->qmstll) >  offsetof(qmst,  qmstsub))/* Fields added for V7.0 API calls*/
   {
-    ADDS32("MQSub"   ,p->qmstsub);
-    ADDS32("MQSubReq",p->qmstsubr);
-    ADDS32("MQCB  "  ,p->qmstcb);
-    ADDS32("MQCTL "  ,p->qmstctl);
-    ADDS32("MQStatus",p->qmststus);
+    ADDS32("Sub"   ,p->qmstsub);
+    ADDS32("SubReq",p->qmstsubr);
+    ADDS32("CB  "  ,p->qmstcb);
+    ADDS32("CTL "  ,p->qmstctl);
+    ADDS32("Status",p->qmststus);
     ADDS32("Pubs"  ,p->qmstpubs);
   }
 #if CSQDSMF_VERSION >= 903

bin/win/mqsmfcsv.exe

@@ -46,8 +46,8 @@ void printWQ(wq *p)
   /*--------------------------------------------------------*/
   /* Object information                                     */
   /*--------------------------------------------------------*/
-  ADDSTR("QueueType" ,strMQQT(conv32(p->qtype)),16);
-  ADDSTR("IndexType",strMQIT(conv32(p->indxtype)),16);
+  ADDSTR("Queue" ,strMQQT(conv32(p->qtype)),16);
+  ADDSTR("Index",strMQIT(conv32(p->indxtype)),16);
   ADDSTR("Scope",strMQQSGD(conv32(p->qsgdisp)),16);
 
   /*--------------------------------------------------------*/

mqsmfcsv.doc

@@ -173,37 +173,37 @@ void printDDL(char *name, int type, int len)
   case DDL_I:
     /* SQL Integer is a 'signed 32-bit' when sometimes we need unsigned */
     /* So make it a big int always                                      */
-    fprintf(fp,"%s %s \t BIGINT \n",comma,formatDDL(nameCopy));
+    fprintf(fp,"%s %s%s%s \t BIGINT \n",comma,ddlQuote,formatDDL(nameCopy),ddlQuote);
     break;
   case DDL_I64:
-    fprintf(fp,"%s %s \t BIGINT\n",comma,formatDDL(nameCopy));
+    fprintf(fp,"%s %s%s%s \t BIGINT\n",comma,ddlQuote,formatDDL(nameCopy),ddlQuote);
     break;
   case DDL_C:
     if (!strcmp(name,"Date"))        /* special case for CommonHeader field*/
     {
-      fprintf(fp,"%s %s \t DATE    \n",comma,formatDDL(nameCopy));
+      fprintf(fp,"%s %s%s%s \t DATE    \n",comma,ddlQuote,formatDDL(nameCopy),ddlQuote);
     }
     else
     {
-      fprintf(fp,"%s %s \t CHAR(%d)\n",comma,formatDDL(nameCopy),len);
+      fprintf(fp,"%s %s%s%s \t CHAR(%d)\n",comma,ddlQuote,formatDDL(nameCopy),ddlQuote,len);
     }
     break;
   case DDL_SUS: /* a seconds/microseconds field */
     p = strstr(nameCopy,"(US)");
     if (p) *p = 0;
-    fprintf(fp,"%s %s_us \t BIGINT\n",comma,formatDDL(nameCopy));
+    fprintf(fp,"%s %s%s_us%s \t BIGINT\n",comma,ddlQuote,formatDDL(nameCopy),ddlQuote);
     break;
 
   case DDL_DATE:
     p = strstr(nameCopy," (DATE)");
     if (p) *p = 0; /* remove the "(DATE)" bit */
-    fprintf(fp,"%s %s_Date \t DATE\n",comma,formatDDL(nameCopy));
+    fprintf(fp,"%s %s%s_Date%s \t DATE\n",comma,ddlQuote,formatDDL(nameCopy),ddlQuote);
     break;
   case DDL_TIME:
     p = strstr(nameCopy," (TIME)");
     if (p)
       *p = 0;
-    fprintf(fp,"%s %s_Time \t CHAR(19)\n",comma,formatDDL(nameCopy));
+    fprintf(fp,"%s %s%s_Time%s \t CHAR(19)\n",comma,ddlQuote,formatDDL(nameCopy),ddlQuote);
     break;
   }
 
@@ -220,7 +220,7 @@ static char nameNoDup[COL_HEAD_LEN];
 char *formatDDL(char *name)
 {
   /* Leave room for _DATE etc as prefix */
-  return formatDDLMaxLength(name,27);
+   return formatDDLMaxLength(name,27);
 }
 
 char *formatDDLMaxLength(char *name,int maxLength)

src/mqsmf.c

@@ -3,7 +3,8 @@
 # You will need to modify variables such as where the formatted csv files
 # have been created, and which database/schema to work with.
 
-# Set credentials
+# Set credentials - there are better and more secure ways to 
+# handle authentication for MySQL but this is simplest as the demonstration.
 user="root"
 pw="Passw0rd!"
 
@@ -18,6 +19,11 @@ schema="MQSMF"
 # a new database.
 
 # Run the DDL to create the tables
+# In this script we start from scratch with a new DB.     
+mysql -u $user --password=$pw --force << EOF
+DROP DATABASE $schema;
+CREATE DATABASE $schema;
+EOF
 mysql -u $user --password=$pw --force < SMF-MQTABLES.ddl
 
 # And import all the data files