aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters
diff options
context:
space:
mode:
authorRafael Mendonça França <rafael@franca.dev>2019-07-23 11:04:03 -0400
committerRafael Mendonça França <rafael@franca.dev>2019-07-23 11:04:03 -0400
commit0354b0d6c695bcbaa2750f47fa568dd3b69c59a3 (patch)
tree1e4129645142aad51cdb7df43e37be37cf3fb0f5 /activerecord/lib/active_record/connection_adapters
parent9c913116c634fe5fe2159a94b8f1a244801a4877 (diff)
parentddd0e9b02614d57aa3876b5679f046eca13b10d4 (diff)
downloadrails-0354b0d6c695bcbaa2750f47fa568dd3b69c59a3.tar.gz
rails-0354b0d6c695bcbaa2750f47fa568dd3b69c59a3.tar.bz2
rails-0354b0d6c695bcbaa2750f47fa568dd3b69c59a3.zip
Merge pull request #36665 from jmschneider/master
Make currency symbols optional for money column type in PostgreSQL
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/oid/money.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/money.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/money.rb
index 6434377b57..357493dfc0 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/money.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/money.rb
@@ -26,9 +26,9 @@ module ActiveRecord
value = value.sub(/^\((.+)\)$/, '-\1') # (4)
case value
- when /^-?\D+[\d,]+\.\d{2}$/ # (1)
+ when /^-?\D*[\d,]+\.\d{2}$/ # (1)
value.gsub!(/[^-\d.]/, "")
- when /^-?\D+[\d.]+,\d{2}$/ # (2)
+ when /^-?\D*[\d.]+,\d{2}$/ # (2)
value.gsub!(/[^-\d,]/, "").sub!(/,/, ".")
end