@verdnatura/myt 1.5.14 → 1.5.16

package/assets/myt.default.yml

@@ -1,6 +1,7 @@
 versionSchema: myt
 versionDigits: 5
 maxOldVersions: 20
+mockDate: false
 sumViews: true
 schemas:
   - myt

package/myt-push.js

@@ -321,16 +321,26 @@ class Push extends Command {
             const oldSum = engine.getShaSum(type, schema, name);
             const isEqual = newSql == oldSql;
 
+            let statusMsg;
+            if (exists && !oldSql)
+                statusMsg = '[+]'.green;
+            else if (!exists)
+                statusMsg = '[-]'.red;
+            else
+                statusMsg = '[·]'.yellow;
+
             let actionMsg;
-            if ((exists && isEqual) || (!exists && !oldSql))
+            if (isEqual)
                 actionMsg = '[I]'.blue;
-            else if (exists)
-                actionMsg = '[+]'.green;
             else
-                actionMsg = '[-]'.red;
+                actionMsg = '[A]'.green;
 
             const typeMsg = `[${change.type.abbr}]`[change.type.color];
-            console.log('', actionMsg.bold, typeMsg.bold, change.fullName);
+            console.log('',
+                (statusMsg + actionMsg).bold,
+                typeMsg.bold,
+                change.fullName
+            );
 
             if (!isEqual) {
                 const scapedSchema = SqlString.escapeId(schema, true);
@@ -475,7 +485,7 @@ class Push extends Command {
 
         return routines.sort((a, b) => {
             if (b.mark != a.mark)
-                return b.mark == '-' ? 1 : -1;
+                return b.mark == '-' ? -1 : 1;
 
             if (b.type.name !== a.type.name) {
                 if (b.type.name == 'VIEW')

package/myt-run.js

@@ -6,6 +6,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const Server = require('./lib/server');
 const connExt = require('./lib/conn');
+const SqlString = require('sqlstring');
 
 /**
  * Builds the database image and runs a container. It only rebuilds the
@@ -152,6 +153,20 @@ class Run extends Command {
                 await connExt.queryFromFile(conn, `${triggersPath}/${triggerFile}`);
         }
 
+        // Mock date functions
+
+        console.log('Mocking date functions.');
+        const mockDateScript = path.join(dumpDir, 'mockDate.sql');
+
+        if (opts.mockDate) {
+            if (!await fs.pathExists(mockDateScript))
+                throw new Error(`Date mock enabled but mock script does not exist: ${mockDateScript}`);
+
+            let sql = await fs.readFile(mockDateScript, 'utf8');
+            sql = sql.replace(/@mockDate/g, SqlString.escape(opts.mockDate));
+            await connExt.multiQuery(conn, sql);
+        }
+
         return server;
     }
 }

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'
@@ -120,8 +118,8 @@ class Myt {
                 const wsPackageJson = require(wsPackageFile);
                 try {
                     depVersion = wsPackageJson
-                        .dependencies
-                        .myt.match(versionRegex);
+                        .dependencies[packageJson.name]
+                        .match(versionRegex);
                 } catch (e) {}
             }
 
@@ -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.14",
+  "version": "1.5.16",
   "author": "Verdnatura Levante SL",
   "description": "MySQL version control",
   "license": "GPL-3.0",