Disable SSL mode for now

ilri · Jan 13, 2021 · ceed645 · ceed645
1 parent 3528e82
commit ceed645
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 1 deletion.
diff --git a/utilities/MySQLDenormalize/mainclass.cpp b/utilities/MySQLDenormalize/mainclass.cpp
@@ -1006,7 +1006,10 @@ int mainClass::generateJSONs(QSqlDatabase db)
                 arguments.clear();
                 arguments << "--single-transaction";
                 if (maria_bd == false && version_number >= 8)
-                    arguments << "--skip-column-statistics";                
+                {
+                    arguments << "--skip-column-statistics";
+                    arguments << "--ssl-mode=DISABLED";
+                }
                 arguments << "-h" << host;
                 arguments << "-u" << user;
                 arguments << "--password=" + pass;

diff --git a/utilities/MySQLToSQLite/main.cpp b/utilities/MySQLToSQLite/main.cpp
@@ -368,7 +368,10 @@ int procData(QString tempDir, QString host, QString user, QString pass, QString
     QStringList arguments;
     arguments << "--single-transaction";
     if (maria_bd == false && version_number >= 8)
+    {
         arguments << "--skip-column-statistics";
+        arguments << "--ssl-mode=DISABLED";
+    }
     arguments << "-h" << host;
     arguments << "-u" << user;
     arguments << "--password=" + pass;

diff --git a/utilities/MySQLToSQLite/main_old.cpp b/utilities/MySQLToSQLite/main_old.cpp
@@ -143,6 +143,36 @@ int genSnapHost(QSqlDatabase db, QSqlDatabase dblite, QString auditFile, QString
         return 1;
     }
 
+    QStringList version_arguments;
+    version_arguments.clear();
+    version_arguments << "--version";
+    QString version_info;
+    QProcess *version_process = new QProcess();
+    version_process->start("mariadb_config", version_arguments);
+    version_process->waitForFinished(-1);
+    bool maria_bd = false;
+    if (version_process->exitCode() == 0)
+    {
+        maria_bd = true;
+        version_info = version_process->readAllStandardOutput().replace("\n","");
+    }
+    else
+    {
+        version_process->start("mysql_config", version_arguments);
+        version_process->waitForFinished(-1);
+        if (version_process->exitCode() == 0)
+        {
+            version_info = version_process->readAllStandardOutput().replace("\n","");
+        }
+    }
+    if (version_info == "")
+    {
+        log("Unable to detect the version of MySQL");
+        exit(1);
+    }
+    QStringList version_parts = version_info.split(".");
+    int version_number = version_parts[0].toInt();
+
     QString program = "mysqldump";
     QStringList arguments;
     arguments << "--single-transaction";
@@ -152,6 +182,11 @@ int genSnapHost(QSqlDatabase db, QSqlDatabase dblite, QString auditFile, QString
     arguments << "--skip-triggers";
     arguments << "--xml";
     arguments << "--no-create-info";
+    if (maria_bd == false && version_number >= 8)
+    {
+        arguments << "--skip-column-statistics";
+        arguments << "--ssl-mode=DISABLED";
+    }
     for (pos = 0; pos <= ignoreTables.count()-1; pos++)
         arguments << "--ignore-table=" + schema + "." + ignoreTables[pos];
     arguments << schema;

diff --git a/utilities/MySQLToXLSX/mainclass.cpp b/utilities/MySQLToXLSX/mainclass.cpp
@@ -736,7 +736,10 @@ int mainClass::generateXLSX()
             arguments.clear();
             arguments << "--single-transaction";
             if (maria_bd == false && version_number >= 8)
+            {
                 arguments << "--skip-column-statistics";
+                arguments << "--ssl-mode=DISABLED";
+            }
             arguments << "-h" << host;
             arguments << "-u" << user;
             arguments << "--password=" + pass;