@datatruck/cli 0.22.0 → 0.22.2

package/Task/MysqlDumpTask.js

@@ -55,9 +55,12 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
                 });
                 if (sharedDir) {
                     const tableSharedPath = (0, path_1.join)(sharedDir, `tmp-dtt-backup-${data.snapshot.id.slice(0, 8)}-${tableName}`);
-                    if (data.options.verbose)
-                        (0, cli_1.logExec)("mkdir", [tableSharedPath]);
+                    if (data.options.verbose) {
+                        (0, cli_1.logExec)("mkdir", ["-p", tableSharedPath]);
+                        (0, cli_1.logExec)("chmod", ["777", tableSharedPath]);
+                    }
                     await (0, promises_1.mkdir)(tableSharedPath, { recursive: true });
+                    await (0, promises_1.chmod)(tableSharedPath, 0o777);
                     try {
                         await sql.csvDump({
                             sharedPath: tableSharedPath,
@@ -71,8 +74,8 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
                             files.every((file) => file === schemaFile || file === dataFile);
                         if (!successCsvDump)
                             throw new AppError_1.AppError(`Invalid csv dump files: ${files.join(", ")}`);
-                        await (0, promises_1.rename)((0, path_1.join)(tableSharedPath, schemaFile), (0, path_1.join)(outputPath, `${tableName}${suffix.tableSchema}`));
-                        await (0, promises_1.rename)((0, path_1.join)(tableSharedPath, dataFile), (0, path_1.join)(outputPath, `${tableName}${suffix.tableData}`));
+                        await (0, fs_1.safeRename)((0, path_1.join)(tableSharedPath, schemaFile), (0, path_1.join)(outputPath, `${tableName}${suffix.tableSchema}`));
+                        await (0, fs_1.safeRename)((0, path_1.join)(tableSharedPath, dataFile), (0, path_1.join)(outputPath, `${tableName}${suffix.tableData}`));
                     }
                     finally {
                         await (0, promises_1.rm)(tableSharedPath, { recursive: true });
@@ -211,7 +214,7 @@ class MysqlDumpTask extends TaskAbstract_1.TaskAbstract {
             });
             const sharedFilePath = (0, path_1.join)(sharedDir, `tmp-dtt-restore-${data.snapshot.id.slice(0, 8)}-${tableName}.data.csv`);
             try {
-                await (0, promises_1.rename)(filePath, sharedFilePath);
+                await (0, fs_1.safeRename)(filePath, sharedFilePath);
                 await sql.importCsvFile(sharedFilePath, database.name, tableName);
             }
             finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datatruck/cli",
-  "version": "0.22.0",
+  "version": "0.22.2",
   "dependencies": {
     "ajv": "^8.12.0",
     "async": "^3.2.4",

package/utils/fs.d.ts

@@ -120,4 +120,5 @@ export declare function createWriteStreamPool(options: {
 };
 export declare function countFileLines(path: string): Promise<number>;
 export declare function fetchData<T>(input: T, onPath?: (input: Exclude<T, string>) => string | undefined): Promise<string | null>;
+export declare function safeRename(oldPath: string, newPath: string): Promise<void>;
 export {};

package/utils/fs.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetchData = exports.countFileLines = exports.createWriteStreamPool = exports.createFileScanner = exports.cpy = exports.isNotFoundError = exports.updateFileStats = exports.copyFileWithStreams = exports.waitForClose = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.readPartialFile = exports.mkTmpDir = exports.fastFolderSizeAsync = exports.tmpDir = exports.rmTmpDir = exports.isTmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.writeJSONFile = exports.existsFile = exports.existsDir = exports.safeStat = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isLocalDir = exports.isEmptyDir = exports.isWSLSystem = void 0;
+exports.safeRename = exports.fetchData = exports.countFileLines = exports.createWriteStreamPool = exports.createFileScanner = exports.cpy = exports.isNotFoundError = exports.updateFileStats = exports.copyFileWithStreams = exports.waitForClose = exports.writeGitIgnoreList = exports.fastglobToGitIgnore = exports.forEachFile = exports.readDir = exports.readPartialFile = exports.mkTmpDir = exports.fastFolderSizeAsync = exports.tmpDir = exports.rmTmpDir = exports.isTmpDir = exports.sessionTmpDir = exports.parentTmpDir = exports.findFile = exports.parsePackageFile = exports.parseFile = exports.parseFileExtensions = exports.writeJSONFile = exports.existsFile = exports.existsDir = exports.safeStat = exports.ensureEmptyDir = exports.mkdirIfNotExists = exports.isLocalDir = exports.isEmptyDir = exports.isWSLSystem = void 0;
 const globalData_1 = __importDefault(require("../globalData"));
 const math_1 = require("./math");
 const path_1 = require("./path");
@@ -544,3 +544,19 @@ async function fetchData(input, onPath) {
     return null;
 }
 exports.fetchData = fetchData;
+async function safeRename(oldPath, newPath) {
+    try {
+        await (0, promises_1.rename)(oldPath, newPath);
+    }
+    catch (error) {
+        if (error instanceof Error &&
+            error.message.includes("cross-device link not permitted")) {
+            await (0, promises_1.cp)(oldPath, newPath, { recursive: true });
+            await (0, promises_1.rm)(oldPath, { recursive: true });
+        }
+        else {
+            throw error;
+        }
+    }
+}
+exports.safeRename = safeRename;

package/utils/mysql.d.ts

@@ -11,7 +11,7 @@ export declare function createMysqlCli(options: MysqlCliOptions): {
     options: MysqlCliOptions;
     initSharedDir: (sharedDir?: string) => Promise<string>;
     args: () => Promise<string[]>;
-    run: (query: string, database?: string) => Promise<import("./process").ExecResultType>;
+    run: (query: string, database?: string, extra?: string[]) => Promise<import("./process").ExecResultType>;
     fetchAll: (query: string, database?: string) => Promise<string[][]>;
     dump: (input: {
         output: string;

package/utils/mysql.js

@@ -11,19 +11,30 @@ const promises_1 = require("fs/promises");
 const os_1 = require("os");
 const path_1 = require("path");
 function createMysqlCli(options) {
-    async function args() {
+    let defaultsFilePath;
+    async function getDefaultsFilePath() {
+        if (defaultsFilePath)
+            return defaultsFilePath;
+        const dir = await (0, fs_1.mkTmpDir)("mysql-cli");
         const password = await (0, fs_1.fetchData)(options.password, (p) => p.path);
-        return [
-            `--host=${options.hostname}`,
-            ...(options.port ? [`--port=${options.port}`] : []),
-            `--user=${options.username}`,
-            `--password=${password ?? ""}`,
+        const data = [
+            `[client]`,
+            `host = "${options.hostname}"`,
+            ...(options.port ? [`port = "${options.port}"`] : []),
+            `user = "${options.username}"`,
+            `password = "${password}"`,
         ];
+        await (0, promises_1.writeFile)((defaultsFilePath = (0, path_1.join)(dir, "mysql.conf")), data.join("\n"));
+        return defaultsFilePath;
+    }
+    async function args() {
+        return [`--defaults-file=${await getDefaultsFilePath()}`];
     }
-    async function run(query, database) {
+    async function run(query, database, extra = []) {
         return await (0, process_1.exec)("mysql", [
             ...(await args()),
             ...(database ? [database] : []),
+            ...(extra || []),
             "-e",
             query.replace(/\s{1,}/g, " "),
             "-N",
@@ -109,12 +120,12 @@ function createMysqlCli(options) {
     }
     async function importFile(path, database) {
         return await (0, process_1.exec)("mysql", [
+            ...(await args()),
             `--init-command=SET ${[
                 "autocommit=0",
                 "unique_checks=0",
                 "foreign_key_checks=0",
             ].join(",")};`,
-            ...(await args()),
             database,
         ], null, {
             pipe: {
@@ -139,7 +150,7 @@ function createMysqlCli(options) {
       INTO TABLE ${table}
       FIELDS TERMINATED BY ','
       ENCLOSED BY '"'
-      LINES TERMINATED BY '\\n'`, database);
+      LINES TERMINATED BY '\\n'`, database, ["--local-infile"]);
     }
     async function isDatabaseEmpty(database) {
         const [total] = await fetchAll(`
@@ -180,6 +191,7 @@ function createMysqlCli(options) {
         const outFileVar = JSON.stringify(outFile.replaceAll("\\", "/"));
         try {
             await (0, fs_1.mkdirIfNotExists)(dir);
+            await (0, promises_1.chmod)(dir, 0o777);
             await run(`SELECT 1 INTO OUTFILE ${outFileVar}`);
             const exists = await (0, fs_1.existsFile)(outFile);
             if (!exists)