aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2006-10-24 07:32:18 +0000
committerMichael Koziarski <michael@koziarski.com>2006-10-24 07:32:18 +0000
commit53a97e9d610c03024b21d5d87681d98b5ed115bf (patch)
tree5fd620aa060d2ed05366aae9b79a3ad3d57e0a37 /activerecord
parentc08997405d1329e7cb1ade70ca2b26e47a8d09da (diff)
downloadrails-53a97e9d610c03024b21d5d87681d98b5ed115bf.tar.gz
rails-53a97e9d610c03024b21d5d87681d98b5ed115bf.tar.bz2
rails-53a97e9d610c03024b21d5d87681d98b5ed115bf.zip
Make add_column use the options hash with the Sqlite Adapter. Closes #6464 [obrie]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5353 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG2
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 3f7bf9e808..73e4b4fe9b 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Make add_column use the options hash with the Sqlite Adapter. Closes #6464 [obrie]
+
* Document other options available to migration's add_column. #6419 [grg]
* MySQL: all_hashes compatibility with old MysqlRes class. #6429 [Jeremy Kemper]
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index eb57df3d2f..a9d00e8b3f 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -231,7 +231,7 @@ module ActiveRecord
end
def add_column(table_name, column_name, type, options = {}) #:nodoc:
- super(table_name, column_name, type, options = {})
+ super(table_name, column_name, type, options)
# See last paragraph on http://www.sqlite.org/lang_altertable.html
execute "VACUUM"
end