aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-10-23 21:34:37 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-10-23 21:34:40 -0200
commit5a47639aac45afa750ddf595166c97aa937beaf0 (patch)
tree43d48387f7eb419a5adb4532743194cf57b2ec5e /railties/lib
parentf94e328cf801fd5c8055b06c4ee5439273146833 (diff)
parentef31d541e00a94393514fd6dbeb69c5aeaa641c6 (diff)
downloadrails-5a47639aac45afa750ddf595166c97aa937beaf0.tar.gz
rails-5a47639aac45afa750ddf595166c97aa937beaf0.tar.bz2
rails-5a47639aac45afa750ddf595166c97aa937beaf0.zip
Merge pull request #22033 from jmccartie/jm/uuid_nil
Guard clause for id_kind in generator
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/migration.rb5
1 files changed, 0 insertions, 5 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