diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-24 13:17:25 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-02-24 13:17:25 -0300 |
commit | 762bfee4a2a36f5c3bcf0f969bc0ee703d547152 (patch) | |
tree | 4290634c5d46a9293ccd0e971a804bfef6a7a46a | |
parent | 8adfd4fea78cf62b31334a05f1a567ed861cf6a9 (diff) | |
parent | c137e54a78e25314a47b9e9fbff22de65af34aec (diff) | |
download | rails-762bfee4a2a36f5c3bcf0f969bc0ee703d547152.tar.gz rails-762bfee4a2a36f5c3bcf0f969bc0ee703d547152.tar.bz2 rails-762bfee4a2a36f5c3bcf0f969bc0ee703d547152.zip |
Merge pull request #19062 from kamipo/move_back_new_column_definition_into_table_definition
Move back `new_column_definition` into `TableDefinition`
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb index 8f53794be0..8ec26bc109 100644 --- a/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb @@ -11,6 +11,10 @@ module ActiveRecord options[:auto_increment] = true if type == :bigint super end + end + + class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition + include ColumnMethods def new_column_definition(name, type, options) # :nodoc: column = super @@ -23,10 +27,6 @@ module ActiveRecord end end - class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition - include ColumnMethods - end - class Table < ActiveRecord::ConnectionAdapters::Table include ColumnMethods end |