diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-03-16 15:08:41 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-03-22 16:22:00 -0700 |
| commit | c5e03e87eeb100900ce6c87bc5a1977d36f74522 (patch) | |
| tree | 3b127ad1bdf4e8a0b2275995bf7d6bec1315ef4c /activerecord/lib/active_record/connection_adapters | |
| parent | a724096ca5f0d40914fe2310da898477f5835e75 (diff) | |
| download | rails-c5e03e87eeb100900ce6c87bc5a1977d36f74522.tar.gz rails-c5e03e87eeb100900ce6c87bc5a1977d36f74522.tar.bz2 rails-c5e03e87eeb100900ce6c87bc5a1977d36f74522.zip | |
keep ivars private, do not manipulate them outside their owner object
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb | 4 | ||||
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 2 |
2 files changed, 5 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 ebf9a662c3..57bc4da5cc 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_definitions.rb @@ -236,6 +236,10 @@ module ActiveRecord self end + def remove_column(name) + @columns_hash.delete name.to_s + end + [:string, :text, :integer, :float, :decimal, :datetime, :timestamp, :time, :date, :binary, :boolean].each do |column_type| define_method column_type do |*args| options = args.extract_options! diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index d3ffee3a8b..50d189d27a 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -458,7 +458,7 @@ module ActiveRecord def remove_column(table_name, column_name, type = nil, options = {}) #:nodoc: alter_table(table_name) do |definition| - definition.columns.delete(definition[column_name]) + definition.remove_column column_name end end |