diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-15 12:12:56 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-15 12:12:56 -0700 |
| commit | ae8e84e976c296596adf97f60932bd3a164506b4 (patch) | |
| tree | 5c6f394df48927d547b9f704e2266382cddee025 /activerecord/lib | |
| parent | 1a9055073dcc189b289a1e3f47cbc72ff7380f0a (diff) | |
| parent | b88c96bd348d83c2d3479bddfbcd5ab6168bd9b3 (diff) | |
| download | rails-ae8e84e976c296596adf97f60932bd3a164506b4.tar.gz rails-ae8e84e976c296596adf97f60932bd3a164506b4.tar.bz2 rails-ae8e84e976c296596adf97f60932bd3a164506b4.zip | |
Merge pull request #9734 from choudhuryanupam/master
Method #primary_key? is not reused
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb index 9c659dd0af..902dbd148e 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -25,7 +25,7 @@ module ActiveRecord end def primary_key? - type == :primary_key + type.to_sym == :primary_key end def to_sql @@ -34,7 +34,7 @@ module ActiveRecord column_options[:null] = null unless null.nil? column_options[:default] = default unless default.nil? column_options[:column] = self - add_column_options!(column_sql, column_options) unless type.to_sym == :primary_key + add_column_options!(column_sql, column_options) unless primary_key? column_sql end |