diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-10-23 21:34:37 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-10-23 21:34:40 -0200 |
| commit | 5a47639aac45afa750ddf595166c97aa937beaf0 (patch) | |
| tree | 43d48387f7eb419a5adb4532743194cf57b2ec5e /railties/lib | |
| parent | f94e328cf801fd5c8055b06c4ee5439273146833 (diff) | |
| parent | ef31d541e00a94393514fd6dbeb69c5aeaa641c6 (diff) | |
| download | rails-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.rb | 5 |
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 |