diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-04 17:58:29 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-05-04 17:58:29 -0300 |
| commit | af6816110afc4be56f423cbe51e69891a42df65e (patch) | |
| tree | cacbcb2b6fc5089097272dbf5583dea5370d5170 | |
| parent | 8eb7813f49f30c1843ca905fd0a404a516977f73 (diff) | |
| parent | 5e803138a1d8af27319110a2d71239c01421de79 (diff) | |
| download | rails-af6816110afc4be56f423cbe51e69891a42df65e.tar.gz rails-af6816110afc4be56f423cbe51e69891a42df65e.tar.bz2 rails-af6816110afc4be56f423cbe51e69891a42df65e.zip | |
Merge pull request #14973 from kuldeepaggarwal/f-refactor
Convert column name to string only once
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb index aa99822389..ffa6af6d99 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb @@ -71,7 +71,8 @@ module ActiveRecord # column_exists?(:suppliers, :tax, :decimal, precision: 8, scale: 2) # def column_exists?(table_name, column_name, type = nil, options = {}) - columns(table_name).any?{ |c| c.name == column_name.to_s && + column_name = column_name.to_s + columns(table_name).any?{ |c| c.name == column_name && (!type || c.type == type) && (!options.key?(:limit) || c.limit == options[:limit]) && (!options.key?(:precision) || c.precision == options[:precision]) && |