* Added 'added and removed' tables to comparison and report

* Small fixes regarding empty column arrays (for added and removed tables)

Author: mmoczulski

lib/csvReport.js

@@ -18,12 +18,12 @@ DIFF_WRITERS[constants.ADDED_COLUMN] = function (stream, tableName, difference)
 
 LABELS[constants.ADDED_TABLE] = "Table added";
 DIFF_WRITERS[constants.ADDED_TABLE] = function (stream, tableName, difference) {
-    stream.write(format("%s,%s,,,%s", tableName, tableName, LABELS[constants.ADDED_TABLE]));
+    stream.write(format("%s,%s,,,%s", difference.name, difference.name, LABELS[constants.ADDED_TABLE]));
 };
 
 LABELS[constants.CHANGED_COLUMN_NAME] = "Name";
 DIFF_WRITERS[constants.CHANGED_COLUMN_NAME] = function (stream, tableName, difference) {
-    stream.write(format("%s,%s,%s,,%s", tableName, difference.name, difference.from,
+    stream.write(format("%s,%s,%s,,%s", tableName, difference.to, difference.from,
         LABELS[constants.CHANGED_COLUMN_NAME]));
 };
 
@@ -47,10 +47,15 @@ DIFF_WRITERS[constants.REMOVED_COLUMN] = function (stream, tableName, difference
     stream.write(format("%s,%s,,,%s", tableName, difference.name, LABELS[constants.REMOVED_COLUMN]));
 };
 
-
 LABELS[constants.REMOVED_TABLE] = "Table removed";
 DIFF_WRITERS[constants.REMOVED_TABLE] = function (stream, tableName, difference) {
-    stream.write(format("%s,%s,,,%s", tableName, tableName, LABELS[constants.REMOVED_TABLE]));
+    stream.write(format("%s,%s,,,%s", difference.name, difference.name, LABELS[constants.REMOVED_TABLE]));
+};
+
+LABELS[constants.CHANGED_TABLE_NAME] = "Table renamed";
+DIFF_WRITERS[constants.CHANGED_TABLE_NAME] = function (stream, tableName, difference) {
+    stream.write(format("%s,%s,%s,,%s", tableName, difference.to, difference.from,
+        LABELS[constants.CHANGED_TABLE_NAME]));
 };
 
 exports.generate = function (differences, fileName, done) {

lib/definitionLoader.js

@@ -9,12 +9,24 @@ exports.loadSqlFiles = function(leftFiles, rightFiles, done) {
 
     var commonFiles = findCommonFilesInTwoDirectories();
 
-    done(commonFiles.map(loadSqlDefinition));
+    var addedFiles = rightFiles.filter(function (file) {
+        return leftFileNames.indexOf(path.basename(file)) === -1;
+    });
+    var removedFiles = leftFiles.filter(function (file) {
+        return rightFileNames.indexOf(path.basename(file)) === -1;
+    });
+
+    done(commonFiles.map(loadComparableSqlDefinition).
+        concat(addedFiles.map(loadAddedSqlDefinition)).
+        concat(removedFiles.map(loadRemovedSqlDefinition)).
+        sort(function(a, b) {
+            return (a.newTableName || a.oldTableName).localeCompare(b.newTableName || b.oldTableName);
+        }));
 
     function findCommonFilesInTwoDirectories() {
         return leftFileNames.filter(function (fileName) {
             return rightFileNames.indexOf(fileName) !== -1;
-        }).sort().map(toFileInfo.bind(null, leftFiles, rightFiles));
+        }).map(toFileInfo.bind(null, leftFiles, rightFiles));
     }
 };
 
@@ -31,9 +43,9 @@ function filterByName(fileName, filePath) {
     return path.basename(filePath) === fileName;
 }
 
-function loadSqlDefinition(commonFile) {
-    var leftFile = readSqlDefinitionFrom(commonFile.left);
-    var rightFile = readSqlDefinitionFrom(commonFile.right);
+function loadComparableSqlDefinition(twoFiles) {
+    var leftFile = readSqlDefinitionFrom(twoFiles.left);
+    var rightFile = readSqlDefinitionFrom(twoFiles.right);
 
     var leftColumnNames = leftFile.columns.map(toColumnName);
     var rightColumnNames = rightFile.columns.map(toColumnName);
@@ -63,6 +75,23 @@ function loadSqlDefinition(commonFile) {
     };
 }
 
+function loadRemovedSqlDefinition(fileName) {
+    var file = readSqlDefinitionFrom(fileName);
+
+    return {
+        oldTableName: file.name
+    };
+}
+
+function loadAddedSqlDefinition(fileName) {
+    var file = readSqlDefinitionFrom(fileName);
+
+    return {
+        newTableName: file.name,
+        addedColumns: file.columns
+    };
+}
+
 function toColumnName(column) {
     return column.name;
 }

lib/diffProcessor.js

@@ -5,10 +5,10 @@ var constants = require("./constants");
 exports.processRenamedColumns = function(sqlDefinition, renamingDictionary) {
     var potentialRenamings = Object.keys(renamingDictionary);
     var columnsWithChangesNames = [];
-    var addedColumnNames = sqlDefinition.addedColumns.map(function (column) {
+    var addedColumnNames = (sqlDefinition.addedColumns || []).map(function (column) {
         return column.name;
     });
-    var removedColumnNames = sqlDefinition.removedColumns.map(function (column) {
+    var removedColumnNames = (sqlDefinition.removedColumns || []).map(function (column) {
         return column.name;
     });
 
@@ -36,40 +36,50 @@ exports.processRenamedColumns = function(sqlDefinition, renamingDictionary) {
         removedColumnNames.splice(removedColumnNames.indexOf(duplicate.from.name), 1);
     });
 
-    sqlDefinition.columnsWithSameNames = sqlDefinition.columnsWithSameNames.concat(columnsWithChangesNames);
+    sqlDefinition.columnsWithSameNames = (sqlDefinition.columnsWithSameNames || []).concat(columnsWithChangesNames);
 };
 
 exports.processSqlDefinitions = function(sqlDefinition) {
     var diff = [];
     diff.tableName = sqlDefinition.newTableName;
 
-    if (sqlDefinition.newTableName !== sqlDefinition.oldTableName) {
+    if (typeof(sqlDefinition.newTableName) === "string" && typeof(sqlDefinition.oldTableName) === "undefined") {
+        diff.push({
+            type: constants.ADDED_TABLE,
+            name: sqlDefinition.newTableName
+        });
+    } else if (typeof(sqlDefinition.oldTableName) === "string" && typeof(sqlDefinition.newTableName) === "undefined") {
+        diff.push({
+            type: constants.REMOVED_TABLE,
+            name: sqlDefinition.oldTableName
+        });
+    } else if (sqlDefinition.newTableName !== sqlDefinition.oldTableName) {
         diff.push({
             type: constants.CHANGED_TABLE_NAME,
             from: sqlDefinition.oldTableName,
             to: sqlDefinition.newTableName
         });
     }
 
-    sqlDefinition.addedColumns.forEach(function (addedColumn) {
+    (sqlDefinition.addedColumns || []).forEach(function (addedColumn) {
         diff.push({
             type: constants.ADDED_COLUMN,
             definition: addedColumn.columnDefinition,
             name: addedColumn.name
         });
     });
-    sqlDefinition.removedColumns.forEach(function (removedColumn) {
+    (sqlDefinition.removedColumns || []).forEach(function (removedColumn) {
         diff.push({
             type: constants.REMOVED_COLUMN,
             name: removedColumn.name
         });
     });
 
-    sqlDefinition.columnsWithSameNames.forEach(function (changedColumn) {
+    (sqlDefinition.columnsWithSameNames || []).forEach(function (changedColumn) {
         if (changedColumn.from.name !== changedColumn.to.name) {
             diff.push({
                 type: constants.CHANGED_COLUMN_NAME,
-                name: changedColumn.to.name,
+                to: changedColumn.to.name,
                 from: changedColumn.from.name
             });
         }