Fix errant migration 95 and the test that let it slip through.

apps/sumo/tests/__init__.py

@@ -99,12 +99,16 @@ def test_unique(self):
 
     def test_innodb_and_utf8(self):
         """Make sure each created table uses the InnoDB engine and UTF-8."""
+        # Migrations are immutable, so just skip known failures:
+        KNOWN_FAILURES = set(['95-group-dashboards.sql'])
+
         # Heuristic: make sure there are at least as many "ENGINE=InnoDB"s as
         # "CREATE TABLE"s. (There might be additional "InnoDB"s in ALTER TABLE
         # statements, which are fine.)
         path = self._migrations_path()
-        # The ones before 66 have known failures.
-        for filename in sorted(listdir(path))[66:]:
+        for filename in sorted(listdir(path)):
+            if filename in KNOWN_FAILURES:
+                continue
             with open(join(path, filename)) as f:
                 contents = f.read()
             creates = contents.count('CREATE TABLE')

migrations/96-group-dashboard-fix.sql

@@ -0,0 +1,13 @@
+-- Largely supersede migration 95.
+-- Fix `dashboard` column width, engine, and charset.
+
+DROP TABLE dashboards_groupdashboard;
+
+CREATE TABLE `dashboards_groupdashboard` (
+    `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY,
+    `group_id` integer NOT NULL,
+    `dashboard` varchar(10) NOT NULL,
+    `parameters` varchar(255) NOT NULL
+) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci;
+ALTER TABLE `dashboards_groupdashboard` ADD CONSTRAINT `group_id_refs_id_142d6845` FOREIGN KEY (`group_id`) REFERENCES `auth_group` (`id`);
+CREATE INDEX `dashboards_groupdashboard_bda51c3c` ON `dashboards_groupdashboard` (`group_id`);