Backward compatible for mysql client

Author: Jinzhe

dist/database.js

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.removeDb = exports.importDb = exports.clearDb = exports.unzipDb = exports.checkForDb = exports.importDbQuery = exports.doLocalDbDump = exports.doImportDb = exports.dropDbQuery = exports.doDropAllDbTables = exports.getDbDumpZipCommands = void 0;
+exports.isMysql8 = exports.removeDb = exports.importDb = exports.clearDb = exports.unzipDb = exports.checkForDb = exports.importDbQuery = exports.doLocalDbDump = exports.doImportDb = exports.dropDbQuery = exports.doDropAllDbTables = exports.getDbDumpZipCommands = void 0;
 
 var _promiseMysql = _interopRequireDefault(require("promise-mysql"));
 
+var _react = require("react");
+
 var _utils = require("./utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -89,6 +91,11 @@ const doLocalDbDump =
 function () {
   var _ref3 = _asyncToGenerator(function* (config) {
     let errorMessage;
+    config = Object.assign(config, {
+      isMysql8: yield isMysql8({
+        localCmd: _utils.cmdPromise
+      })
+    });
     yield (0, _utils.cmdPromise)(getDbDumpZipCommands(config)).catch(e => errorMessage = e);
     if (errorMessage) return new Error(errorMessage);
   });
@@ -106,9 +113,10 @@ const getDbDumpZipCommands = ({
   user,
   password,
   database,
-  gzipFilePath
+  gzipFilePath,
+  isMysql8 = false
 }) => // Dump and zip the db - this can make it around 9 times smaller
-`mysqldump --host='${host}' --port='${port}' --user='${user}' --password='${password}' --no-tablespaces --column-statistics=0 ${database} | gzip > '${gzipFilePath}'`;
+`mysqldump --host='${host}' --port='${port}' --user='${user}' --password='${password}' --no-tablespaces ${isMysql8 ? '--column-statistics=0' : ''} ${database} | gzip > '${gzipFilePath}'`;
 
 exports.getDbDumpZipCommands = getDbDumpZipCommands;
 
@@ -263,6 +271,62 @@ function () {
   return function removeDb(_x8) {
     return _ref8.apply(this, arguments);
   };
+}(); // Check the version of mysqldump (mysql)
+// cmd can be either
+// - sshConn(remote)
+// or
+// - localCmd(local)
+
+
+exports.removeDb = removeDb;
+
+const isMysql8 =
+/*#__PURE__*/
+function () {
+  var _ref9 = _asyncToGenerator(function* ({
+    sshConn,
+    localCmd
+  }) {
+    if (sshConn) {
+      let output = "",
+          errorMessage = "";
+      yield sshConn.execCommand(`mysqldump --version`).then(({
+        stdout,
+        stderr
+      }) => {
+        output = stdout; // If error running command
+
+        if (stderr) errorMessage = `There was an issue checking mysql version\n\n${stderr}`;
+      });
+
+      if (output.indexOf("Ver 8") !== -1) {
+        return true;
+      }
+
+      return false;
+    } else if (localCmd) {
+      let output = "",
+          errorMessage = "";
+      yield localCmd(`mysqldump --version`).then(stdout => {
+        output = stdout;
+      }).catch(stderr => {
+        // If error running command
+        if (stderr) errorMessage = `There was an issue checking mysql version\n\n${stderr}`;
+      });
+
+      if (output.indexOf("Ver 8") !== -1) {
+        return true;
+      }
+
+      return false;
+    }
+
+    return false;
+  });
+
+  return function isMysql8(_x9) {
+    return _ref9.apply(this, arguments);
+  };
 }();
 
-exports.removeDb = removeDb;
+exports.isMysql8 = isMysql8;

dist/ssh.js

@@ -343,7 +343,10 @@ function () {
       user: remoteEnv.DB_USER,
       password: remoteEnv.DB_PASSWORD,
       database: remoteEnv.DB_DATABASE,
-      gzipFilePath: gzipFileName
+      gzipFilePath: gzipFileName,
+      isMysql8: yield (0, _database.isMysql8)({
+        sshConn: ssh
+      })
     };
     let errorMessage;
     yield ssh.execCommand((0, _database.getDbDumpZipCommands)(zipCommandConfig), {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "swiff",
-    "version": "1.5.5",
+    "version": "1.5.6",
     "description": "Swiff saves you time with common SSH tasks during the development of websites/apps",
     "main": "index.js",
     "scripts": {

src/database.js

@@ -1,4 +1,5 @@
 import mysql from 'promise-mysql'
+import { version } from 'react'
 import { cmdPromise } from './utils'
 import { isEmpty } from './utils'
 
@@ -50,6 +51,11 @@ const doImportDb = async config => {
 
 const doLocalDbDump = async config => {
     let errorMessage
+    config = Object.assign(config, {
+        isMysql8: await isMysql8({
+            localCmd:cmdPromise
+        })
+    })
     await cmdPromise(getDbDumpZipCommands(config)).catch(
         e => (errorMessage = e)
     )
@@ -63,9 +69,10 @@ const getDbDumpZipCommands = ({
     password,
     database,
     gzipFilePath,
+    isMysql8 = false
 }) =>
     // Dump and zip the db - this can make it around 9 times smaller
-    `mysqldump --host='${host}' --port='${port}' --user='${user}' --password='${password}' --no-tablespaces --column-statistics=0 ${database} | gzip > '${gzipFilePath}'`
+    `mysqldump --host='${host}' --port='${port}' --user='${user}' --password='${password}' --no-tablespaces ${isMysql8?'--column-statistics=0':''} ${database} | gzip > '${gzipFilePath}'`
 
 const checkForDb = async ({ dbFilePath, sshConn }) => {
     let errorMessage
@@ -178,6 +185,41 @@ const removeDb = async ({ dbFilePath, sshConn }) => {
     return
 }
 
+// Check the version of mysqldump (mysql)
+// cmd can be either
+// - sshConn(remote)
+// or
+// - localCmd(local)
+const isMysql8 = async ({sshConn, localCmd}) => {
+    if (sshConn) {
+        let output = "", errorMessage = "";
+        await sshConn.execCommand(`mysqldump --version`).then(({ stdout, stderr }) => {
+            output = stdout;
+            // If error running command
+            if (stderr)
+                errorMessage = `There was an issue checking mysql version\n\n${stderr}`
+        })
+        if (output.indexOf("Ver 8") !== -1) {
+            return true;
+        }
+        return false;
+    } else if (localCmd) {
+        let output = "", errorMessage = "";
+        await localCmd(`mysqldump --version`).then(stdout => {
+            output = stdout;
+        }).catch(stderr => {
+            // If error running command
+            if (stderr)
+                errorMessage = `There was an issue checking mysql version\n\n${stderr}`
+        }) 
+        if (output.indexOf("Ver 8") !== -1) {
+            return true;
+        }
+        return false;
+    }
+    return false;
+}
+
 export {
     getDbDumpZipCommands,
     doDropAllDbTables,
@@ -190,4 +232,5 @@ export {
     clearDb,
     importDb,
     removeDb,
+    isMysql8,
 }

src/ssh.js

@@ -3,7 +3,7 @@ import resolveUsername from 'username'
 import path from 'path'
 import { executeCommands, cmdPromise, isEmpty, isFunction } from './utils'
 import { getParsedEnv } from './env'
-import { getDbDumpZipCommands } from './database'
+import { getDbDumpZipCommands, isMysql8 } from './database'
 import { pathBackups, pathApp } from './paths'
 import { colourAttention, colourNotice } from './palette'
 import chalk from 'chalk'
@@ -314,6 +314,9 @@ const getSshDatabase = async ({
         password: remoteEnv.DB_PASSWORD,
         database: remoteEnv.DB_DATABASE,
         gzipFilePath: gzipFileName,
+        isMysql8: await isMysql8({
+            sshConn:ssh
+        })
     }
     let errorMessage
     await ssh