提交 b671ae1e 编写于 作者: R Rafael França

Merge pull request #22214 from kamipo/not_passing_native_database_types_to_table_definition

Not passing `native_database_types` to `TableDefinition`
......@@ -206,14 +206,13 @@ class TableDefinition
include ColumnMethods
attr_accessor :indexes
attr_reader :name, :temporary, :options, :as, :foreign_keys, :native
attr_reader :name, :temporary, :options, :as, :foreign_keys
def initialize(types, name, temporary, options, as = nil)
def initialize(name, temporary, options, as = nil)
@columns_hash = {}
@indexes = {}
@foreign_keys = {}
@primary_keys = nil
@native = types
@temporary = temporary
@options = options
@as = as
......@@ -362,11 +361,8 @@ def references(*args, **options)
def new_column_definition(name, type, options) # :nodoc:
type = aliased_types(type.to_s, type)
column = create_column_definition name, type
limit = options.fetch(:limit) do
native[type][:limit] if native[type].is_a?(Hash)
end
column.limit = limit
column.limit = options[:limit]
column.precision = options[:precision]
column.scale = options[:scale]
column.default = options[:default]
......@@ -627,11 +623,6 @@ def foreign_key(*args) # :nodoc:
def foreign_key_exists?(*args) # :nodoc:
@base.foreign_key_exists?(name, *args)
end
private
def native
@base.native_database_types
end
end
end
end
......@@ -1168,7 +1168,7 @@ def rename_column_indexes(table_name, column_name, new_column_name)
private
def create_table_definition(name, temporary = false, options = nil, as = nil)
TableDefinition.new native_database_types, name, temporary, options, as
TableDefinition.new(name, temporary, options, as)
end
def create_alter_table(name)
......
......@@ -1039,7 +1039,7 @@ def create_table_info(table_name) # :nodoc:
end
def create_table_definition(name, temporary = false, options = nil, as = nil) # :nodoc:
MySQL::TableDefinition.new(native_database_types, name, temporary, options, as)
MySQL::TableDefinition.new(name, temporary, options, as)
end
def integer_to_sql(limit) # :nodoc:
......
......@@ -734,7 +734,7 @@ def extract_table_ref_from_insert_sql(sql) # :nodoc:
end
def create_table_definition(name, temporary = false, options = nil, as = nil) # :nodoc:
PostgreSQL::TableDefinition.new native_database_types, name, temporary, options, as
PostgreSQL::TableDefinition.new(name, temporary, options, as)
end
def can_perform_case_insensitive_comparison_for?(column)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册