diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2010-11-04 21:11:33 -0200 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2010-11-05 16:34:23 -0200 |
commit | 00261a187ef55c284156ef22b31909ffbe51b0f2 (patch) | |
tree | b1537e6eb1ff5a06c71feda9f89d1791f7f6719c | |
parent | 3146aa68fd03ea4392b45f1c8771675a9c850471 (diff) | |
download | rails-00261a187ef55c284156ef22b31909ffbe51b0f2.tar.gz rails-00261a187ef55c284156ef22b31909ffbe51b0f2.tar.bz2 rails-00261a187ef55c284156ef22b31909ffbe51b0f2.zip |
Avoid warning: shadowing outer local variable
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb index 942ea9b297..e7fb8524ce 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb @@ -714,8 +714,8 @@ module ActiveRecord # Returns the list of all column definitions for a table. def columns(table_name, name = nil) # Limit, precision, and scale are all handled by the superclass. - column_definitions(table_name).collect do |name, type, default, notnull| - PostgreSQLColumn.new(name, default, type, notnull == 'f') + column_definitions(table_name).collect do |column_name, type, default, notnull| + PostgreSQLColumn.new(column_name, default, type, notnull == 'f') end end |