diff options
author | Ryuta Kamizono <kamipo@gmail.com> | 2016-02-12 23:49:05 +0900 |
---|---|---|
committer | Ryuta Kamizono <kamipo@gmail.com> | 2016-03-08 08:51:26 +0900 |
commit | 6b6a01c52bacb2df2914029309144eacff25a3de (patch) | |
tree | cc82a4cad25aff13313b4347eb576c91998bf474 /activerecord/lib/active_record/connection_adapters/postgresql | |
parent | 51601f8889d08ee9336d6df9ea7598609578c40a (diff) | |
download | rails-6b6a01c52bacb2df2914029309144eacff25a3de.tar.gz rails-6b6a01c52bacb2df2914029309144eacff25a3de.tar.bz2 rails-6b6a01c52bacb2df2914029309144eacff25a3de.zip |
Passing `table_name` to `Column#initialize` to avoid `instance_variable_set`
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb index 5d1ed97331..ca2a41b136 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_statements.rb @@ -221,14 +221,12 @@ module ActiveRecord type_metadata = fetch_type_metadata(column_name, type, oid, fmod) default_value = extract_value_from_default(default) default_function = extract_default_function(default_value, default) - new_column(column_name, default_value, type_metadata, !notnull, default_function, collation).tap do |column| - column.instance_variable_set(:@table_name, table_name) - end + new_column(column_name, default_value, type_metadata, !notnull, table_name, default_function, collation) end end - def new_column(name, default, sql_type_metadata = nil, null = true, default_function = nil, collation = nil) # :nodoc: - PostgreSQLColumn.new(name, default, sql_type_metadata, null, default_function, collation) + def new_column(name, default, sql_type_metadata, null, table_name, default_function = nil, collation = nil) # :nodoc: + PostgreSQLColumn.new(name, default, sql_type_metadata, null, table_name, default_function, collation) end # Returns the current database name. |