@verdnatura/myt 1.5.13 → 1.5.15

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

@@ -267,8 +267,7 @@ class Push extends Command {
         const gitExists = await fs.pathExists(`${opts.workspace}/.git`);
 
         let nRoutines = 0;
-        let changes = await this.changedRoutines(version.gitCommit);
-        changes = this.parseChanges(changes);
+        const changes = await this.changedRoutines(version.gitCommit);
 
         const routines = [];
         for (const change of changes)
@@ -322,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);
@@ -397,14 +406,6 @@ class Push extends Command {
         await pushConn.end();
     }
 
-    parseChanges(changes) {
-        const routines = [];
-        if (changes)
-            for (const change of changes)
-                routines.push(new Routine(change));
-        return routines;
-    }
-
     async updateVersion(column, value) {
         column = SqlString.escapeId(column, true);
         await this.conn.query(
@@ -478,9 +479,21 @@ class Push extends Command {
         await pushChanges(await repoExt.getUnstaged(repo));
         await pushChanges(await repoExt.getStaged(repo));
 
-        return changes.sort((a, b) => {
+        const routines = [];
+        for (const change of changes)
+            routines.push(new Routine(change));
+
+        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')
+                    return -1;
+                if (a.type.name == 'VIEW')
+                    return 1;
+            }
+
             return a.path.localeCompare(b.path);
         });
     }

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

@@ -120,8 +120,8 @@ class Myt {
                 const wsPackageJson = require(wsPackageFile);
                 try {
                     depVersion = wsPackageJson
-                        .dependencies
-                        .myt.match(versionRegex);
+                        .dependencies[packageJson.name]
+                        .match(versionRegex);
                 } catch (e) {}
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdnatura/myt",
-  "version": "1.5.13",
+  "version": "1.5.15",
   "author": "Verdnatura Levante SL",
   "description": "MySQL version control",
   "license": "GPL-3.0",