@verdnatura/myt 1.5.6 → 1.5.8

package/myt-dump.js

@@ -1,7 +1,7 @@
-
 const Myt = require('./myt');
 const Command = require('./lib/command');
 const fs = require('fs-extra');
+const Dumper = require('./lib/dumper');
 
 class Dump extends Command {
     static usage = {
@@ -9,14 +9,15 @@ class Dump extends Command {
         operand: 'remote'
     };
 
-    static localOpts = {
+    static opts = {
         default: {
             remote: 'production'
         }
     };
 
     async run(myt, opts) {
-        const dumpStream = await myt.initDump('.dump.sql');
+        const dumper = new Dumper(opts);
+        await dumper.init('.dump.sql');
 
         console.log('Dumping structure.');
         let dumpArgs = [
@@ -29,10 +30,10 @@ class Dump extends Command {
             '--databases'
         ];
         dumpArgs = dumpArgs.concat(opts.schemas);
-        await myt.runDump('docker-dump.sh', dumpArgs, dumpStream);
+        await dumper.runDump('docker-dump.sh', dumpArgs);
 
         console.log('Dumping fixtures.');
-        await myt.dumpFixtures(dumpStream, opts.fixtures);
+        await dumper.dumpFixtures(opts.fixtures);
 
         console.log('Dumping privileges.');
         const privs = opts.privileges;
@@ -45,12 +46,12 @@ class Dump extends Command {
             ];
             if (privs.where) args.push('--where', privs.where);
             args = args.concat(['mysql'], privs.tables);
-            
-            await dumpStream.write('USE `mysql`;\n', 'utf8');
-            await myt.runDump('mysqldump', args, dumpStream);
+
+            await dumper.use('mysql');
+            await dumper.runDump('mysqldump', args);
         }
 
-        await dumpStream.end();
+        await dumper.end();
 
         console.log('Saving version.');
         await myt.dbConnect();

package/myt-fixtures.js

@@ -1,6 +1,6 @@
-
 const Myt = require('./myt');
 const Command = require('./lib/command');
+const Dumper = require('./lib/dumper');
 
 class Fixtures extends Command {
     static usage = {
@@ -8,16 +8,17 @@ class Fixtures extends Command {
         operand: 'remote'
     };
 
-    static localOpts = {
+    static opts = {
         default: {
             remote: 'docker'
         }
     };
 
     async run(myt, opts) {
-        const dumpStream = await myt.initDump('fixtures.sql');
-        await myt.dumpFixtures(dumpStream, opts.localFixtures, true);
-        await dumpStream.end();
+        const dumper = new Dumper(opts);
+        await dumper.init('fixtures.sql');
+        await dumper.dumpFixtures(opts.localFixtures, true);
+        await dumper.end();
     }
 }
 

package/myt-init.js

@@ -1,4 +1,3 @@
-
 const Myt = require('./myt');
 const Command = require('./lib/command');
 const fs = require('fs-extra');

package/myt-pull.js

@@ -1,9 +1,9 @@
-
 const Myt = require('./myt');
 const Command = require('./lib/command');
 const fs = require('fs-extra');
 const nodegit = require('nodegit');
 const ExporterEngine = require('./lib/exporter-engine');
+const repoExt = require('./lib/repo');
 
 class Pull extends Command {
     static usage = {
@@ -17,7 +17,7 @@ class Pull extends Command {
         operand: 'remote'
     };
 
-    static localOpts = {
+    static opts = {
         alias: {
             force: 'f',
             checkout: 'c',
@@ -52,14 +52,14 @@ class Pull extends Command {
 
             // Check for unstaged changes
 
-            const unstagedDiff = await myt.getUnstaged(repo);
+            const unstagedDiff = await repoExt.getUnstaged(repo);
 
             if (await hasChanges(unstagedDiff))
                 throw new Error('You have unstaged changes, save them before pull');
 
             // Check for staged changes
 
-            const stagedDiff = await myt.getStaged(repo);
+            const stagedDiff = await repoExt.getStaged(repo);
  
             if (await hasChanges(stagedDiff))
                 throw new Error('You have staged changes, save them before pull');
@@ -114,13 +114,64 @@ class Pull extends Command {
                 await fs.mkdir(schemaDir);
 
             for (const exporter of engine.exporters)
-                await exporter.export(routinesDir,
-                    schema, opts.update, opts.sums);
+                await this.export(conn, engine, exporter, schema);
         }
 
         await engine.refreshPullDate();
         await engine.saveInfo();
     }
+
+    async export(conn, engine, exporter, schema) {
+        const {opts} = this;
+
+        const res = await exporter.query(conn, schema);
+        if (!res.length) return; 
+
+        const routineDir = `${opts.routinesDir}/${schema}/${exporter.objectType}s`;
+        if (!await fs.pathExists(routineDir))
+            await fs.mkdir(routineDir);
+
+        const routineSet = new Set();
+        for (const params of res)
+            routineSet.add(params.name);
+
+        const routines = await fs.readdir(routineDir);
+        for (const routineFile of routines) {
+            const match = routineFile.match(/^(.*)\.sql$/);
+            if (!match) continue;
+            const routine = match[1];
+            if (!routineSet.has(routine))
+                await fs.remove(`${routineDir}/${routine}.sql`);
+        }
+
+        for (const params of res) {
+            const routineName = params.name;
+            const sql = exporter.format(params);
+            const routineFile = `${routineDir}/${routineName}.sql`;
+            let update = opts.update;
+
+            const oldSum = engine.getShaSum(routineName);
+            if (oldSum || opts.sums) {
+                const shaSum = engine.shaSum(sql);
+                if (oldSum !== shaSum) {
+                    engine.setShaSum(
+                        exporter.objectType, schema, routineName, shaSum);
+                    update = true;
+                }
+            } else if (params.modified && engine.lastPull) {
+                if (params.modified > engine.lastPull)
+                    update = true;
+            } else if (await fs.pathExists(routineFile)) {
+                const currentSql = await fs.readFile(routineFile, 'utf8');
+                if (sql != currentSql)
+                    update = true;
+            } else
+                update = true;
+
+            if (update)
+                await fs.writeFile(routineFile, sql);
+        }
+    }
 }
 
 module.exports = Pull;

package/myt-push.js

@@ -1,9 +1,11 @@
-
 const Myt = require('./myt');
 const Command = require('./lib/command');
 const fs = require('fs-extra');
 const nodegit = require('nodegit');
 const ExporterEngine = require('./lib/exporter-engine');
+const connExt = require('./lib/conn');
+const repoExt = require('./lib/repo');
+const SqlString = require('sqlstring');
 
 /**
  * Pushes changes to remote.
@@ -20,7 +22,7 @@ class Push extends Command {
         operand: 'remote'
     };
 
-    static localOpts = {
+    static opts = {
         alias: {
             force: 'f',
             commit: 'c',
@@ -217,7 +219,7 @@ class Push extends Command {
 
                     let err;
                     try {
-                        await myt.queryFromFile(pushConn,
+                        await connExt.queryFromFile(pushConn,
                             `${scriptsDir}/${script}`);
                     } catch (e) {
                         err = e;
@@ -261,7 +263,7 @@ class Push extends Command {
         const gitExists = await fs.pathExists(`${opts.workspace}/.git`);
 
         let nRoutines = 0;
-        let changes = await myt.changedRoutines(version.gitCommit);
+        let changes = await this.changedRoutines(version.gitCommit);
         changes = this.parseChanges(changes);
 
         const routines = [];
@@ -328,13 +330,13 @@ class Push extends Command {
             console.log('', actionMsg.bold, typeMsg.bold, change.fullName);
 
             if (!isEqual) {
-                const scapedSchema = pushConn.escapeId(schema, true);
+                const scapedSchema = SqlString.escapeId(schema, true);
 
                 if (exists) {
                     if (change.type.name === 'VIEW')
                         await pushConn.query(`USE ${scapedSchema}`);
 
-                    await myt.multiQuery(pushConn, newSql);
+                    await connExt.multiQuery(pushConn, newSql);
 
                     if (change.isRoutine) {
                         await conn.query(
@@ -352,7 +354,7 @@ class Push extends Command {
                 } else {
                     const escapedName =
                         scapedSchema + '.' +
-                        pushConn.escapeId(name, true);
+                        SqlString.escapeId(name, true);
 
                     const query = `DROP ${change.type.name} IF EXISTS ${escapedName}`;
                     await pushConn.query(query);
@@ -400,7 +402,7 @@ class Push extends Command {
     }
 
     async updateVersion(column, value) {
-        column = this.conn.escapeId(column, true);
+        column = SqlString.escapeId(column, true);
         await this.conn.query(
             `INSERT INTO version
                 SET code = ?,
@@ -416,6 +418,68 @@ class Push extends Command {
         );
     }
 
+    async changedRoutines(commitSha) {
+        const repo = await this.myt.openRepo();
+        const changes = [];
+        const changesMap = new Map();
+
+        async function pushChanges(diff) {
+            if (!diff) return;
+            const patches = await diff.patches();
+
+            for (const patch of patches) {
+                const path = patch.newFile().path();
+                const match = path.match(/^routines\/(.+)\.sql$/);
+                if (!match) continue;
+
+                let change = changesMap.get(match[1]);
+                if (!change) {
+                    change = {path: match[1]};
+                    changes.push(change);
+                    changesMap.set(match[1], change);
+                }
+                change.mark = patch.isDeleted() ? '-' : '+';
+            }
+        }
+
+        const head = await repo.getHeadCommit();
+
+        if (head && commitSha) {
+            let commit;
+            let notFound;
+
+            try {
+                commit = await repo.getCommit(commitSha);
+                notFound = false;
+            } catch (err) {
+                if (err.errorFunction == 'Commit.lookup')
+                    notFound = true;
+                else
+                    throw err;
+            }
+
+            if (notFound) {
+                console.warn(`Database commit not found, trying git fetch`.yellow);
+                await repo.fetchAll();
+                commit = await repo.getCommit(commitSha);
+            }
+
+            const commitTree = await commit.getTree();
+
+            const headTree = await head.getTree();
+            const diff = await headTree.diff(commitTree);
+            await pushChanges(diff);
+        }
+
+        await pushChanges(await repoExt.getUnstaged(repo));
+        await pushChanges(await repoExt.getStaged(repo));
+
+        return changes.sort((a, b) => {
+            if (b.mark != a.mark)
+                return b.mark == '-' ? 1 : -1;
+            return a.path.localeCompare(b.path);
+        });
+    }
 }
 
 const typeMap = {

package/myt-run.js

@@ -1,4 +1,3 @@
-
 const Myt = require('./myt');
 const Command = require('./lib/command');
 const Push = require('./myt-push');
@@ -6,6 +5,7 @@ const docker = require('./lib/docker');
 const fs = require('fs-extra');
 const path = require('path');
 const Server = require('./lib/server');
+const connExt = require('./lib/conn');
 
 /**
  * Builds the database image and runs a container. It only rebuilds the
@@ -22,7 +22,7 @@ class Run extends Command {
         }
     };
 
-    static localOpts = {
+    static opts = {
         alias: {
             ci: 'c',
             random: 'r'
@@ -144,7 +144,7 @@ class Run extends Command {
 
             const triggersDir = await fs.readdir(triggersPath);
             for (const triggerFile of triggersDir)
-                await myt.queryFromFile(conn, `${triggersPath}/${triggerFile}`);
+                await connExt.queryFromFile(conn, `${triggersPath}/${triggerFile}`);
         }
 
         return server;

package/myt-start.js

@@ -1,4 +1,3 @@
-
 const Myt = require('./myt');
 const Command = require('./lib/command');
 const Container = require('./lib/docker').Container;

package/myt-version.js

@@ -1,4 +1,3 @@
-
 const Myt = require('./myt');
 const Command = require('./lib/command');
 const fs = require('fs-extra');
@@ -15,7 +14,7 @@ class Version extends Command {
         operand: 'name'
     };
 
-    static localOpts = {
+    static opts = {
         alias: {
             name: 'n'
         },