aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/postgresql
diff options
context:
space:
mode:
authorMauricio Linhares <mauricio.linhares@gmail.com>2014-02-01 01:11:03 -0300
committerMauricio Linhares <mauricio.linhares@gmail.com>2014-02-01 09:38:43 -0300
commita34c10f73e739142794a2e6366328051fcc91238 (patch)
treef9a8d762068a351c1a00bf422ac56cdfb689ffe3 /activerecord/lib/active_record/connection_adapters/postgresql
parent9b2a017aa82f95911280ed597e4bf3193c9399e9 (diff)
downloadrails-a34c10f73e739142794a2e6366328051fcc91238.tar.gz
rails-a34c10f73e739142794a2e6366328051fcc91238.tar.bz2
rails-a34c10f73e739142794a2e6366328051fcc91238.zip
Fixes issue with parsing whitespace content back from database - fixes #13907
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/postgresql')
-rw-r--r--activerecord/lib/active_record/connection_adapters/postgresql/array_parser.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/array_parser.rb b/activerecord/lib/active_record/connection_adapters/postgresql/array_parser.rb
index 20de8d1982..0b218f2bfd 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/array_parser.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/array_parser.rb
@@ -91,8 +91,9 @@ module ActiveRecord
end
def add_item_to_array(array, current_item, quoted)
- if current_item.length == 0
- elsif !quoted && current_item == 'NULL'
+ return if !quoted && current_item.length == 0
+
+ if !quoted && current_item == 'NULL'
array.push nil
else
array.push current_item