lib: Prevent unnecessary ALTER TABLE operation when the collation is …

…unchanged
nwoltman · Sep 11, 2016 · b5ae554 · b5ae554
1 parent eca64f1
commit b5ae554
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/ColumnDefinitions/TextColumnDefinition.js b/lib/ColumnDefinitions/TextColumnDefinition.js
@@ -24,6 +24,13 @@ class TextColumnDefinition extends ColumnDefinition {
       return false;
     }
 
+    if (
+      this._collate && columnDefinition._collate &&
+      this._collate === columnDefinition._collate
+    ) {
+      return true;
+    }
+
     if (
       this._charset !== columnDefinition._charset &&
       (columnDefinition._charset || this._charset !== columnTableSchema.charset)

diff --git a/test/integration/MySQLPlus.test.js b/test/integration/MySQLPlus.test.js
@@ -393,6 +393,7 @@ describe('MySQLPlus', function() {
       b: Type.char(1).charset('utf8mb4'),
       c: Type.char(1).charset('utf8mb4').collate('utf8mb4_unicode_ci'),
       d: Type.char(1).collate('utf8mb4_unicode_ci'),
+      e: Type.char(1).collate('utf8mb4_bin'), // eslint-disable-line id-blacklist
     },
     charset: 'utf8mb4',
     collate: 'utf8mb4_unicode_ci',
@@ -402,7 +403,8 @@ describe('MySQLPlus', function() {
     '  `a` char(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL,\n' +
     '  `b` char(1) CHARACTER SET utf8mb4 DEFAULT NULL,\n' +
     '  `c` char(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL,\n' +
-    '  `d` char(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL\n' +
+    '  `d` char(1) COLLATE utf8mb4_unicode_ci DEFAULT NULL,\n' +
+    '  `e` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL\n' +
     ') ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci';