diff options
author | Jon Leighton <j@jonathanleighton.com> | 2011-08-29 12:25:15 +0100 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2011-08-29 12:43:39 +0100 |
commit | 4fcd847c8d9fb2b22e1c2e3c840c8d1c590b56b4 (patch) | |
tree | 18ea251b7cabf02fe381ff4a121452f23d76ce2a /activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | |
parent | 5766539342426e956980bf6f54ef99600cbfc33e (diff) | |
download | rails-4fcd847c8d9fb2b22e1c2e3c840c8d1c590b56b4.tar.gz rails-4fcd847c8d9fb2b22e1c2e3c840c8d1c590b56b4.tar.bz2 rails-4fcd847c8d9fb2b22e1c2e3c840c8d1c590b56b4.zip |
Extract simplified_type into the abstract class
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/mysql_adapter.rb')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/mysql_adapter.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb index d61875195a..182db65165 100644 --- a/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/mysql_adapter.rb @@ -59,6 +59,7 @@ module ActiveRecord # * <tt>:sslcipher</tt> - Necessary to use MySQL with an SSL connection. # class MysqlAdapter < AbstractMysqlAdapter + class Column < AbstractMysqlAdapter::Column #:nodoc: def self.string_to_time(value) return super unless Mysql::Time === value @@ -82,13 +83,8 @@ module ActiveRecord new_date(v.year, v.month, v.day) end - private - - # FIXME: Combine with the mysql2 version and move to abstract adapter - def simplified_type(field_type) - return :boolean if MysqlAdapter.emulate_booleans && field_type.downcase.index("tinyint(1)") - return :string if field_type =~ /enum/i - super + def adapter + MysqlAdapter end end |