@verdnatura/myt 1.5.8 → 1.5.11

package/assets/myt.default.yml

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

package/exporters/event.ejs

@@ -1,21 +1,18 @@
-DROP EVENT IF EXISTS <%- schema %>.<%- name %>;
-DELIMITER $$
-CREATE DEFINER=<%- definer %> EVENT <%- schema %>.<%- name %><%
-if (locals.type == 'RECURRING') { %>
-	ON SCHEDULE EVERY <%- intervalValue %> <%- intervalField %><%
-	if (locals.starts) { %>
-		STARTS <%- starts %><%
+<%- begin %> <%- typeAndName %><%
+if (params.type == 'RECURRING') { %>
+	ON SCHEDULE EVERY <%- params.intervalValue %> <%- params.intervalField %><%
+	if (params.starts) { %>
+		STARTS <%- params.starts %><%
 	}
-	if (locals.ends) { %>
-		ENDS <%- ends %><%
+	if (params.ends) { %>
+		ENDS <%- params.ends %><%
 	}
 } else { %>
-	ON SCHEDULE AT <%- executeAt %><%
+	ON SCHEDULE AT <%- params.executeAt %><%
 } %>
-	ON COMPLETION <%- onCompletion %>
-	<%- status %><%
-if (locals.comment) { %>
-	COMMENT <%- comment %><%
+	ON COMPLETION <%- params.onCompletion %>
+	<%- params.status %><%
+if (params.comment) { %>
+	COMMENT <%- params.comment %><%
 } %>
-DO <%- body %>$$
-DELIMITER ;
+DO <%- params.body %><%- end %>

package/exporters/function.ejs

@@ -1,20 +1,17 @@
-DROP FUNCTION IF EXISTS <%- schema %>.<%- name %>;
-DELIMITER $$
-CREATE DEFINER=<%- definer %> FUNCTION <%- schema %>.<%- name %>(<%- locals.paramList %>)
-	RETURNS <%- returns %><%
-if (locals.isDeterministic == 'NO') { %>
+<%- begin %> <%- typeAndName %>(<%- params.paramList %>)
+	RETURNS <%- params.returns %><%
+if (params.isDeterministic == 'NO') { %>
 	NOT DETERMINISTIC<%
 } else { %>
 	DETERMINISTIC<%
 }
-if (locals.dataAccess) { %>
-	<%- dataAccess %><%
+if (params.dataAccess) { %>
+	<%- params.dataAccess %><%
 }
-if (locals.securityType == 'INVOKER') { %>
-	SQL SECURITY  <%- securityType %><%
+if (params.securityType == 'INVOKER') { %>
+	SQL SECURITY  <%- params.securityType %><%
 }
-if (locals.comment) { %>
-	COMMENT <%- comment %><%
+if (params.comment) { %>
+	COMMENT <%- params.comment %><%
 } %>
-<%- body %>$$
-DELIMITER ;
+<%- params.body %><%- end %>

package/exporters/procedure.ejs

@@ -1,14 +1,11 @@
-DROP PROCEDURE IF EXISTS <%- schema %>.<%- name %>;
-DELIMITER $$
-CREATE DEFINER=<%- definer %> PROCEDURE <%- schema %>.<%- name %>(<%- locals.paramList %>)<%
-if (locals.dataAccess) { %>
-	<%- dataAccess %><%
+<%- begin %> <%- typeAndName %>(<%- params.paramList %>)<%
+if (params.dataAccess) { %>
+	<%- params.dataAccess %><%
 }
-if (locals.securityType == 'INVOKER') { %>
-	SQL SECURITY  <%- securityType %><%
+if (params.securityType == 'INVOKER') { %>
+	SQL SECURITY  <%- params.securityType %><%
 }
-if (locals.comment) { %>
-	COMMENT <%- comment %><%
+if (params.comment) { %>
+	COMMENT <%- params.comment %><%
 } %>
-<%- body %>$$
-DELIMITER ;
+<%- params.body %><%- end %>

package/exporters/trigger.ejs

@@ -1,7 +1,4 @@
-DROP TRIGGER IF EXISTS <%- schema %>.<%- name %>;
-DELIMITER $$
-CREATE DEFINER=<%- definer %> TRIGGER <%- schema %>.<%- name %>
-	<%- actionTiming %> <%- actionType %> ON `<%- table %>`
+<%- begin %> <%- typeAndName %>
+	<%- params.actionTiming %> <%- params.actionType %> ON `<%- params.table %>`
 	FOR EACH ROW
-<%- body %>$$
-DELIMITER ;
+<%- params.body %><%- end %>

package/exporters/view.ejs

@@ -1,7 +1,7 @@
-CREATE OR REPLACE DEFINER=<%- definer %>
-	SQL SECURITY <%- securityType %>
-	VIEW <%- schema %>.<%- name %>
-AS <%- definition %><%
-if (locals.checkOption != 'NONE') { %>
-WITH <%- checkOption %> CHECK OPTION<%
+<%- createOrReplace %>
+	SQL SECURITY <%- params.securityType %>
+	<%- typeAndName %>
+AS <%- params.definition %><%
+if (params.checkOption != 'NONE') { %>
+WITH <%- params.checkOption %> CHECK OPTION<%
 } %>

package/lib/exporter-engine.js

@@ -3,9 +3,10 @@ const fs = require('fs-extra');
 const Exporter = require('./exporter');
 
 module.exports = class ExporterEngine {
-    constructor(conn, mytDir) {
+    constructor(conn, opts) {
         this.conn = conn;
-        this.pullFile = `${mytDir}/.pullinfo.json`;
+        this.opts = opts;
+        this.pullFile = `${opts.mytDir}/.pullinfo.json`;
         this.exporters = [];
         this.exporterMap = {};
     }
@@ -35,7 +36,7 @@ module.exports = class ExporterEngine {
         ];
 
         for (const type of types) {
-            const exporter = new Exporter(type);
+            const exporter = new Exporter(type, this.opts.replace);
             await exporter.init();
 
             this.exporters.push(exporter);

package/lib/exporter.js

@@ -3,8 +3,11 @@ const fs = require('fs-extra');
 const SqlString = require('sqlstring');
 
 module.exports = class Exporter {
-    constructor(objectType) {
-        this.objectType = objectType;
+    constructor(objectType, replace) {
+        Object.assign(this, {
+            objectType,
+            replace
+        });
     }
 
     async init() {
@@ -38,7 +41,8 @@ module.exports = class Exporter {
 
     format(params) {
         const {attrs} = this;
-        params = Object.assign({}, attrs.defaults, params);
+        params = Object.assign({}, attrs.defaults, params)
+        const data = {params};
 
         if (attrs.formatter)
             attrs.formatter(params);
@@ -50,12 +54,33 @@ module.exports = class Exporter {
         }
 
         const split = params.definer.split('@');
-        params.schema = SqlString.escapeId(params.schema, true);
-        params.name = SqlString.escapeId(params.name, true);
-        params.definer =
+        data.definer =
             SqlString.escapeId(split[0], true) + '@' +
             SqlString.escapeId(split[1], true);
 
-        return this.template(params);
+        data.name =
+            SqlString.escapeId(params.schema, true) + '.' +
+            SqlString.escapeId(params.name, true);
+
+        const objectType = this.objectType.toUpperCase();
+        const delimiter = '$$';
+        const replace = `CREATE OR REPLACE`;
+
+        let create;
+        if (this.replace) {
+            create = `DELIMITER ${delimiter}\n${replace}`
+        } else {
+            create =
+                 `DROP ${objectType} IF EXISTS ${data.name};\n`
+                +`DELIMITER ${delimiter}\n`
+                +`CREATE`;
+        }
+
+        data.createOrReplace = `${replace} DEFINER=${data.definer}`
+        data.begin = `${create} DEFINER=${data.definer}`;
+        data.typeAndName = `${objectType} ${data.name}`;
+        data.end = `${delimiter}\nDELIMITER ;`;
+
+        return this.template(data);
     }
 }

package/myt-clean.js

@@ -1,6 +1,7 @@
 const Myt = require('./myt');
 const Command = require('./lib/command');
 const fs = require('fs-extra');
+const path = require('path');
 
 /**
  * Cleans old applied versions.
@@ -35,9 +36,15 @@ class Clean extends Command {
         && oldVersions.length > opts.maxOldVersions) {
             oldVersions.splice(-opts.maxOldVersions);
 
+            const archiveDir = path.join(opts.versionsDir, '.archive');
+            if (!await fs.pathExists(archiveDir))
+                await fs.mkdir(archiveDir);
+
             for (const oldVersion of oldVersions)
-                await fs.remove(`${opts.versionsDir}/${oldVersion}`,
-                    {recursive: true});
+                await fs.move(
+                    path.join(opts.versionsDir, oldVersion),
+                    path.join(archiveDir, oldVersion)
+                );
 
             console.log(`Old versions deleted: ${oldVersions.length}`);
         } else

package/myt-create.js

@@ -53,7 +53,7 @@ class Create extends Command {
                 break;
         }
 
-        const exporter = new Exporter(opts.type);
+        const exporter = new Exporter(opts.type, opts.replace);
         await exporter.init();
         const sql = exporter.format(params);
 

package/myt-dump.js

@@ -52,16 +52,6 @@ class Dump extends Command {
         }
 
         await dumper.end();
-
-        console.log('Saving version.');
-        await myt.dbConnect();
-        const version = await myt.fetchDbVersion();
-        if (version) {
-            await fs.writeFile(
-                `${opts.dumpDir}/.dump.json`,
-                JSON.stringify(version)
-            );
-        }
     }
 }
 

package/myt-init.js

@@ -1,6 +1,7 @@
 const Myt = require('./myt');
 const Command = require('./lib/command');
 const fs = require('fs-extra');
+const path = require('path');
 
 class Init extends Command {
     static usage = {
@@ -8,12 +9,23 @@ class Init extends Command {
     };
 
     async run(myt, opts) {
-        const templateDir = `${__dirname}/template`;
+        const packageFile = path.join(opts.mytDir, 'package.json');
+        const packageExists = await fs.pathExists(packageFile);
+
+        const templateDir = path.join(__dirname, 'template');
         const templates = await fs.readdir(templateDir);
         for (let template of templates) {
-            const dst = `${opts.mytDir}/${template}`;
+            const dst = path.join(opts.mytDir, template);
             if (!await fs.pathExists(dst))
-                await fs.copy(`${templateDir}/${template}`, dst);
+                await fs.copy(path.join(templateDir, template), dst);
+        }
+
+        if (!packageExists) {
+            const packageJson = require(packageFile);
+            packageJson.dependencies[myt.packageJson.name] =
+                `^${myt.packageJson.version}`;
+            await fs.writeFile(packageFile,
+                JSON.stringify(packageJson, null, '  '));
         }
     }
 }

package/myt-pull.js

@@ -85,7 +85,7 @@ class Pull extends Command {
 
         console.log(`Incorporating routine changes.`);
 
-        const engine = new ExporterEngine(conn, opts.mytDir);
+        const engine = new ExporterEngine(conn, opts);
         await engine.init();
         const shaSums = engine.shaSums;
 
@@ -125,9 +125,11 @@ class Pull extends Command {
         const {opts} = this;
 
         const res = await exporter.query(conn, schema);
-        if (!res.length) return; 
+        if (!res.length) return;
 
-        const routineDir = `${opts.routinesDir}/${schema}/${exporter.objectType}s`;
+        const type = exporter.objectType;
+
+        const routineDir = `${opts.routinesDir}/${schema}/${type}s`;
         if (!await fs.pathExists(routineDir))
             await fs.mkdir(routineDir);
 
@@ -140,8 +142,10 @@ class Pull extends Command {
             const match = routineFile.match(/^(.*)\.sql$/);
             if (!match) continue;
             const routine = match[1];
-            if (!routineSet.has(routine))
+            if (!routineSet.has(routine)) {
                 await fs.remove(`${routineDir}/${routine}.sql`);
+                engine.deleteShaSum(type, schema, routine)
+            }
         }
 
         for (const params of res) {
@@ -150,12 +154,11 @@ class Pull extends Command {
             const routineFile = `${routineDir}/${routineName}.sql`;
             let update = opts.update;
 
-            const oldSum = engine.getShaSum(routineName);
-            if (oldSum || opts.sums) {
+            const oldSum = engine.getShaSum(type, schema, routineName);
+            if (oldSum || opts.sums || (opts.sumViews && type === 'view')) {
                 const shaSum = engine.shaSum(sql);
                 if (oldSum !== shaSum) {
-                    engine.setShaSum(
-                        exporter.objectType, schema, routineName, shaSum);
+                    engine.setShaSum(type, schema, routineName, shaSum);
                     update = true;
                 }
             } else if (params.modified && engine.lastPull) {

package/myt-push.js

@@ -288,7 +288,7 @@ class Push extends Command {
             );
         }
 
-        const engine = new ExporterEngine(conn, opts.mytDir);
+        const engine = new ExporterEngine(conn, opts);
         await engine.init();
 
         async function finalize() {
@@ -349,7 +349,7 @@ class Push extends Command {
                         );
                     }
 
-                    if (opts.sums || oldSum)
+                    if (opts.sums || oldSum || (opts.sumViews && type === 'view'))
                         await engine.fetchShaSum(type, schema, name);
                 } else {
                     const escapedName =

package/myt-run.js

@@ -42,25 +42,30 @@ class Run extends Command {
 
         // Build base image
 
-        let serverDockerfile = path.join(dumpDir, 'Dockerfile');
-        if (!await fs.pathExists(serverDockerfile))
-            serverDockerfile = path.join(serverDir, 'Dockerfile.base');
+        let basePath = dumpDir;
+        let baseDockerfile = path.join(dumpDir, 'Dockerfile');
 
-        await docker.build(__dirname, {
+        if (!await fs.pathExists(baseDockerfile)) {
+            basePath = serverDir;
+            baseDockerfile = path.join(serverDir, 'Dockerfile.base');
+        }
+
+        await docker.build(basePath, {
             tag: 'myt/base',
-            file: serverDockerfile
+            file: baseDockerfile
         }, opts.debug);
 
         // Build server image
 
-        await docker.build(__dirname, {
+        await docker.build(serverDir, {
             tag: 'myt/server',
             file: path.join(serverDir, 'Dockerfile.server')
         }, opts.debug);
 
         // Build dump image
 
-        await docker.build(opts.mytDir, {
+        const dumpContext = path.join(opts.mytDir, 'dump');
+        await docker.build(dumpContext, {
             tag: opts.code,
             file: path.join(serverDir, 'Dockerfile.dump')
         }, opts.debug);

package/myt.js

@@ -45,6 +45,7 @@ class Myt {
             'Myt'.green,
             `v${packageJson.version}`.magenta
         );
+        this.packageJson = packageJson;
 
         let baseOpts = this.constructor.opts;
         baseOpts.default = Object.assign(baseOpts.default || {}, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdnatura/myt",
-  "version": "1.5.8",
+  "version": "1.5.11",
   "author": "Verdnatura Levante SL",
   "description": "MySQL version control",
   "license": "GPL-3.0",
@@ -14,7 +14,7 @@
   "dependencies": {
     "@sqltools/formatter": "^1.2.5",
     "colors": "^1.4.0",
-    "ejs": "^3.1.6",
+    "ejs": "^3.1.8",
     "fs-extra": "^8.1.0",
     "getopts": "^2.3.0",
     "ini": "^1.3.8",

package/server/Dockerfile.dump

@@ -3,9 +3,9 @@ FROM myt/server
 USER root
 
 COPY \
-    dump/.dump.sql  \
-    dump/beforeDump.sql \
-    dump/afterDump.sql \
+    .dump.sql  \
+    beforeDump.sql \
+    afterDump.sql \
     dump/
 
 RUN gosu mysql docker-init.sh

package/server/Dockerfile.server

@@ -8,11 +8,11 @@ RUN mkdir /mysql-data \
 
 WORKDIR /workspace
 
-COPY server/docker.cnf /etc/mysql/conf.d/
+COPY docker.cnf /etc/mysql/conf.d/
 COPY \
-    server/docker-init.sh \
-    server/docker-import.sh \
-    server/docker-start.sh \
+    docker-init.sh \
+    docker-import.sh \
+    docker-start.sh \
     /usr/local/bin/
 
 USER mysql

package/template/dump/Dockerfile.base

@@ -0,0 +1 @@
+FROM mariadb:10.7

package/template/dump/afterDump.sql

@@ -0,0 +1 @@
+-- Executed after data dump

package/template/dump/beforeDump.sql

@@ -0,0 +1 @@
+-- Executed before data dump

package/template/package.json

@@ -8,6 +8,6 @@
         "type": "git"
     },
     "dependencies": {
-        "@verdnatura/myt": "^1.5.8"
+        "@verdnatura/myt": "^1.0.0"
     }
 }

package/template/dump/structure.sql

@@ -1 +0,0 @@
--- Place your local structure changes here