Merge pull request #653 from larskanis/marshal-compat-array

Serialize CompositeCoder#dimensions only when set

Author: larskanis

lib/pg/coder.rb

@@ -72,12 +72,13 @@ def inspect_short
 
 	class CompositeCoder < Coder
 		def to_h
-			{ **super,
+			h = { **super,
 				elements_type: elements_type,
 				needs_quotation: needs_quotation?,
 				delimiter: delimiter,
-				dimensions: dimensions,
 			}
+			h[:dimensions] = dimensions if dimensions # Write only when set, for Marshal compat with pg<1.6
+			h
 		end
 
 		def inspect

spec/pg/type_spec.rb

@@ -1184,8 +1184,15 @@ def expect_deprecated_coder_init
 			it "should respond to to_h" do
 				expect( textenc_int_array.to_h ).to eq( {
 					name: nil, oid: 0, format: 0, flags: 0,
-					elements_type: textenc_int, needs_quotation: false, delimiter: ',',
-					dimensions: nil
+					elements_type: textenc_int, needs_quotation: false, delimiter: ','
+				} )
+			end
+
+			it "should respond to to_h with dimensions set" do
+				enc_array = PG::BinaryEncoder::Array.new dimensions: 1
+				expect( enc_array.to_h ).to eq( {
+					name: nil, oid: 0, format: 1, flags: 0, dimensions: 1,
+					elements_type: nil, needs_quotation: true, delimiter: ','
 				} )
 			end