@verdnatura/myt 1.5.15 → 1.5.17

package/README.md

@@ -221,7 +221,7 @@ Exports database structure and fixtures from remote into hidden files located
 in *dump* folder. If no remote is specified *production* is used.
 
 ```text
-$ myt dump [<remote>]
+$ myt dump [<remote>] [-l|--lock]
 ```
 
 ### fixtures

package/lib/dumper.js

@@ -35,7 +35,7 @@ module.exports = class Dumper {
         );
     }
 
-    async dumpFixtures(tables, replace) {
+    async dumpFixtures(tables, replace, args) {
         const fixturesArgs = [
             '--no-create-info',
             '--skip-triggers',
@@ -45,7 +45,7 @@ module.exports = class Dumper {
             '--skip-set-charset',
             '--skip-comments',
             '--skip-tz-utc'
-        ];
+        ].concat(args);
 
         if (replace)
             fixturesArgs.push('--replace');

package/myt-dump.js

@@ -6,18 +6,30 @@ const Dumper = require('./lib/dumper');
 class Dump extends Command {
     static usage = {
         description: 'Dumps structure and fixtures from remote',
+        params: {
+            lock: 'Whether to lock tables on dump'
+        },
         operand: 'remote'
     };
 
     static opts = {
         default: {
             remote: 'production'
-        }
+        },
+        alias: {
+            lock: 'l'
+        },
+        boolean: [
+            'lock'
+        ]
     };
 
     async run(myt, opts) {
         const dumper = new Dumper(opts);
         await dumper.init('.dump.sql');
+        const baseArgs = [
+            `--lock-tables=${opts.lock ? 'true' : 'false'}`
+        ];
 
         console.log('Dumping structure.');
         let dumpArgs = [
@@ -28,12 +40,13 @@ class Dump extends Command {
             '--events',
             '--skip-triggers',
             '--databases'
-        ];
+        ].concat(baseArgs);
+
         dumpArgs = dumpArgs.concat(opts.schemas);
         await dumper.runDump('docker-dump.sh', dumpArgs);
 
         console.log('Dumping fixtures.');
-        await dumper.dumpFixtures(opts.fixtures);
+        await dumper.dumpFixtures(opts.fixtures, false, baseArgs);
 
         console.log('Dumping privileges.');
         const privs = opts.privileges;
@@ -43,7 +56,7 @@ class Dump extends Command {
                 '--skip-triggers',
                 '--insert-ignore',
                 '--complete-insert'
-            ];
+            ].concat(baseArgs);
             if (privs.where) args.push('--where', privs.where);
             args = args.concat(['mysql'], privs.tables);
 

package/myt.js

@@ -17,7 +17,6 @@ class Myt {
         params: {
             remote: 'Name of remote to use',
             workspace: 'The base directory of the project',
-            socket: 'Wether to connect to database via socket',
             debug: 'Wether to enable debug mode',
             version: 'Display the version number and exit',
             help: 'Display this help message'
@@ -28,7 +27,6 @@ class Myt {
         alias: {
             remote: 'r',
             workspace: 'w',
-            socket: 'k',
             debug: 'd',
             version: 'v',
             help: 'h'
@@ -205,34 +203,42 @@ class Myt {
         
         let dbConfig;
         try {
-            const iniConfig = ini.parse(await fs.readFile(iniPath, 'utf8')).client;
+            const iniData = ini.parse(await fs.readFile(iniPath, 'utf8')).client;
+            const iniConfig = {};
+            for (const key in iniData) {
+                const value = iniData[key];
+                const newKey = key.replace(/-/g, '_');
+                iniConfig[newKey] = value !== undefined ? value : true;
+            }
             dbConfig = {
                 host: iniConfig.host,
                 port: iniConfig.port,
                 user: iniConfig.user,
                 password: iniConfig.password,
-                multipleStatements: true,
-                authPlugins: {
+                multipleStatements: true
+            };
+            if (iniConfig.enable_cleartext_plugin) {
+                dbConfig.authPlugins = {
                     mysql_clear_password() {
                         return () => iniConfig.password + '\0';
                     }
-                }
-            };
+                };
+            }
             if (iniConfig.ssl_ca) {
                 dbConfig.ssl = {
                     ca: await fs.readFile(`${opts.mytDir}/${iniConfig.ssl_ca}`),
                     rejectUnauthorized: iniConfig.ssl_verify_server_cert != undefined
                 }
             }
+            if (iniConfig.socket) {
+                dbConfig.socketPath = iniConfig.socket;
+            }
         } catch(err) {
             const newErr = Error(`Cannot process the ini file, check that the syntax is correct: ${iniPath}`);
             newErr.stack += `\nCaused by: ${err.stack}`;
             throw newErr;
         }
 
-        if (opts.socket)
-            dbConfig.socketPath = '/var/run/mysqld/mysqld.sock';
-
         Object.assign(opts, {
             iniFile,
             dbConfig

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdnatura/myt",
-  "version": "1.5.15",
+  "version": "1.5.17",
   "author": "Verdnatura Levante SL",
   "description": "MySQL version control",
   "license": "GPL-3.0",
@@ -14,13 +14,13 @@
   "dependencies": {
     "@sqltools/formatter": "^1.2.5",
     "colors": "^1.4.0",
-    "ejs": "^3.1.8",
+    "ejs": "^3.1.9",
     "fs-extra": "^8.1.0",
     "getopts": "^2.3.0",
     "ini": "^1.3.8",
     "mysql2": "^2.3.3",
     "nodegit": "^0.27.0",
-    "require-yaml": "0.0.1",
+    "require-yaml": "^0.0.1",
     "sha.js": "^2.4.11"
   },
   "main": "index.js",