aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2015-02-24 19:56:40 +0900
committerRyuta Kamizono <kamipo@gmail.com>2015-02-25 01:07:59 +0900
commitc137e54a78e25314a47b9e9fbff22de65af34aec (patch)
tree4290634c5d46a9293ccd0e971a804bfef6a7a46a /activerecord
parent8adfd4fea78cf62b31334a05f1a567ed861cf6a9 (diff)
downloadrails-c137e54a78e25314a47b9e9fbff22de65af34aec.tar.gz
rails-c137e54a78e25314a47b9e9fbff22de65af34aec.tar.bz2
rails-c137e54a78e25314a47b9e9fbff22de65af34aec.zip
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`.
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb8
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