@datatruck/cli 0.22.1 → 0.22.2

package/Task/MysqlDumpTask.js

@@ -74,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 });
@@ -214,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.1",
+  "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.js

@@ -24,7 +24,6 @@ function createMysqlCli(options) {
             `user = "${options.username}"`,
             `password = "${password}"`,
         ];
-        console.log(data.join("\n"));
         await (0, promises_1.writeFile)((defaultsFilePath = (0, path_1.join)(dir, "mysql.conf")), data.join("\n"));
         return defaultsFilePath;
     }