1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

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`.
This commit is contained in:
Ryuta Kamizono 2015-02-24 19:56:40 +09:00
parent 8adfd4fea7
commit c137e54a78

View file

@ -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