@verdnatura/myt 1.5.19 → 1.5.21

package/lib/dumper.js

@@ -1,83 +1,104 @@
-const docker = require('./docker');
-const fs = require('fs-extra');
-const path = require('path');
-const SqlString = require('sqlstring');
-
-module.exports = class Dumper {
-    constructor(opts) {
-        this.opts = opts;
-    }
-
-    async init(dumpFile) {
-        const dumpDir = this.opts.dumpDir;
-        if (!await fs.pathExists(dumpDir))
-            await fs.mkdir(dumpDir);
-
-        const dumpPath = path.join(dumpDir, dumpFile);
-
-        // FIXME: If it's called after docker.build() statement it creates an 
-        // "invalid" WriteStream
-        const dumpStream = await fs.createWriteStream(dumpPath);
-
-        const buidDir = path.join(__dirname, '..',)
-        await docker.build(buidDir, {
-            tag: 'myt/client',
-            file: path.join(buidDir, 'server', 'Dockerfile.client')
-        }, this.opts.debug);
-
-        this.dumpStream = dumpStream;
-    }
-
-    async use(schema) {
-        await this.dumpStream.write(
-            `USE ${SqlString.escapeId(schema, true)};\n`,
-            'utf8'
-        );
-    }
-
-    async dumpFixtures(tables, replace, args) {
-        const fixturesArgs = [
-            '--no-create-info',
-            '--skip-triggers',
-            '--skip-extended-insert',
-            '--skip-disable-keys',
-            '--skip-add-locks',
-            '--skip-set-charset',
-            '--skip-comments',
-            '--skip-tz-utc'
-        ].concat(args);
-
-        if (replace)
-            fixturesArgs.push('--replace');
-
-        for (const schema in tables) {
-            await this.use(schema);
-            const args = fixturesArgs.concat([schema], tables[schema]);
-            await this.runDump('mysqldump', args, this.dumpStream);
-        }
-    }
-
-    async runDump(command, args) {
-        const iniPath = path.join(this.opts.subdir || '', 'remotes', this.opts.iniFile);
-        const myArgs = [
-            `--defaults-file=${iniPath}`
-        ];
-        const execOptions = {
-            stdio: [
-                process.stdin,
-                this.dumpStream,
-                process.stderr
-            ] 
-        };
-        const commandArgs = [command].concat(myArgs, args);
-        await docker.run('myt/client', commandArgs, {
-            addHost: 'host.docker.internal:host-gateway',
-            volume: `${this.opts.mytDir}:/workspace`,
-            rm: true
-        }, execOptions);
-    }
-
-    async end() {
-        await this.dumpStream.end();
-    }
-}
+const docker = require('./docker');
+const fs = require('fs-extra');
+const path = require('path');
+const SqlString = require('sqlstring');
+
+module.exports = class Dumper {
+    constructor(opts) {
+        this.opts = opts;
+    }
+
+    async init(dumpDir, dumpFile) {
+        if (!await fs.pathExists(dumpDir))
+            await fs.mkdir(dumpDir, {recursive: true});
+
+        const dumpPath = path.join(dumpDir, `${dumpFile}.sql`);
+
+        // FIXME: If it's called after docker.build() statement it creates an 
+        // "invalid" WriteStream
+        const dumpStream = await fs.createWriteStream(dumpPath);
+
+        const buidDir = path.join(__dirname, '..',)
+        await docker.build(buidDir, {
+            tag: 'myt/client',
+            file: path.join(buidDir, 'server', 'Dockerfile.client')
+        }, this.opts.debug);
+
+        this.dumpStream = dumpStream;
+    }
+
+    async end() {
+        await this.dumpStream.end();
+    }
+
+    async use(schema) {
+        await this.dumpStream.write(
+            `USE ${SqlString.escapeId(schema, true)};\n`,
+            'utf8'
+        );
+    }
+
+    async dumpFixtures(tables, replace, args) {
+        let fixturesArgs = [
+            '--no-create-info',
+            '--skip-triggers',
+            '--skip-extended-insert',
+            '--skip-disable-keys',
+            '--skip-add-locks',
+            '--skip-set-charset',
+            '--skip-comments',
+            '--skip-tz-utc'
+        ]
+        if (args)
+            fixturesArgs = fixturesArgs.concat(args);
+        if (replace)
+            fixturesArgs.push('--replace');
+
+        for (const schema in tables) {
+            const args = fixturesArgs.concat([schema], tables[schema]);
+            await this.use(schema);
+            await this.runDump('mysqldump', args);
+        }
+    }
+
+    async dumpPrivileges(tables, args, where) {
+        let privArgs = [
+            '--no-create-info',
+            '--skip-triggers',
+            '--insert-ignore',
+            '--skip-extended-insert',
+            '--skip-add-locks',
+            '--skip-set-charset',
+            '--skip-comments',
+            '--skip-tz-utc'
+        ];
+        if (args)
+            privArgs = privArgs.concat(args);
+        if (where)
+            privArgs.push('--where', where);
+        args = privArgs.concat(['mysql'], tables);
+
+        await this.use('mysql');
+        await this.runDump('mysqldump', args);
+    }
+
+    async runDump(command, args) {
+        const iniPath = path.join(this.opts.subdir || '', 'remotes', this.opts.iniFile);
+        const myArgs = [
+            `--defaults-file=${iniPath}`
+        ];
+        const execOptions = {
+            stdio: [
+                process.stdin,
+                this.dumpStream,
+                process.stderr
+            ] 
+        };
+        const commandArgs = [command].concat(myArgs, args);
+        await docker.run('myt/client', commandArgs, {
+            addHost: 'host.docker.internal:host-gateway',
+            volume: `${this.opts.mytDir}:/workspace`,
+            rm: true
+        }, execOptions);
+    }
+}

package/lib/exporter-engine.js

@@ -1,112 +1,112 @@
-const shajs = require('sha.js');
-const fs = require('fs-extra');
-const Exporter = require('./exporter');
-
-module.exports = class ExporterEngine {
-    constructor(conn, opts) {
-        this.conn = conn;
-        this.opts = opts;
-        this.pullFile = `${opts.mytDir}/.pullinfo.json`;
-        this.exporters = [];
-        this.exporterMap = {};
-    }
-
-    async init () {
-        if (await fs.pathExists(this.pullFile)) {
-            this.pullInfo = JSON.parse(await fs.readFile(this.pullFile, 'utf8'));
-            const lastPull = this.pullInfo.lastPull;
-            if (lastPull)
-                this.pullInfo.lastPull = new Date(lastPull);
-        } else
-            this.pullInfo = {
-                lastPull: null,
-                shaSums: {}
-            };
-
-        this.shaSums = this.pullInfo.shaSums;
-        this.lastPull = this.pullInfo.lastPull;
-        this.infoChanged = false;
-
-        const types = [
-            'function',
-            'procedure',
-            'view',
-            'trigger',
-            'event'
-        ];
-
-        for (const type of types) {
-            const exporter = new Exporter(type, this.opts.replace);
-            await exporter.init();
-
-            this.exporters.push(exporter);
-            this.exporterMap[type] = exporter;
-        }
-    }
-
-    async fetchRoutine(type, schema, name) {
-        const exporter = this.exporterMap[type];
-        const [row] = await exporter.query(this.conn, schema, name);
-        return row && exporter.format(row);
-    }
-
-    async fetchShaSum(type, schema, name) {
-        const sql = await this.fetchRoutine(type, schema, name);
-        this.setShaSum(type, schema, name, this.shaSum(sql));
-    }
-
-    shaSum(sql) {
-        if (!sql) return null;
-        return shajs('sha256')
-            .update(JSON.stringify(sql))
-            .digest('hex');
-    }
-
-    getShaSum(type, schema, name) {
-        try {
-            return this.shaSums[schema][type][name];
-        } catch (e) {};
-
-        return null;
-    }
-
-    setShaSum(type, schema, name, shaSum) {
-        if (!shaSum) {
-            this.deleteShaSum(type, schema, name);
-            return;
-        }
-
-        const shaSums = this.shaSums;
-        if (!shaSums[schema])
-            shaSums[schema] = {};
-        if (!shaSums[schema][type])
-            shaSums[schema][type] = {};
-        shaSums[schema][type][name] = shaSum;
-        this.infoChanged = true;
-    }
-
-    deleteShaSum(type, schema, name) {
-        try {
-            delete this.shaSums[schema][type][name];
-            this.infoChanged = true;
-        } catch (e) {};
-    }
-
-    deleteSchemaSums(schema) {
-        delete this.shaSums[schema];
-        this.infoChanged = true;
-    }
-
-    async refreshPullDate() {
-        const [[row]] = await this.conn.query(`SELECT NOW() now`);
-        this.pullInfo.lastPull = row.now;
-        this.infoChanged = true;
-    }
-
-    async saveInfo() {
-        if (!this.infoChanged) return;
-        await fs.writeFile(this.pullFile,
-            JSON.stringify(this.pullInfo, null, '  '));
-        this.infoChanged = false;
-    }
-}
+const shajs = require('sha.js');
+const fs = require('fs-extra');
+const Exporter = require('./exporter');
+
+module.exports = class ExporterEngine {
+    constructor(conn, opts) {
+        this.conn = conn;
+        this.opts = opts;
+        this.pullFile = `${opts.mytDir}/.pullinfo.json`;
+        this.exporters = [];
+        this.exporterMap = {};
+    }
+
+    async init () {
+        if (await fs.pathExists(this.pullFile)) {
+            this.pullInfo = JSON.parse(await fs.readFile(this.pullFile, 'utf8'));
+            const lastPull = this.pullInfo.lastPull;
+            if (lastPull)
+                this.pullInfo.lastPull = new Date(lastPull);
+        } else
+            this.pullInfo = {
+                lastPull: null,
+                shaSums: {}
+            };
+
+        this.shaSums = this.pullInfo.shaSums;
+        this.lastPull = this.pullInfo.lastPull;
+        this.infoChanged = false;
+
+        const types = [
+            'function',
+            'procedure',
+            'view',
+            'trigger',
+            'event'
+        ];
+
+        for (const type of types) {
+            const exporter = new Exporter(type, this.opts.replace);
+            await exporter.init();
+
+            this.exporters.push(exporter);
+            this.exporterMap[type] = exporter;
+        }
+    }
+
+    async fetchRoutine(type, schema, name) {
+        const exporter = this.exporterMap[type];
+        const [row] = await exporter.query(this.conn, schema, name);
+        return row && exporter.format(row);
+    }
+
+    async fetchShaSum(type, schema, name) {
+        const sql = await this.fetchRoutine(type, schema, name);
+        this.setShaSum(type, schema, name, this.shaSum(sql));
+    }
+
+    shaSum(sql) {
+        if (!sql) return null;
+        return shajs('sha256')
+            .update(JSON.stringify(sql))
+            .digest('hex');
+    }
+
+    getShaSum(type, schema, name) {
+        try {
+            return this.shaSums[schema][type][name];
+        } catch (e) {};
+
+        return null;
+    }
+
+    setShaSum(type, schema, name, shaSum) {
+        if (!shaSum) {
+            this.deleteShaSum(type, schema, name);
+            return;
+        }
+
+        const shaSums = this.shaSums;
+        if (!shaSums[schema])
+            shaSums[schema] = {};
+        if (!shaSums[schema][type])
+            shaSums[schema][type] = {};
+        shaSums[schema][type][name] = shaSum;
+        this.infoChanged = true;
+    }
+
+    deleteShaSum(type, schema, name) {
+        try {
+            delete this.shaSums[schema][type][name];
+            this.infoChanged = true;
+        } catch (e) {};
+    }
+
+    deleteSchemaSums(schema) {
+        delete this.shaSums[schema];
+        this.infoChanged = true;
+    }
+
+    async refreshPullDate() {
+        const [[row]] = await this.conn.query(`SELECT NOW() now`);
+        this.pullInfo.lastPull = row.now;
+        this.infoChanged = true;
+    }
+
+    async saveInfo() {
+        if (!this.infoChanged) return;
+        await fs.writeFile(this.pullFile,
+            JSON.stringify(this.pullInfo, null, '  '));
+        this.infoChanged = false;
+    }
+}

package/lib/exporter.js

@@ -1,86 +1,86 @@
-const ejs = require('ejs');
-const fs = require('fs-extra');
-const SqlString = require('sqlstring');
-
-module.exports = class Exporter {
-    constructor(objectType, replace) {
-        Object.assign(this, {
-            objectType,
-            replace
-        });
-    }
-
-    async init() {
-        const templateDir = `${__dirname}/../exporters/${this.objectType}`;
-        this.sql = await fs.readFile(`${templateDir}.sql`, 'utf8');
-
-        const templateFile = await fs.readFile(`${templateDir}.ejs`, 'utf8');
-        this.template = ejs.compile(templateFile);
-        this.attrs = require(`${templateDir}.js`);
-    }
-
-    async query(conn, schema, name) {
-        const ops = [];
-        function addOp(col, value) {
-            ops.push(conn.format('?? = ?', [col, value]));
-        }
-        if (schema)
-            addOp(this.attrs.schemaCol, schema);
-        if (name)
-            addOp(this.attrs.nameCol, name);
-
-        const filter = {
-            toSqlString() {
-                return ops.join(' AND ');
-            }
-        }
-
-        const [res] = await conn.query(this.sql, [filter]);
-        return res;
-    }
-
-    format(params) {
-        const {attrs} = this;
-        params = Object.assign({}, attrs.defaults, params)
-        const data = {params};
-
-        if (attrs.formatter)
-            attrs.formatter(params);
-
-        if (attrs.escapeCols)
-        for (const escapeCol of attrs.escapeCols) {
-            if (params[escapeCol])
-                params[escapeCol] = SqlString.escape(params[escapeCol])
-        }
-
-        const split = params.definer.split('@');
-        data.definer =
-            SqlString.escapeId(split[0], true) + '@' +
-            SqlString.escapeId(split[1], true);
-
-        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);
-    }
-}
+const ejs = require('ejs');
+const fs = require('fs-extra');
+const SqlString = require('sqlstring');
+
+module.exports = class Exporter {
+    constructor(objectType, replace) {
+        Object.assign(this, {
+            objectType,
+            replace
+        });
+    }
+
+    async init() {
+        const templateDir = `${__dirname}/../exporters/${this.objectType}`;
+        this.sql = await fs.readFile(`${templateDir}.sql`, 'utf8');
+
+        const templateFile = await fs.readFile(`${templateDir}.ejs`, 'utf8');
+        this.template = ejs.compile(templateFile);
+        this.attrs = require(`${templateDir}.js`);
+    }
+
+    async query(conn, schema, name) {
+        const ops = [];
+        function addOp(col, value) {
+            ops.push(conn.format('?? = ?', [col, value]));
+        }
+        if (schema)
+            addOp(this.attrs.schemaCol, schema);
+        if (name)
+            addOp(this.attrs.nameCol, name);
+
+        const filter = {
+            toSqlString() {
+                return ops.join(' AND ');
+            }
+        }
+
+        const [res] = await conn.query(this.sql, [filter]);
+        return res;
+    }
+
+    format(params) {
+        const {attrs} = this;
+        params = Object.assign({}, attrs.defaults, params)
+        const data = {params};
+
+        if (attrs.formatter)
+            attrs.formatter(params);
+
+        if (attrs.escapeCols)
+        for (const escapeCol of attrs.escapeCols) {
+            if (params[escapeCol])
+                params[escapeCol] = SqlString.escape(params[escapeCol])
+        }
+
+        const split = params.definer.split('@');
+        data.definer =
+            SqlString.escapeId(split[0], true) + '@' +
+            SqlString.escapeId(split[1], true);
+
+        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/lib/repo.js

@@ -1,29 +1,29 @@
-const nodegit = require('nodegit');
-
-async function getStaged(repo) {
-    const head = await repo.getHeadCommit();
-
-    try {
-        const emptyTree = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
-        const headTree = await (head
-            ? head.getTree()
-            : nodegit.Tree.lookup(repo, emptyTree)
-        );
-        return await nodegit.Diff.treeToIndex(repo, headTree, null);
-    } catch (err) {
-        console.warn('Cannot fetch staged changes:', err.message);
-    }
-}
-
-async function getUnstaged(repo) {
-    const Diff = nodegit.Diff;
-    return await Diff.indexToWorkdir(repo, null, {
-        flags: Diff.OPTION.SHOW_UNTRACKED_CONTENT
-            | Diff.OPTION.RECURSE_UNTRACKED_DIRS
-    });
-}
-
-module.exports = {
-    getStaged,
-    getUnstaged
-};
+const nodegit = require('nodegit');
+
+async function getStaged(repo) {
+    const head = await repo.getHeadCommit();
+
+    try {
+        const emptyTree = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
+        const headTree = await (head
+            ? head.getTree()
+            : nodegit.Tree.lookup(repo, emptyTree)
+        );
+        return await nodegit.Diff.treeToIndex(repo, headTree, null);
+    } catch (err) {
+        console.warn('Cannot fetch staged changes:', err.message);
+    }
+}
+
+async function getUnstaged(repo) {
+    const Diff = nodegit.Diff;
+    return await Diff.indexToWorkdir(repo, null, {
+        flags: Diff.OPTION.SHOW_UNTRACKED_CONTENT
+            | Diff.OPTION.RECURSE_UNTRACKED_DIRS
+    });
+}
+
+module.exports = {
+    getStaged,
+    getUnstaged
+};