Set MySQL collation: versions tbl: utf8mb4_general_ci

Should fix the "Unknown collation: 'utf8mb4_col'" error from #741
paper-trail-gem · Mar 31, 2016 · 0435936 · 0435936
1 parent b722f64
commit 0435936
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/generators/paper_trail/templates/create_versions.rb b/lib/generators/paper_trail/templates/create_versions.rb
@@ -58,7 +58,7 @@ def change
   #
   def versions_table_options
     if MYSQL_ADAPTERS.include?(connection.class.name)
-      { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_col" }
+      { options: "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci" }
     else
       {}
     end

diff --git a/spec/generators/paper_trail/templates/create_versions_spec.rb b/spec/generators/paper_trail/templates/create_versions_spec.rb
@@ -36,7 +36,7 @@
       it "uses utf8mb4_col collation" do
         migration.change
         expect(migration).to have_received(:create_table) do |_, arg2|
-          expect(arg2[:options]).to match(/COLLATE=utf8mb4_col/)
+          expect(arg2[:options]).to match(/COLLATE=utf8mb4_general_ci/)
         end
       end
     else

diff --git a/test/dummy/db/migrate/20110208155312_set_up_test_tables.rb b/test/dummy/db/migrate/20110208155312_set_up_test_tables.rb
@@ -301,7 +301,7 @@ def down
   def versions_table_options
     opts = { force: true }
     if MYSQL_ADAPTERS.include?(connection.class.name)
-      opts[:options] = "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_col"
+      opts[:options] = "ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci"
     end
     opts
   end