diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-28 12:01:46 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-28 12:01:46 -0700 |
commit | 69c6513616bf92d5d73867a201bf92dc39ec4a07 (patch) | |
tree | 3a7de23363d7b8aaad541360cd5bffb4b299c97b /activerecord | |
parent | 0639d95737c66049fd12e72a5182d2632063395a (diff) | |
parent | 7c5e0035fa0b25ee5481ea81bc353ff18dd2d109 (diff) | |
download | rails-69c6513616bf92d5d73867a201bf92dc39ec4a07.tar.gz rails-69c6513616bf92d5d73867a201bf92dc39ec4a07.tar.bz2 rails-69c6513616bf92d5d73867a201bf92dc39ec4a07.zip |
Merge pull request #9984 from ranjaykrishna/col-prob
valid_type? added to super class abstract_adapter
Diffstat (limited to 'activerecord')
3 files changed, 8 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 1915c444ef..2ccde15a26 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -101,6 +101,10 @@ module ActiveRecord @visitor = nil end + def valid_type?(type) + true + end + class SchemaCreation def initialize(conn) @conn = conn diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index c3bebf7a5e..50d189d27a 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -499,10 +499,6 @@ module ActiveRecord rename_column_indexes(table_name, column_name, new_column_name) end - def valid_type?(type) - true - end - protected def select(sql, name = nil, binds = []) #:nodoc: exec_query(sql, name, binds) diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb index dcbec24acf..d51d425c3c 100644 --- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb +++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb @@ -30,6 +30,10 @@ module ActiveRecord assert @conn.valid_type?(column.type) end + # sqlite databses should be able to support any type and not + # just the ones mentioned in the native_database_types. + # Therefore test_invalid column should always return true + # even if the type is not valid. def test_invalid_column assert @conn.valid_type?(:foobar) end |