aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/postgresql
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2014-09-03 06:01:48 +0900
committerRyuta Kamizono <kamipo@gmail.com>2014-09-03 06:01:48 +0900
commitf6767b962e7dbcd2859a814ca1d369f0d5c064d2 (patch)
tree30cbf99dbf0446d008293a44311a9115073c0152 /activerecord/lib/active_record/connection_adapters/postgresql
parentcc7faddf1771e627a989e8583223a5729b6e098a (diff)
downloadrails-f6767b962e7dbcd2859a814ca1d369f0d5c064d2.tar.gz
rails-f6767b962e7dbcd2859a814ca1d369f0d5c064d2.tar.bz2
rails-f6767b962e7dbcd2859a814ca1d369f0d5c064d2.zip
Move column option handling to new_column_definition
TableDefinition#column is not called from `add_column`. Use TableDefinition#new_column_definition for column option handling.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb b/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
index 83554bbf74..b37630a04c 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
@@ -131,12 +131,10 @@ module ActiveRecord
column name, type, options
end
- def column(name, type = nil, options = {})
- super
- column = self[name]
+ def new_column_definition(name, type, options) # :nodoc:
+ column = super
column.array = options[:array]
-
- self
+ column
end
private