diff options
| author | jlxw <jason@jeyel.com> | 2013-02-05 16:49:33 +0800 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-23 19:00:37 -0300 |
| commit | 2c9304891ef264409980abfac499f698876744d0 (patch) | |
| tree | e3ffaf01e98e8956c2ab6341fa7d5fb6fafb8229 | |
| parent | bad0b81a0736cd81f36541cff47d51a1b0e44fda (diff) | |
| download | rails-2c9304891ef264409980abfac499f698876744d0.tar.gz rails-2c9304891ef264409980abfac499f698876744d0.tar.bz2 rails-2c9304891ef264409980abfac499f698876744d0.zip | |
Fix regex to strip quotations from hstore values
Previously regex did not strip quotation marks where hstore values were multi-line strings.
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/postgresql/cast.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/adapters/postgresql/hstore_test.rb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/cast.rb b/activerecord/lib/active_record/connection_adapters/postgresql/cast.rb index 3d8f0b575c..fcbd8fd88a 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/cast.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/cast.rb @@ -30,8 +30,8 @@ module ActiveRecord nil elsif String === string Hash[string.scan(HstorePair).map { |k,v| - v = v.upcase == 'NULL' ? nil : v.gsub(/^"(.*)"$/,'\1').gsub(/\\(.)/, '\1') - k = k.gsub(/^"(.*)"$/,'\1').gsub(/\\(.)/, '\1') + v = v.upcase == 'NULL' ? nil : v.gsub(/\A"(.*)"\Z/m,'\1').gsub(/\\(.)/, '\1') + k = k.gsub(/\A"(.*)"\Z/m,'\1').gsub(/\\(.)/, '\1') [k,v] }] else diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb index ad98d7c8ce..410119adc1 100644 --- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb +++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb @@ -189,6 +189,10 @@ class PostgresqlHstoreTest < ActiveRecord::TestCase assert_cycle('ca' => 'cà', 'ac' => 'àc') end + def test_multiline + assert_cycle("a\nb" => "c\nd") + end + private def assert_cycle hash # test creation |