More MySQL mods to not break DB2 compatibility

Author: ibmmqmet

CHANGES.md

@@ -81,6 +81,5 @@ Jun 2018 (v4.2.0)
 Jul 2018 (v4.3.0)
 * Add command for converting VBS dataset to USS on z/OS
 
-Oct 2018 (v5.0.0)
-* Add instructions for MySQL importing
-* Update for MQ V9.1.1
+Sep 2018 (v5.0.0)
+* Add support for MySQL imports

bin/aix/convH

@@ -121,6 +121,7 @@ BOOL  streamInput = TRUE;
 char *ddlTemplateOpen = NULL;
 char *ddlTemplateClose = NULL;
 char *ddlQuote = "";
+BOOL  ddlFold = FALSE;
 commonFields_t commonF = {0};
 enum outputFormat_e outputFormat = OF_CSV;
 FILE *infoStream;
@@ -258,8 +259,10 @@ int main( int argc, char *argv[] )
         if (!strcmp(mqoptarg,"MYSQL")) {
           ddlQuote="`";
           ddlTemplateOpen = "-";
+          ddlFold = TRUE;
         } else if (!strcmp(mqoptarg,"DB2")) {
           ddlQuote="";
+          ddlFold = FALSE;
         } else {
           error = TRUE;
         }

bin/aix/mqsmfcsv

@@ -440,6 +440,7 @@ extern FILE *infoStream;
 extern char *ddlTemplateOpen;
 extern char *ddlTemplateClose;
 extern char *ddlQuote;
+extern BOOL  ddlFold;
 
 enum outputFormat_e { OF_CSV=0, OF_SQL=1, OF_JSON=2 };
 extern enum outputFormat_e outputFormat;

bin/linux/mqsmfcsv

@@ -191,19 +191,19 @@ void printDDL(char *name, int type, int len)
   case DDL_SUS: /* a seconds/microseconds field */
     p = strstr(nameCopy,"(US)");
     if (p) *p = 0;
-    fprintf(fp,"%s %s%s_us%s \t BIGINT\n",comma,ddlQuote,formatDDL(nameCopy),ddlQuote);
+    fprintf(fp,"%s %s%s_%s%s \t BIGINT\n",comma,ddlQuote,formatDDL(nameCopy),ddlFold?"US":"us",ddlQuote);
     break;
 
   case DDL_DATE:
     p = strstr(nameCopy," (DATE)");
     if (p) *p = 0; /* remove the "(DATE)" bit */
-    fprintf(fp,"%s %s%s_Date%s \t DATE\n",comma,ddlQuote,formatDDL(nameCopy),ddlQuote);
+    fprintf(fp,"%s %s%s_%s%s \t DATE\n",comma,ddlQuote,formatDDL(nameCopy),ddlFold?"DATE":"Date",ddlQuote);
     break;
   case DDL_TIME:
     p = strstr(nameCopy," (TIME)");
     if (p)
       *p = 0;
-    fprintf(fp,"%s %s%s_Time%s \t CHAR(19)\n",comma,ddlQuote,formatDDL(nameCopy),ddlQuote);
+    fprintf(fp,"%s %s%s_%s%s \t CHAR(19)\n",comma,ddlQuote,formatDDL(nameCopy),ddlFold?"TIME":"Time",ddlQuote);
     break;
   }
 
@@ -252,7 +252,10 @@ char *formatDDLMaxLength(char *name,int maxLength)
     /* Get rid of repeated '_' characters */
     if (c != prev || prev != '_')
     {
-      *o = c;
+      if (ddlFold)
+        *o = toupper(c);
+      else
+        *o = c;
       o++;
     }
     i++;