@datatruck/cli 0.40.2 → 0.40.4

package/lib/actions/BackupAction.js

@@ -249,7 +249,7 @@ class BackupAction {
     }
     async exec() {
         const { options, settings } = this;
-        const gc = new temp_1.GargabeCollector();
+        const gc = new temp_1.GargabeCollector(this.options.verbose);
         const pm = new progress_1.ProgressManager({
             verbose: options.verbose,
             tty: settings.tty,

package/lib/actions/ExportAction.js

@@ -155,7 +155,7 @@ class ExportAction {
     }
     async exec() {
         const { options, settings } = this;
-        const gc = new temp_1.GargabeCollector();
+        const gc = new temp_1.GargabeCollector(this.options.verbose);
         const pm = new progress_1.ProgressManager({
             verbose: options.verbose,
             tty: settings.tty,

package/lib/actions/RestoreAction.js

@@ -168,7 +168,7 @@ class RestoreAction {
     }
     async exec() {
         const { options, settings } = this;
-        const gc = new temp_1.GargabeCollector();
+        const gc = new temp_1.GargabeCollector(this.options.verbose);
         const pm = new progress_1.ProgressManager({
             verbose: options.verbose,
             tty: settings.tty,

package/lib/utils/cli.js

@@ -52,7 +52,7 @@ function logExec(command, argv = [], env, logToStderr) {
         }, [])
             .join(" ")
         : "";
-    const text = `+ ${envText ? envText + " " : ""}${chalk_1.default.yellow(`${command} ${argv.join(" ")}`)}`;
+    const text = `+ ${envText ? envText + " " : ""}${chalk_1.default.yellow(`${command} ${argv.map(String).join(" ")}`)}`;
     logToStderr /* && process.env.VITEST !== "true"*/
         ? process.stderr.write(`${text}\n`)
         : console.info(text);

package/lib/utils/mysql.js

@@ -43,13 +43,21 @@ async function assertDumpFile(path) {
 async function createMysqlCli(options) {
     let sqlConfigPath;
     const password = (await (0, fs_1.fetchData)(options.password, (p) => p.path)) ?? "";
-    const sql = await (0, promise_1.createConnection)({
+    const connectionOptions = {
         host: options.hostname,
         user: options.username,
         password,
         port: options.port,
         database: options.database,
-    });
+    };
+    if (options.verbose)
+        (0, cli_1.logExec)("sql.createConnection", [
+            JSON.stringify({
+                ...connectionOptions,
+                password: "********",
+            }, null, 2),
+        ]);
+    const sql = await (0, promise_1.createConnection)(connectionOptions);
     async function createSqlConfig() {
         if (sqlConfigPath)
             return sqlConfigPath;
@@ -70,19 +78,23 @@ async function createMysqlCli(options) {
         return [`--defaults-file=${await createSqlConfig()}`];
     }
     async function fetchAll(query, params) {
+        if (options.verbose)
+            (0, cli_1.logExec)("> sql.query", [query, JSON.stringify({ params }, null, 2)]);
         const [rows] = await sql.query(query, params);
+        if (options.verbose)
+            (0, cli_1.logExec)("< sql.query", [JSON.stringify(rows, null, 2)]);
         return rows;
     }
     async function fetchTableNames(database, include, exclude) {
         return (await fetchAll(`
       SELECT
-        table_name 
+        TABLE_NAME AS table_name
       FROM
-        information_schema.tables
+        information_schema.TABLES
       WHERE
-        table_schema = ?
+        TABLE_SCHEMA = ?
       ORDER BY
-        table_name
+        TABLE_NAME
   `, [database]))
             .map((r) => r.table_name)
             .filter((0, string_1.createPatternFilter)({ include, exclude }));
@@ -102,6 +114,8 @@ async function createMysqlCli(options) {
                     "--no-data",
                     "--no-create-db",
                     "--skip-opt",
+                    // https://jira.mariadb.org/browse/MDEV-35091
+                    "--create-options",
                 ]
                 : []),
             ...(input.items || []),
@@ -184,14 +198,14 @@ async function createMysqlCli(options) {
       SELECT
         COUNT(*) AS total 
       FROM
-        information_schema.tables
+        information_schema.TABLES
       WHERE
-        table_schema = ?
+        TABLE_SCHEMA = ?
     `, [database]);
         return Number(row.total) ? false : true;
     }
     async function createDatabase(database) {
-        await sql.execute(`
+        await execute(`
       CREATE DATABASE IF NOT EXISTS \`${database.name}\`
       CHARACTER SET ${database.charset ?? "utf8"}
       COLLATE ${database.charset ?? "utf8_general_ci"}
@@ -221,7 +235,7 @@ async function createMysqlCli(options) {
         try {
             await (0, fs_1.mkdirIfNotExists)(dir);
             await (0, promises_1.chmod)(dir, 0o777);
-            await sql.execute(`SELECT 1 INTO OUTFILE ${outFileVar}`);
+            await execute(`SELECT 1 INTO OUTFILE ${outFileVar}`);
             const exists = await (0, fs_1.existsFile)(outFile);
             if (!exists)
                 throw new error_1.AppError(`MySQL shared dir is not reached: ${dir}`);
@@ -234,14 +248,8 @@ async function createMysqlCli(options) {
         }
     }
     async function execute(query, params = []) {
-        if (options.verbose) {
-            (0, cli_1.logExec)(`mysql`, [
-                ...(await args()),
-                "-e",
-                `"${flatQuery(query)}"`,
-                ...(sql.config.database ? [sql.config.database] : []),
-            ]);
-        }
+        if (options.verbose)
+            (0, cli_1.logExec)("> sql.execute", [query, JSON.stringify({ params }, null, 2)]);
         await sql.execute(query, params);
     }
     async function insert(tableName, item) {
@@ -255,10 +263,14 @@ async function createMysqlCli(options) {
         await execute(`INSERT INTO ${tableName} (${columnsExpr}) VALUES (${paramsExpr})`, params);
     }
     async function changeDatabase(name) {
+        if (options.verbose)
+            (0, cli_1.logExec)("sql.changeUser", [name]);
         await sql.changeUser({ database: name });
     }
     return {
         async [Symbol.asyncDispose]() {
+            if (options.verbose)
+                (0, cli_1.logExec)("sql.end");
             await sql.end();
         },
         options,

package/lib/utils/temp.d.ts

@@ -13,10 +13,10 @@ export declare function useTempFile(path: string): AsyncDisposable & {
     path: string;
 };
 export declare class GargabeCollector {
-    protected parent?: GargabeCollector | undefined;
+    protected verbose?: boolean | undefined;
     readonly paths: Set<string>;
     readonly children: Set<GargabeCollector>;
-    constructor(parent?: GargabeCollector | undefined);
+    constructor(verbose?: boolean | undefined);
     pending(): boolean;
     cleanup(): Promise<void>;
     dispose(): Promise<void>;

package/lib/utils/temp.js

@@ -85,11 +85,11 @@ function useTempFile(path) {
     };
 }
 class GargabeCollector {
-    parent;
+    verbose;
     paths = new Set();
     children = new Set();
-    constructor(parent) {
-        this.parent = parent;
+    constructor(verbose) {
+        this.verbose = verbose;
         exports.collectors.add(this);
     }
     pending() {
@@ -103,7 +103,8 @@ class GargabeCollector {
     async cleanup() {
         for (const path of this.paths) {
             try {
-                await rmTmpDir(path);
+                if (!this.verbose)
+                    await rmTmpDir(path);
                 this.paths.delete(path);
             }
             catch (_) { }
@@ -132,7 +133,7 @@ class GargabeCollector {
         };
     }
     create() {
-        const gc = new GargabeCollector();
+        const gc = new GargabeCollector(this.verbose);
         this.children.add(gc);
         return gc;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.40.2",
+  "version": "0.40.4",
   "description": "Tool for creating and managing backups",
   "homepage": "https://github.com/swordev/datatruck#readme",
   "bugs": {
@@ -31,11 +31,11 @@
     "async": "^3.2.6",
     "chalk": "^4.1.2",
     "commander": "^12.1.0",
-    "croner": "^8.1.1",
+    "croner": "^8.1.2",
     "dayjs": "^1.11.13",
     "fast-folder-size": "^2.2.0",
     "fast-glob": "^3.3.2",
-    "listr2": "^8.2.4",
+    "listr2": "^8.2.5",
     "micromatch": "^4.0.8",
     "mongodb": "^6.9.0",
     "mysql2": "^3.11.3",