aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-08-29 12:25:15 +0100
committerJon Leighton <j@jonathanleighton.com>2011-08-29 12:43:39 +0100
commit4fcd847c8d9fb2b22e1c2e3c840c8d1c590b56b4 (patch)
tree18ea251b7cabf02fe381ff4a121452f23d76ce2a /activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
parent5766539342426e956980bf6f54ef99600cbfc33e (diff)
downloadrails-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/mysql2_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb18
1 files changed, 3 insertions, 15 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
index 00d9caa8ee..8b574518e5 100644
--- a/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
@@ -21,22 +21,10 @@ module ActiveRecord
module ConnectionAdapters
class Mysql2Adapter < AbstractMysqlAdapter
- class Column < AbstractMysqlAdapter::Column # :nodoc:
- BOOL = "tinyint(1)"
-
- private
-
- # FIXME: Combine with the mysql version and move to abstract adapter
- def simplified_type(field_type)
- return :boolean if Mysql2Adapter.emulate_booleans && field_type.downcase.index(BOOL)
- case field_type
- when /enum/i, /set/i then :string
- when /year/i then :integer
- when /bit/i then :binary
- else
- super
- end
+ class Column < AbstractMysqlAdapter::Column # :nodoc:
+ def adapter
+ Mysql2Adapter
end
end