diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-02-15 16:19:08 +0000 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-02-15 16:23:25 +0000 |
| commit | c65b076328b292f1b727bb6a7dc144c05458163f (patch) | |
| tree | 9d198091fdf142041a2a44a9c4c3e2e2e0db1b24 /activerecord/lib/active_record/schema_dumper.rb | |
| parent | 2f997797a500721ca845f5eb6d056bcaf4ffeaca (diff) | |
| download | rails-c65b076328b292f1b727bb6a7dc144c05458163f.tar.gz rails-c65b076328b292f1b727bb6a7dc144c05458163f.tar.bz2 rails-c65b076328b292f1b727bb6a7dc144c05458163f.zip | |
Revert "checking in the abstractions for valid type checking:"
This reverts commit c321b309a9a90bbfa0912832c11b3fef52e71840.
Conflicts:
activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb
Reason: failing test
1) Error:
test_valid_column(ActiveRecord::ConnectionAdapters::SQLite3AdapterTest):
NoMethodError: undefined method `column' for
test/cases/adapters/sqlite3/sqlite3_adapter_test.rb:29:in
`test_valid_column'
Diffstat (limited to 'activerecord/lib/active_record/schema_dumper.rb')
| -rw-r--r-- | activerecord/lib/active_record/schema_dumper.rb | 2 |
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 fa9de926c5..df090b972d 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}'" unless @connection.valid_type?(column.type) + raise StandardError, "Unknown type '#{column.sql_type}' for column '#{column.name}'" if @types[column.type].nil? next if column.name == pk @connection.column_spec(column, @types) end.compact |