From c137e54a78e25314a47b9e9fbff22de65af34aec Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Tue, 24 Feb 2015 19:56:40 +0900 Subject: [PATCH] Move back `new_column_definition` into `TableDefinition` Only `primary_key` should be extracted by d47357e in #19030, but `new_coclumn_definition` was also extracted because #17631 is merged previously, then #19030 is auto merged without conflicts. This commit is for move back `new_column_definition` into `TableDefinition`. --- .../connection_adapters/abstract_mysql_adapter.rb | 8 ++++---- 1 file 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 @@ def primary_key(name, type = :primary_key, **options) 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 @@ def new_column_definition(name, type, options) # :nodoc: end end - class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition - include ColumnMethods - end - class Table < ActiveRecord::ConnectionAdapters::Table include ColumnMethods end -- GitLab