diff options
| author | Grant Neufeld <grant@grantneufeld.ca> | 2011-06-18 14:38:38 -0600 |
|---|---|---|
| committer | Grant Neufeld <grant@grantneufeld.ca> | 2011-06-18 14:38:38 -0600 |
| commit | 3cc83a8f24ba61b648a2728efc113388cf1ec243 (patch) | |
| tree | 6f79c8bf91d8739b9431442cdcaeae2962c4376d /activerecord/lib/active_record/connection_adapters/abstract | |
| parent | 2fbb7504e2c2b0a95398d1ef0c97ea4a403d831d (diff) | |
| download | rails-3cc83a8f24ba61b648a2728efc113388cf1ec243.tar.gz rails-3cc83a8f24ba61b648a2728efc113388cf1ec243.tar.bz2 rails-3cc83a8f24ba61b648a2728efc113388cf1ec243.zip | |
Changed the default value for the options argument on ActiveRecord::ConnectionAdapters::Table#column_exists? from nil to an empty Hash {}.
That method calls through to ActiveRecord::ConnectionAdapters::SchemaStatements##column_exists? expects options to be a Hash.
When options was nil, an error would occur in cases where the column did exist because the called method attempted to perform a key lookup on options.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 2 |
1 files changed, 1 insertions, 1 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 a9e3c83eb0..82f564e41d 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -328,7 +328,7 @@ module ActiveRecord end # Checks to see if a column exists. See SchemaStatements#column_exists? - def column_exists?(column_name, type = nil, options = nil) + def column_exists?(column_name, type = nil, options = {}) @base.column_exists?(@table_name, column_name, type, options) end |