aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2015-02-04 09:13:55 -0700
committerSean Griffin <sean@seantheprogrammer.com>2015-02-04 09:13:55 -0700
commite440e8daba74e6d888c0fe0069e07fa38fed469b (patch)
tree5d693ab5e5c1e5d072ef19cf2567d76697ad3f4c /activerecord/lib/active_record/connection_adapters
parentcd0ed12d1a9edc73be953d700748b5827df890c7 (diff)
parent2eeb29a925f440d607801d609124ffc3140c2bba (diff)
downloadrails-e440e8daba74e6d888c0fe0069e07fa38fed469b.tar.gz
rails-e440e8daba74e6d888c0fe0069e07fa38fed469b.tar.bz2
rails-e440e8daba74e6d888c0fe0069e07fa38fed469b.zip
Merge pull request #18809 from meltheadorable/bugfix/postgres_money
Fix bug causing table creation to fail for models with postgresql 'money' field
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb6
1 files changed, 3 insertions, 3 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 a9522e152f..b9078d4c86 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/schema_definitions.rb
@@ -76,15 +76,15 @@ module ActiveRecord
column(name, :point, options)
end
- def bit(name, options)
+ def bit(name, options = {})
column(name, :bit, options)
end
- def bit_varying(name, options)
+ def bit_varying(name, options = {})
column(name, :bit_varying, options)
end
- def money(name, options)
+ def money(name, options = {})
column(name, :money, options)
end
end