Move default uuid generation to active_record

2 files changed, 4 insertions, 8 deletions

diff --git a/railties/lib/rails/generators/migration.rb b/railties/lib/rails/generators/migration.rb
index a755471a4b..87f2e1d42b 100644
--- a/railties/lib/rails/generators/migration.rb
+++ b/railties/lib/rails/generators/migration.rb
@@ -30,11 +30,6 @@ module Rails
         end
       end
 
-      def id_kind
-        kind = Rails.application.config.active_record.primary_key rescue nil
-        ", id: :#{kind}" if kind
-      end
-
       def create_migration(destination, data, config = {}, &block)
         action Rails::Generators::Actions::CreateMigration.new(self, destination, block || data.to_s, config)
       end
diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb
index a7f807b747..832bf8d2d4 100644
--- a/railties/test/generators/migration_generator_test.rb
+++ b/railties/test/generators/migration_generator_test.rb
@@ -222,8 +222,9 @@ class MigrationGeneratorTest < Rails::Generators::TestCase
   end
 
   def test_add_uuid_to_create_table_migration
-    previous_value = Rails.application.config.active_record.primary_key
-    Rails.application.config.active_record.primary_key = :uuid
+    previous_value = Rails.application.config.generators.active_record[:primary_key_type]
+    Rails.application.config.generators.active_record[:primary_key_type] = :uuid
+
     run_generator ["create_books"]
     assert_migration "db/migrate/create_books.rb" do |content|
       assert_method :change, content do |change|
@@ -231,7 +232,7 @@ class MigrationGeneratorTest < Rails::Generators::TestCase
       end
     end
 
-    Rails.application.config.active_record.primary_key = previous_value
+    Rails.application.config.generators.active_record[:primary_key_type] = previous_value
   end
 
   def test_should_create_empty_migrations_if_name_not_start_with_add_or_remove_or_create