aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/schema_dumper.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-02-12 13:26:40 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2013-02-12 13:26:40 -0800
commitf8c8ad56c8a1cb48c6535fd8e248dcb9049e0aa3 (patch)
tree682c8ee01a1e05bc80f334241f3ec34445cfc571 /activerecord/lib/active_record/schema_dumper.rb
parent1fc6876b57f2e1d31731e74eb4271b5655e746d2 (diff)
parentc321b309a9a90bbfa0912832c11b3fef52e71840 (diff)
downloadrails-f8c8ad56c8a1cb48c6535fd8e248dcb9049e0aa3.tar.gz
rails-f8c8ad56c8a1cb48c6535fd8e248dcb9049e0aa3.tar.bz2
rails-f8c8ad56c8a1cb48c6535fd8e248dcb9049e0aa3.zip
Merge pull request #9204 from ranjaykrishna/col-prob
schema dumper tests now conducted by ActiveRecord::Base.Connection
Diffstat (limited to 'activerecord/lib/active_record/schema_dumper.rb')
-rw-r--r--activerecord/lib/active_record/schema_dumper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/schema_dumper.rb b/activerecord/lib/active_record/schema_dumper.rb
index df090b972d..fa9de926c5 100644
--- a/activerecord/lib/active_record/schema_dumper.rb
+++ b/activerecord/lib/active_record/schema_dumper.rb
@@ -118,7 +118,7 @@ HEADER
# then dump all non-primary key columns
column_specs = columns.map do |column|
- raise StandardError, "Unknown type '#{column.sql_type}' for column '#{column.name}'" if @types[column.type].nil?
+ raise StandardError, "Unknown type '#{column.sql_type}' for column '#{column.name}'" unless @connection.valid_type?(column.type)
next if column.name == pk
@connection.column_spec(column, @types)
end.compact