Merge branch 'release/v5.4.0'

Author: AnatolyUss

README.md

@@ -109,7 +109,7 @@ Or, if you have moved <code>config</code> folder out from Nmig's directory:<br /
 <br /><b>Note:</b> "logs_directory" will be created during script execution.</p>
 
 <h3>VERSION</h3>
-<p>Current version is 5.3.1<br />
+<p>Current version is 5.4.0<br />
 
 <h3>LICENSE</h3>
 <p>NMIG is available under "GNU GENERAL PUBLIC LICENSE" (v. 3) <br />

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "nmig",
-    "version": "5.3.1",
+    "version": "5.4.0",
     "description": "The database migration app",
     "author": "Anatoly Khaytovich<anatolyuss@gmail.com>",
     "license": "GPL-3.0",
@@ -14,16 +14,16 @@
     "dependencies": {
         "json2csv": "^5.0.1",
         "mysql": "^2.18.1",
-        "pg": "^8.3.0",
-        "pg-copy-streams": "^2.2.2"
+        "pg": "^8.3.3",
+        "pg-copy-streams": "^2.2.2",
+        "@types/mysql": "^2.15.15",
+        "@types/node": "^14.10.1",
+        "@types/pg": "^7.14.4"
     },
     "devDependencies": {
-        "@types/mysql": "^2.15.15",
-        "@types/node": "^14.0.27",
-        "@types/pg": "^7.14.4",
         "@types/tape": "^4.13.0",
         "tape": "^5.0.1",
-        "typescript": "^3.9.7"
+        "typescript": "^4.0.2"
     },
     "scripts": {
         "build": "tsc",

package.json

@@ -29,7 +29,7 @@ import { PoolClient } from 'pg';
 /**
  * Decodes binary data from from textual representation in string.
  */
-export default async function (conversion: Conversion): Promise<Conversion> {
+export default async (conversion: Conversion): Promise<Conversion> => {
     const logTitle: string = 'BinaryDataDecoder::decodeBinaryData';
     log(conversion, `\t--[${ logTitle }] Decodes binary data from textual representation in string.`);
 
@@ -67,4 +67,4 @@ export default async function (conversion: Conversion): Promise<Conversion> {
 
     await Promise.all(decodePromises);
     return conversion;
-}
+};

src/BinaryDataDecoder.ts

@@ -30,7 +30,7 @@ import { getStateLogsTableName } from './MigrationStateManager';
 /**
  * Checks correctness of connection details of both MySQL and PostgreSQL.
  */
-export async function checkConnection(conversion: Conversion): Promise<string> {
+export const checkConnection = async (conversion: Conversion): Promise<string> => {
     let resultMessage: string = '';
     const params: IDBAccessQueryParams = {
         conversion: conversion,
@@ -48,12 +48,12 @@ export async function checkConnection(conversion: Conversion): Promise<string> {
     const pgResult: DBAccessQueryResult = await DBAccess.query(params);
     resultMessage += pgResult.error ? `\tPostgreSQL connection error: ${ JSON.stringify(pgResult.error) }` : '';
     return resultMessage;
-}
+};
 
 /**
  * Returns Nmig's logo.
  */
-export function getLogo(): string {
+export const getLogo = (): string => {
     return '\n\t/\\_  |\\  /\\/\\ /\\___'
         + '\n\t|  \\ | |\\ | | | __'
         + '\n\t| |\\\\| || | | | \\_ \\'
@@ -62,12 +62,12 @@ export function getLogo(): string {
         + '\n\n\tNMIG - the database migration tool'
         + '\n\tCopyright (C) 2016 - present, Anatoly Khaytovich <anatolyuss@gmail.com>\n\n'
         + '\t--[boot] Configuration has been just loaded.';
-}
+};
 
 /**
  * Boots the migration.
  */
-export function boot(conversion: Conversion): Promise<Conversion> {
+export const boot = (conversion: Conversion): Promise<Conversion> => {
     return new Promise<Conversion>(async resolve => {
         const connectionErrorMessage = await checkConnection(conversion);
         const logo: string = getLogo();
@@ -97,7 +97,7 @@ export function boot(conversion: Conversion): Promise<Conversion> {
 
         console.log(logo + message);
 
-        const _getUserInput = (input: string) => {
+        const _getUserInput = (input: string): void => {
             const trimedInput: string = input.trim();
 
             if (trimedInput === 'n' || trimedInput === 'N') {
@@ -122,7 +122,7 @@ export function boot(conversion: Conversion): Promise<Conversion> {
             .setEncoding(conversion._encoding)
             .on('data', _getUserInput);
     });
-}
+};
 
 /**
  * Parses CLI input arguments, if given.
@@ -132,9 +132,9 @@ export function boot(conversion: Conversion): Promise<Conversion> {
  * npm start -- --conf-dir='C:\Users\anatolyuss\Documents\projects\nmig_config' --logs-dir='C:\Users\anatolyuss\Documents\projects\nmig_logs'
  * npm test -- --conf-dir='C:\Users\anatolyuss\Documents\projects\nmig_config' --logs-dir='C:\Users\anatolyuss\Documents\projects\nmig_logs'
  */
-export function getConfAndLogsPaths(): IConfAndLogsPaths {
+export const getConfAndLogsPaths = (): IConfAndLogsPaths => {
     const baseDir: string = path.join(__dirname, '..', '..');
-    const _parseInputArguments = (paramName: string) => {
+    const _parseInputArguments = (paramName: string): string | undefined => {
         const _path: string | undefined = process.argv.find((arg: string) => arg.startsWith(paramName));
         return _path ? _path.split('=')[1] : undefined;
     };
@@ -143,4 +143,4 @@ export function getConfAndLogsPaths(): IConfAndLogsPaths {
         confPath: _parseInputArguments('--conf-dir') || path.join(baseDir, 'config'),
         logsPath: _parseInputArguments('--logs-dir') || baseDir
     };
-}
+};

src/BootProcessor.ts

@@ -29,15 +29,15 @@ import IDBAccessQueryParams from './IDBAccessQueryParams';
 /**
  * Escapes quotes inside given string.
  */
-function escapeQuotes(str: string): string {
+const escapeQuotes = (str: string): string => {
     const regexp: RegExp = new RegExp(`'`, 'g');
     return str.replace(regexp, `''`);
-}
+};
 
 /**
  * Creates table comments.
  */
-async function processTableComments(conversion: Conversion, tableName: string): Promise<void> {
+const processTableComments = async (conversion: Conversion, tableName: string): Promise<void> => {
     const logTitle: string = 'CommentsProcessor::processTableComments';
     const sqlSelectComment: string = `SELECT table_comment AS table_comment FROM information_schema.tables 
         WHERE table_schema = '${ conversion._mySqlDbName }' 
@@ -69,12 +69,12 @@ async function processTableComments(conversion: Conversion, tableName: string):
 
     const successMsg: string = `\t--[${ logTitle }] Successfully set comment for table "${ conversion._schema }"."${ tableName }"`;
     log(conversion, successMsg, conversion._dicTables[tableName].tableLogPath);
-}
+};
 
 /**
  * Creates columns comments.
  */
-async function processColumnsComments(conversion: Conversion, tableName: string): Promise<void> {
+const processColumnsComments = async (conversion: Conversion, tableName: string): Promise<void> => {
     const logTitle: string = 'CommentsProcessor::processColumnsComments';
     const originalTableName: string = extraConfigProcessor.getTableName(conversion, tableName, true);
 
@@ -105,17 +105,17 @@ async function processColumnsComments(conversion: Conversion, tableName: string)
     });
 
     await Promise.all(commentPromises);
-}
+};
 
 /**
  * Migrates comments.
  */
-export default async function(conversion: Conversion, tableName: string): Promise<void> {
+export default async (conversion: Conversion, tableName: string): Promise<void> => {
     const logTitle: string = 'CommentsProcessor::default';
     const msg: string = `\t--[${ logTitle }] Creates comments for table "${ conversion._schema }"."${ tableName }"...`;
     log(conversion, msg, conversion._dicTables[tableName].tableLogPath);
     await Promise.all([
         processTableComments(conversion, tableName),
         processColumnsComments(conversion, tableName)
     ]);
-}
+};

src/CommentsProcessor.ts

@@ -31,7 +31,7 @@ import { getDataPoolTableName } from './DataPoolManager';
  * In case of normal execution - it is a good practice.
  * In case of rerunning Nmig after unexpected failure - it is absolutely mandatory.
  */
-export async function dataTransferred(conversion: Conversion, dataPoolId: number): Promise<boolean> {
+export const dataTransferred = async (conversion: Conversion, dataPoolId: number): Promise<boolean> => {
     const dataPoolTable: string = getDataPoolTableName(conversion);
     const sqlGetMetadata: string = `SELECT metadata AS metadata FROM ${ dataPoolTable } WHERE id = ${ dataPoolId };`;
     const params: IDBAccessQueryParams = {
@@ -53,4 +53,4 @@ export async function dataTransferred(conversion: Conversion, dataPoolId: number
 
     const probe: DBAccessQueryResult = await DBAccess.query(params);
     return probe.data.rows.length !== 0;
-}
+};

src/ConsistencyEnforcer.ts

@@ -32,7 +32,7 @@ import Conversion from './Conversion';
 /**
  * Continues migration process after data loading.
  */
-export async function processConstraints(conversion: Conversion): Promise<Conversion> {
+export const processConstraints = async (conversion: Conversion): Promise<Conversion> => {
     const isTableConstraintsLoaded: boolean = await migrationStateManager.get(conversion, 'per_table_constraints_loaded');
     const migrateOnlyData: boolean = conversion.shouldMigrateOnlyData();
 
@@ -55,16 +55,16 @@ export async function processConstraints(conversion: Conversion): Promise<Conver
     }
 
     return conversion;
-}
+};
 
 /**
  * Processes given table's constraints.
  */
-export async function processConstraintsPerTable(
+export const processConstraintsPerTable = async (
     conversion: Conversion,
     tableName: string,
     migrateOnlyData: boolean
-): Promise<void> {
+): Promise<void> => {
     if (migrateOnlyData) {
         return sequencesProcessor.setSequenceValue(conversion, tableName);
     }
@@ -75,4 +75,4 @@ export async function processConstraintsPerTable(
     await sequencesProcessor.createSequence(conversion, tableName);
     await processIndexAndKey(conversion, tableName);
     await processComments(conversion, tableName);
-}
+};

src/ConstraintsProcessor.ts

@@ -65,4 +65,4 @@ export default async (conversion: Conversion, tableName: string, haveDataChunksP
     params.bindings = [metadata];
 
     await DBAccess.query(params);
-}
+};