* loader will only load added / removed / same columns - it won't try to guess if a column name has been changed

* Column names modifications are now found by a renaming dictionary

Author: mmoczulski

lib/definitionLoader.js

@@ -9,7 +9,6 @@ exports.loadSqlFiles = function(leftFiles, rightFiles, done) {
 
     var commonFiles = findCommonFilesInTwoDirectories();
 
-//    done(loadSqlDefinition(commonFiles[1]));
     done(commonFiles.map(loadSqlDefinition));
 
     function findCommonFilesInTwoDirectories() {
@@ -55,15 +54,12 @@ function loadSqlDefinition(commonFile) {
         return rightColumnNames.indexOf(column.name) === -1;
     });
 
-    var changedColumns = tryFindChangedNamesIn(addedColumns, removedColumns);
-
     return {
         oldTableName: leftFile.name,
         newTableName: rightFile.name,
         addedColumns: addedColumns,
         removedColumns: removedColumns,
-        columnsWithSameNames: sameColumns,
-        columnsWithChangedNames: changedColumns
+        columnsWithSameNames: sameColumns
     };
 }
 
@@ -192,9 +188,9 @@ function parseColumn(column) {
     var columnDefinition = column.substring(/\w/i.exec(column).index);
     var definition = columnDefinition.split(/\s+/i);
     return {
-        name: definition[0],
+        name: definition[0].replace("]", ""),
         type: definition[1],
         mandatory: /(NOT\s+NULL)|(PRIMARY\s+KEY)/i.test(columnDefinition),
-        columnDefinition: columnDefinition
+        columnDefinition: columnDefinition.replace("]", "")
     };
 }

lib/diff.js

@@ -6,8 +6,13 @@ var reporter = require("./csvReport");
 
 exports.findDifferences = function (options) {
     loader.loadSqlFiles(options.left, options.right, function(sqlDefinitions) {
+        var differences = [];
 
-        var differences = sqlDefinitions.map(processor.processSqlDefinitions);
+        sqlDefinitions.forEach(function (sqlDefinition) {
+            processor.processRenamedColumns(sqlDefinition, options.renamingDictionary);
+
+            differences.push(processor.processSqlDefinitions(sqlDefinition));
+        });
 
         reporter.generate(differences, options.output, function (err) {
             if (err) {

lib/diffProcessor.js

@@ -2,6 +2,43 @@
 
 var constants = require("./constants");
 
+exports.processRenamedColumns = function(sqlDefinition, renamingDictionary) {
+    var potentialRenamings = Object.keys(renamingDictionary);
+    var columnsWithChangesNames = [];
+    var addedColumnNames = sqlDefinition.addedColumns.map(function (column) {
+        return column.name;
+    });
+    var removedColumnNames = sqlDefinition.removedColumns.map(function (column) {
+        return column.name;
+    });
+
+    addedColumnNames.forEach(function(addedColumnName) {
+        removedColumnNames.forEach(function(removedColumnName) {
+            if (potentialRenamings.indexOf(removedColumnName) !== -1 &&
+                renamingDictionary[removedColumnName] === addedColumnName) {
+
+                columnsWithChangesNames.push({
+                    from: sqlDefinition.removedColumns.filter(function (column) {
+                        return column.name === removedColumnName;
+                    })[0],
+                    to: sqlDefinition.addedColumns.filter(function (column) {
+                        return column.name === addedColumnName;
+                    })[0]
+                });
+            }
+        });
+    });
+
+    columnsWithChangesNames.forEach(function (duplicate) {
+        sqlDefinition.addedColumns.splice(sqlDefinition.addedColumns.indexOf(duplicate.to), 1);
+        addedColumnNames.splice(addedColumnNames.indexOf(duplicate.to.name), 1);
+        sqlDefinition.removedColumns.splice(sqlDefinition.removedColumns.indexOf(duplicate.from), 1);
+        removedColumnNames.splice(removedColumnNames.indexOf(duplicate.from.name), 1);
+    });
+
+    sqlDefinition.columnsWithSameNames = sqlDefinition.columnsWithSameNames.concat(columnsWithChangesNames);
+};
+
 exports.processSqlDefinitions = function(sqlDefinition) {
     var diff = [];
     diff.tableName = sqlDefinition.newTableName;
@@ -27,32 +64,15 @@ exports.processSqlDefinitions = function(sqlDefinition) {
             name: removedColumn.name
         });
     });
-    sqlDefinition.columnsWithChangedNames.forEach(function (changedColumn) {
-        diff.push({
-            type: constants.CHANGED_COLUMN_NAME,
-            name: changedColumn.to.name,
-            from: changedColumn.from.name
-        });
 
-        if (changedColumn.from.type !== changedColumn.to.type) {
-            diff.push({
-                type: constants.CHANGED_COLUMN_TYPE,
-                name: changedColumn.to.name,
-                from: changedColumn.from.type,
-                to: changedColumn.to.type
-            });
-        }
-        if (changedColumn.from.mandatory !== changedColumn.to.mandatory) {
+    sqlDefinition.columnsWithSameNames.forEach(function (changedColumn) {
+        if (changedColumn.from.name !== changedColumn.to.name) {
             diff.push({
-                type: constants.CHANGED_COLUMN_OBLIGATION,
+                type: constants.CHANGED_COLUMN_NAME,
                 name: changedColumn.to.name,
-                from: changedColumn.from.mandatory,
-                to: changedColumn.to.mandatory
+                from: changedColumn.from.name
             });
         }
-    });
-
-    sqlDefinition.columnsWithSameNames.forEach(function (changedColumn) {
         if (changedColumn.from.type !== changedColumn.to.type) {
             diff.push({
                 type: constants.CHANGED_COLUMN_TYPE,

sql-diff.js

@@ -9,6 +9,8 @@ var args = require("optimist").
     describe("left", "Left folder (earlier one) to compare").
     describe("right", "Right folder (later one) to compare").
     describe("output", "The name of file, to which report will be generated").
+    describe("rd", "Path to a dictionary which holds all possible renamings - should be a JSON file, where keys are " +
+        "old names and values - new names").
     argv;
 
 
@@ -38,10 +40,21 @@ async.each([leftDir, rightDir], directoryExists, function(err) {
         var leftDirectory = directories[0];
         var rightDirectory = directories[1];
 
+        var renamingDictionary;
+
+        if (args.rd) {
+            if (fs.existsSync(args.rd)) {
+                renamingDictionary = JSON.parse(fs.readFileSync(args.rd));
+            } else {
+                console.warn("Path to Renaming dictionary file has been provided, but this file does not exist. Ignoring");
+            }
+        }
+
         diff.findDifferences({
             left: leftDirectory,
             right: rightDirectory,
             output: args.output,
+            renamingDictionary: renamingDictionary,
             done: function () {
                 console.log("Job finished successfully");
             }