aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-09-11 10:05:46 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-09-11 10:05:46 +0000
commitb646e0ddf7b1db3046d9d592060d7147f497cba3 (patch)
tree5eec78c2fb1545a3b12d02683e4ef8e0ac09592b /activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
parentc0e618cf6f7f6c4a474e4ed30e05c16620615b9a (diff)
downloadrails-b646e0ddf7b1db3046d9d592060d7147f497cba3.tar.gz
rails-b646e0ddf7b1db3046d9d592060d7147f497cba3.tar.bz2
rails-b646e0ddf7b1db3046d9d592060d7147f497cba3.zip
Rolled back broken #1814
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2203 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/abstract_adapter.rb')
-rwxr-xr-xactiverecord/lib/active_record/connection_adapters/abstract_adapter.rb10
1 files changed, 1 insertions, 9 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 5f9f99b0b2..e0c880780e 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -392,7 +392,6 @@ module ActiveRecord
end
def add_column(table_name, column_name, type, options = {})
- native_type = native_database_types[type]
add_column_sql = "ALTER TABLE #{table_name} ADD #{column_name} #{type_to_sql(type, options[:limit])}"
add_column_options!(add_column_sql, options)
execute(add_column_sql)
@@ -431,14 +430,7 @@ module ActiveRecord
end
def type_to_sql(type, limit = nil)
- unless native = native_database_types[type]
- raise(
- ActiveRecord::UnknownTypeError,
- "Unable to convert type '#{type}' to a native type. " +
- "Valid options: #{native_database_types.keys.to_sentence}"
- )
- end
-
+ native = native_database_types[type]
limit ||= native[:limit]
column_type_sql = native[:name]
column_type_sql << "(#{limit})" if limit