diff options
author | Sean Griffin <sean@seantheprogrammer.com> | 2016-04-25 14:05:40 -0600 |
---|---|---|
committer | Sean Griffin <sean@seantheprogrammer.com> | 2016-04-25 14:05:40 -0600 |
commit | 831a277d4906f13ab79401fe049e86c63c5826cb (patch) | |
tree | e8e8a373e5210b3741e9f3a18f3734732fc34df4 /activerecord/lib | |
parent | 3e4c6d1abab30c5b6a998083656ccf6786fcd2fe (diff) | |
parent | 2af2d6b0571fb10d165ad60395b43d86d8cb34c0 (diff) | |
download | rails-831a277d4906f13ab79401fe049e86c63c5826cb.tar.gz rails-831a277d4906f13ab79401fe049e86c63c5826cb.tar.bz2 rails-831a277d4906f13ab79401fe049e86c63c5826cb.zip |
Merge pull request #24731 from vipulnsward/database-type
Change valid_type? from abstract adapter
Diffstat (limited to 'activerecord/lib')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_adapter.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb index 86de8f1ca0..373c082f65 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb @@ -154,7 +154,7 @@ module ActiveRecord end def valid_type?(type) - true + false end def schema_creation diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index 1d7ce92b29..e3793e6c77 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -154,6 +154,10 @@ module ActiveRecord true end + def valid_type?(type) + true + end + # Returns 62. SQLite supports index names up to 64 # characters. The rest is used by rails internally to perform # temporary rename operations |