pg 0.18.4 → 1.2.3

data/spec/pg/tuple_spec.rb

@@ -0,0 +1,333 @@
+# -*- rspec -*-
+# encoding: utf-8
+
+require_relative '../helpers'
+require 'pg'
+require 'objspace'
+
+describe PG::Tuple do
+	let!(:typemap) { PG::BasicTypeMapForResults.new(@conn) }
+	let!(:result2x2) { @conn.exec( "VALUES(1, 'a'), (2, 'b')" ) }
+	let!(:result2x2sym) { @conn.exec( "VALUES(1, 'a'), (2, 'b')" ).field_names_as(:symbol) }
+	let!(:result2x3cast) do
+		@conn.exec( "SELECT * FROM (VALUES(1, TRUE, '3'), (2, FALSE, '4')) AS m (a, b, b)" )
+			.map_types!(typemap)
+	end
+	let!(:result2x3symcast) do
+		@conn.exec( "SELECT * FROM (VALUES(1, TRUE, '3'), (2, FALSE, '4')) AS m (a, b, b)" )
+			.map_types!(typemap)
+			.field_names_as(:symbol)
+	end
+	let!(:tuple0) { result2x2.tuple(0) }
+	let!(:tuple0sym) { result2x2sym.tuple(0) }
+	let!(:tuple1) { result2x2.tuple(1) }
+	let!(:tuple1sym) { result2x2sym.tuple(1) }
+	let!(:tuple2) { result2x3cast.tuple(0) }
+	let!(:tuple2sym) { result2x3symcast.tuple(0) }
+	let!(:tuple3) { str = Marshal.dump(result2x3cast.tuple(1)); Marshal.load(str) }
+	let!(:tuple_empty) { PG::Tuple.new }
+
+	describe "[]" do
+		it "returns nil for invalid keys" do
+			expect( tuple0["x"] ).to be_nil
+			expect( tuple0[0.5] ).to be_nil
+			expect( tuple0[2] ).to be_nil
+			expect( tuple0[-3] ).to be_nil
+			expect( tuple2[-4] ).to be_nil
+			expect{ tuple_empty[0] }.to raise_error(TypeError)
+		end
+
+		it "supports array like access" do
+			expect( tuple0[0] ).to eq( "1" )
+			expect( tuple0[1] ).to eq( "a" )
+			expect( tuple1[0] ).to eq( "2" )
+			expect( tuple1[1] ).to eq( "b" )
+			expect( tuple2[0] ).to eq( 1 )
+			expect( tuple2[1] ).to eq( true )
+			expect( tuple2[2] ).to eq( "3" )
+			expect( tuple3[0] ).to eq( 2 )
+			expect( tuple3[1] ).to eq( false )
+			expect( tuple3[2] ).to eq( "4" )
+		end
+
+		it "supports negative indices" do
+			expect( tuple0[-2] ).to eq( "1" )
+			expect( tuple0[-1] ).to eq( "a" )
+			expect( tuple2[-3] ).to eq( 1 )
+			expect( tuple2[-2] ).to eq( true )
+			expect( tuple2[-1] ).to eq( "3" )
+		end
+
+		it "supports hash like access" do
+			expect( tuple0["column1"] ).to eq( "1" )
+			expect( tuple0["column2"] ).to eq( "a" )
+			expect( tuple2["a"] ).to eq( 1 )
+			expect( tuple2["b"] ).to eq( "3" )
+			expect( tuple0[:b] ).to be_nil
+			expect( tuple0["x"] ).to be_nil
+		end
+
+		it "supports hash like access with symbols" do
+			expect( tuple0sym[:column1] ).to eq( "1" )
+			expect( tuple0sym[:column2] ).to eq( "a" )
+			expect( tuple2sym[:a] ).to eq( 1 )
+			expect( tuple2sym[:b] ).to eq( "3" )
+			expect( tuple2sym["b"] ).to be_nil
+			expect( tuple0sym[:x] ).to be_nil
+		end
+
+		it "casts lazy and caches result" do
+			a = []
+			deco = Class.new(PG::SimpleDecoder) do
+				define_method(:decode) do |*args|
+					a << args
+					args.last
+				end
+			end.new
+
+			result2x2.map_types!(PG::TypeMapByColumn.new([deco, deco]))
+			t = result2x2.tuple(1)
+
+			# cast and cache at first call to [0]
+			a.clear
+			expect( t[0] ).to eq( 0 )
+			expect( a ).to eq([["2", 1, 0]])
+
+			# use cache at second call to [0]
+			a.clear
+			expect( t[0] ).to eq( 0 )
+			expect( a ).to eq([])
+
+			# cast and cache at first call to [1]
+			a.clear
+			expect( t[1] ).to eq( 1 )
+			expect( a ).to eq([["b", 1, 1]])
+		end
+	end
+
+	describe "fetch" do
+		it "raises proper errors for invalid keys" do
+			expect{ tuple0.fetch("x") }.to raise_error(KeyError)
+			expect{ tuple0.fetch(0.5) }.to raise_error(KeyError)
+			expect{ tuple0.fetch(2) }.to raise_error(IndexError)
+			expect{ tuple0.fetch(-3) }.to raise_error(IndexError)
+			expect{ tuple0.fetch(-3) }.to raise_error(IndexError)
+			expect{ tuple2.fetch(-4) }.to raise_error(IndexError)
+			expect{ tuple_empty[0] }.to raise_error(TypeError)
+		end
+
+		it "supports array like access" do
+			expect( tuple0.fetch(0) ).to eq( "1" )
+			expect( tuple0.fetch(1) ).to eq( "a" )
+			expect( tuple2.fetch(0) ).to eq( 1 )
+			expect( tuple2.fetch(1) ).to eq( true )
+			expect( tuple2.fetch(2) ).to eq( "3" )
+		end
+
+		it "supports default value for indices" do
+			expect( tuple0.fetch(2, 42) ).to eq( 42 )
+			expect( tuple0.fetch(2){43} ).to eq( 43 )
+		end
+
+		it "supports negative indices" do
+			expect( tuple0.fetch(-2) ).to eq( "1" )
+			expect( tuple0.fetch(-1) ).to eq( "a" )
+			expect( tuple2.fetch(-3) ).to eq( 1 )
+			expect( tuple2.fetch(-2) ).to eq( true )
+			expect( tuple2.fetch(-1) ).to eq( "3" )
+		end
+
+		it "supports hash like access" do
+			expect( tuple0.fetch("column1") ).to eq( "1" )
+			expect( tuple0.fetch("column2") ).to eq( "a" )
+			expect( tuple2.fetch("a") ).to eq( 1 )
+			expect( tuple2.fetch("b") ).to eq( "3" )
+		end
+
+		it "supports default value for name keys" do
+			expect( tuple0.fetch("x", "defa") ).to eq("defa")
+			expect( tuple0.fetch("x"){"defa"} ).to eq("defa")
+		end
+	end
+
+	describe "each" do
+		it "can be used as an enumerator" do
+			expect( tuple0.each ).to be_kind_of(Enumerator)
+			expect( tuple0.each.to_a ).to eq( [["column1", "1"], ["column2", "a"]] )
+			expect( tuple1.each.to_a ).to eq( [["column1", "2"], ["column2", "b"]] )
+			expect( tuple2.each.to_a ).to eq( [["a", 1], ["b", true], ["b", "3"]] )
+			expect( tuple3.each.to_a ).to eq( [["a", 2], ["b", false], ["b", "4"]] )
+			expect{ tuple_empty.each }.to raise_error(TypeError)
+		end
+
+		it "can be used as an enumerator with symbols" do
+			expect( tuple0sym.each ).to be_kind_of(Enumerator)
+			expect( tuple0sym.each.to_a ).to eq( [[:column1, "1"], [:column2, "a"]] )
+			expect( tuple2sym.each.to_a ).to eq( [[:a, 1], [:b, true], [:b, "3"]] )
+		end
+
+		it "can be used with block" do
+			a = []
+			tuple0.each do |*v|
+				a << v
+			end
+			expect( a ).to eq( [["column1", "1"], ["column2", "a"]] )
+		end
+	end
+
+	describe "each_value" do
+		it "can be used as an enumerator" do
+			expect( tuple0.each_value ).to be_kind_of(Enumerator)
+			expect( tuple0.each_value.to_a ).to eq( ["1", "a"] )
+			expect( tuple1.each_value.to_a ).to eq( ["2", "b"] )
+			expect( tuple2.each_value.to_a ).to eq( [1, true, "3"] )
+			expect( tuple3.each_value.to_a ).to eq( [2, false, "4"] )
+			expect{ tuple_empty.each_value }.to raise_error(TypeError)
+		end
+
+		it "can be used with block" do
+			a = []
+			tuple0.each_value do |v|
+				a << v
+			end
+			expect( a ).to eq( ["1", "a"] )
+		end
+	end
+
+	it "responds to values" do
+		expect( tuple0.values ).to eq( ["1", "a"] )
+		expect( tuple3.values ).to eq( [2, false, "4"] )
+		expect{ tuple_empty.values }.to raise_error(TypeError)
+	end
+
+	it "responds to key?" do
+		expect( tuple1.key?("column1") ).to eq( true )
+		expect( tuple1.key?(:column1) ).to eq( false )
+		expect( tuple1.key?("other") ).to eq( false )
+		expect( tuple1.has_key?("column1") ).to eq( true )
+		expect( tuple1.has_key?("other") ).to eq( false )
+	end
+
+	it "responds to key? as symbol" do
+		expect( tuple1sym.key?(:column1) ).to eq( true )
+		expect( tuple1sym.key?("column1") ).to eq( false )
+		expect( tuple1sym.key?(:other) ).to eq( false )
+		expect( tuple1sym.has_key?(:column1) ).to eq( true )
+		expect( tuple1sym.has_key?(:other) ).to eq( false )
+	end
+
+	it "responds to keys" do
+		expect( tuple0.keys ).to eq( ["column1", "column2"] )
+		expect( tuple2.keys ).to eq( ["a", "b", "b"] )
+	end
+
+	it "responds to keys as symbol" do
+		expect( tuple0sym.keys ).to eq( [:column1, :column2] )
+		expect( tuple2sym.keys ).to eq( [:a, :b, :b] )
+	end
+
+	describe "each_key" do
+		it "can be used as an enumerator" do
+			expect( tuple0.each_key ).to be_kind_of(Enumerator)
+			expect( tuple0.each_key.to_a ).to eq( ["column1", "column2"] )
+			expect( tuple2.each_key.to_a ).to eq( ["a", "b", "b"] )
+		end
+
+		it "can be used with block" do
+			a = []
+			tuple0.each_key do |v|
+				a << v
+			end
+			expect( a ).to eq( ["column1", "column2"] )
+		end
+	end
+
+	it "responds to length" do
+		expect( tuple0.length ).to eq( 2 )
+		expect( tuple0.size ).to eq( 2 )
+		expect( tuple2.size ).to eq( 3 )
+	end
+
+	it "responds to index" do
+		expect( tuple0.index("column1") ).to eq( 0 )
+		expect( tuple0.index(:column1) ).to eq( nil )
+		expect( tuple0.index("column2") ).to eq( 1 )
+		expect( tuple0.index("x") ).to eq( nil )
+		expect( tuple2.index("a") ).to eq( 0 )
+		expect( tuple2.index("b") ).to eq( 2 )
+	end
+
+	it "responds to index with symbol" do
+		expect( tuple0sym.index(:column1) ).to eq( 0 )
+		expect( tuple0sym.index("column1") ).to eq( nil )
+		expect( tuple0sym.index(:column2) ).to eq( 1 )
+		expect( tuple0sym.index(:x) ).to eq( nil )
+		expect( tuple2sym.index(:a) ).to eq( 0 )
+		expect( tuple2sym.index(:b) ).to eq( 2 )
+	end
+
+	it "can be used as Enumerable" do
+		expect( tuple0.to_a ).to eq( [["column1", "1"], ["column2", "a"]] )
+		expect( tuple1.to_a ).to eq( [["column1", "2"], ["column2", "b"]] )
+		expect( tuple2.to_a ).to eq( [["a", 1], ["b", true], ["b", "3"]] )
+		expect( tuple3.to_a ).to eq( [["a", 2], ["b", false], ["b", "4"]] )
+	end
+
+	it "can be marshaled" do
+		[tuple0, tuple1, tuple2, tuple3, tuple0sym, tuple2sym].each do |t1|
+			str = Marshal.dump(t1)
+			t2 = Marshal.load(str)
+
+			expect( t2 ).to be_kind_of(t1.class)
+			expect( t2 ).not_to equal(t1)
+			expect( t2.to_a ).to eq(t1.to_a)
+		end
+	end
+
+	it "passes instance variables when marshaled" do
+		t1 = tuple0
+		t1.instance_variable_set("@a", 4711)
+		str = Marshal.dump(t1)
+		t2 = Marshal.load(str)
+
+		expect( t2.instance_variable_get("@a") ).to eq( 4711 )
+	end
+
+	it "can't be marshaled when empty" do
+		expect{ Marshal.dump(tuple_empty) }.to raise_error(TypeError)
+	end
+
+	it "should give account about memory usage" do
+		expect( ObjectSpace.memsize_of(tuple0) ).to be > 40
+		expect( ObjectSpace.memsize_of(tuple_empty) ).to be > 0
+	end
+
+	it "should override #inspect" do
+		expect( tuple1.inspect ).to eq('#<PG::Tuple column1: "2", column2: "b">')
+		expect( tuple2.inspect ).to eq('#<PG::Tuple a: 1, b: true, b: "3">')
+		expect( tuple2sym.inspect ).to eq('#<PG::Tuple a: 1, b: true, b: "3">')
+		expect{ tuple_empty.inspect }.to raise_error(TypeError)
+	end
+
+	context "with cleared result" do
+		it "should raise an error when non-materialized fields are used" do
+			r = result2x2
+			t = r.tuple(0)
+			t[0] # materialize first field only
+			r.clear
+
+			# second column should fail
+			expect{ t[1] }.to raise_error(PG::Error)
+			expect{ t.fetch(1) }.to raise_error(PG::Error)
+			expect{ t.fetch("column2") }.to raise_error(PG::Error)
+
+			# first column should succeed
+			expect( t[0] ).to eq( "1" )
+			expect( t.fetch(0) ).to eq( "1" )
+			expect( t.fetch("column1") ).to eq( "1" )
+
+			# should fail due to the second column
+			expect{ t.values }.to raise_error(PG::Error)
+		end
+	end
+end

data/spec/pg/type_map_by_class_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+# -*- rspec -*-
 # encoding: utf-8
 
 require_relative '../helpers'
@@ -59,7 +59,7 @@ describe PG::TypeMapByClass do
 	it "should retrieve particular conversions" do
 		expect( tm[Integer] ).to eq(binaryenc_int)
 		expect( tm[Float] ).to eq(textenc_float)
-		expect( tm[Bignum] ).to be_nil
+		expect( tm[Range] ).to be_nil
 		expect( derived_tm[raise_class] ).to be_kind_of(Proc)
 		expect( derived_tm[Array] ).to eq(:array_type_map_for)
 	end
@@ -102,7 +102,7 @@ describe PG::TypeMapByClass do
 
 	it "should allow mixed type conversions" do
 		res = @conn.exec_params( "SELECT $1, $2, $3", [5, 1.23, :TestSymbol], 0, tm )
-		expect( res.values ).to eq([['5', '1.23', '[:TestSymbol]']])
+		expect( res.values ).to eq([['5', '1.23', "[:TestSymbol, #{@conn.internal_encoding.inspect}]"]])
 		expect( res.ftype(0) ).to eq(20)
 	end
 
@@ -132,7 +132,7 @@ describe PG::TypeMapByClass do
 	it "should raise error on invalid coder object" do
 		tm[TrueClass] = "dummy"
 		expect{
-			res = @conn.exec_params( "SELECT $1", [true], 0, tm )
+			@conn.exec_params( "SELECT $1", [true], 0, tm )
 		}.to raise_error(NoMethodError, /undefined method.*call/)
 	end
 end

data/spec/pg/type_map_by_column_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+# -*- rspec -*-
 # encoding: utf-8
 
 require_relative '../helpers'
@@ -38,7 +38,11 @@ describe PG::TypeMapByColumn do
 			pass_through_type,
 			nil
 		] )
-		expect( cm.inspect ).to eq( "#<PG::TypeMapByColumn INT4:0 TEXT:0 FLOAT4:0 pass_through:1 nil>" )
+	end
+
+	it "should respond to inspect" do
+		cm = PG::TypeMapByColumn.new( [textdec_int, textenc_string, textdec_float, pass_through_type, PG::TextEncoder::Float.new, nil] )
+		expect( cm.inspect ).to eq( "#<PG::TypeMapByColumn INT4:TD TEXT:TE FLOAT4:TD pass_through:BD PG::TextEncoder::Float:TE nil>" )
 	end
 
 	it "should retrieve it's oids" do

data/spec/pg/type_map_by_mri_type_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+# -*- rspec -*-
 # encoding: utf-8
 
 require_relative '../helpers'
@@ -116,7 +116,7 @@ describe PG::TypeMapByMriType do
 
 	it "should allow mixed type conversions" do
 		res = @conn.exec_params( "SELECT $1, $2, $3", [5, 1.23, :TestSymbol], 0, tm )
-		expect( res.values ).to eq([['5', '1.23', '[:TestSymbol]']])
+		expect( res.values ).to eq([['5', '1.23', "[:TestSymbol, #{@conn.internal_encoding.inspect}]"]])
 		expect( res.ftype(0) ).to eq(20)
 	end
 

data/spec/pg/type_map_by_oid_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+# -*- rspec -*-
 # encoding: utf-8
 
 require_relative '../helpers'
@@ -54,8 +54,8 @@ describe PG::TypeMapByOid do
 	end
 
 	it "should check format when deleting coders" do
-		expect{ tm.rm_coder 2, 123 }.to raise_error(ArgumentError)
-		expect{ tm.rm_coder -1, 123 }.to raise_error(ArgumentError)
+		expect{ tm.rm_coder(2, 123) }.to raise_error(ArgumentError)
+		expect{ tm.rm_coder(-1, 123) }.to raise_error(ArgumentError)
 	end
 
 	it "should check format when adding coders" do

data/spec/pg/type_map_in_ruby_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+# -*- rspec -*-
 # encoding: utf-8
 
 require_relative '../helpers'

data/spec/pg/type_map_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+# -*- rspec -*-
 # encoding: utf-8
 
 require_relative '../helpers'

data/spec/pg/type_spec.rb

@@ -1,7 +1,8 @@
-#!/usr/bin/env rspec
+# -*- rspec -*-
 # encoding: utf-8
 
 require 'pg'
+require 'time'
 
 
 describe "PG::Type derivations" do
@@ -11,10 +12,14 @@ describe "PG::Type derivations" do
 	let!(:textdec_boolean) { PG::TextDecoder::Boolean.new }
 	let!(:textenc_float) { PG::TextEncoder::Float.new }
 	let!(:textdec_float) { PG::TextDecoder::Float.new }
+	let!(:textenc_numeric) { PG::TextEncoder::Numeric.new }
 	let!(:textenc_string) { PG::TextEncoder::String.new }
 	let!(:textdec_string) { PG::TextDecoder::String.new }
 	let!(:textenc_timestamp) { PG::TextEncoder::TimestampWithoutTimeZone.new }
 	let!(:textdec_timestamp) { PG::TextDecoder::TimestampWithoutTimeZone.new }
+	let!(:textenc_timestamputc) { PG::TextEncoder::TimestampUtc.new }
+	let!(:textdec_timestamputc) { PG::TextDecoder::TimestampUtc.new }
+	let!(:textdec_timestampul) { PG::TextDecoder::TimestampUtcToLocal.new }
 	let!(:textenc_timestamptz) { PG::TextEncoder::TimestampWithTimeZone.new }
 	let!(:textdec_timestamptz) { PG::TextDecoder::TimestampWithTimeZone.new }
 	let!(:textenc_bytea) { PG::TextEncoder::Bytea.new }
@@ -39,6 +44,14 @@ describe "PG::Type derivations" do
 		end.new
 	end
 
+	let!(:intenc_incrementer_with_encoding) do
+		Class.new(PG::SimpleEncoder) do
+			def encode(value, encoding)
+				r = (value.to_i + 1).to_s + " #{encoding}"
+				r.encode!(encoding)
+			end
+		end.new
+	end
 	let!(:intenc_incrementer_with_int_result) do
 		Class.new(PG::SimpleEncoder) do
 			def encode(value)
@@ -67,7 +80,7 @@ describe "PG::Type derivations" do
 				expect( intdec_incrementer.decode("3") ).to eq( 4 )
 			end
 
-			it "should decode integers of different lengths form text format" do
+			it "should decode integers of different lengths from text format" do
 				30.times do |zeros|
 					expect( textdec_int.decode("1" + "0"*zeros) ).to eq( 10 ** zeros )
 					expect( textdec_int.decode(zeros==0 ? "0" : "9"*zeros) ).to eq( 10 ** zeros - 1 )
@@ -88,21 +101,41 @@ describe "PG::Type derivations" do
 			end
 
 			context 'timestamps' do
-				it 'decodes timestamps without timezone' do
-					expect( textdec_timestamp.decode('2016-01-02 23:23:59.123456') ).
-						to be_within(0.000001).of( Time.new(2016,01,02, 23, 23, 59.123456) )
+				it 'decodes timestamps without timezone as local time' do
+					expect( textdec_timestamp.decode('2016-01-02 23:23:59.123456').iso8601(5) ).
+						to eq( Time.new(2016,1,2, 23,23,59.123456).iso8601(5) )
+					expect( textdec_timestamp.decode('2016-08-02 23:23:59.123456').iso8601(5) ).
+						to eq( Time.new(2016,8,2, 23,23,59.123456).iso8601(5) )
+				end
+				it 'decodes timestamps with UTC time and returns UTC timezone' do
+					expect( textdec_timestamputc.decode('2016-01-02 23:23:59.123456').iso8601(5) ).
+						to eq( Time.utc(2016,1,2, 23,23,59.123456).iso8601(5) )
+					expect( textdec_timestamputc.decode('2016-08-02 23:23:59.123456').iso8601(5) ).
+						to eq( Time.utc(2016,8,2, 23,23,59.123456).iso8601(5) )
+				end
+				it 'decodes timestamps with UTC time and returns local timezone' do
+					expect( textdec_timestampul.decode('2016-01-02 23:23:59.123456').iso8601(5) ).
+						to eq( Time.utc(2016,1,2, 23,23,59.123456).getlocal.iso8601(5) )
+					expect( textdec_timestampul.decode('2016-08-02 23:23:59.123456').iso8601(5) ).
+						to eq( Time.utc(2016,8,2, 23,23,59.123456).getlocal.iso8601(5) )
 				end
 				it 'decodes timestamps with hour timezone' do
-					expect( textdec_timestamptz.decode('2015-01-26 17:26:42.691511-04') ).
-						to be_within(0.000001).of( Time.new(2015,01,26, 17, 26, 42.691511, "-04:00") )
-					expect( textdec_timestamptz.decode('2015-01-26 17:26:42.691511+10') ).
-						to be_within(0.000001).of( Time.new(2015,01,26, 17, 26, 42.691511, "+10:00") )
+					expect( textdec_timestamptz.decode('2016-01-02 23:23:59.123456-04').iso8601(5) ).
+						to eq( Time.new(2016,1,2, 23,23,59.123456, "-04:00").iso8601(5) )
+					expect( textdec_timestamptz.decode('2016-08-02 23:23:59.123456+10').iso8601(5) ).
+						to eq( Time.new(2016,8,2, 23,23,59.123456, "+10:00").iso8601(5) )
+					expect( textdec_timestamptz.decode('1913-12-31 23:58:59.1231-03').iso8601(5) ).
+						to eq( Time.new(1913, 12, 31, 23, 58, 59.1231, "-03:00").iso8601(5) )
+					expect( textdec_timestamptz.decode('4714-11-24 23:58:59.1231-03 BC').iso8601(5) ).
+						to eq( Time.new(-4713, 11, 24, 23, 58, 59.1231, "-03:00").iso8601(5) )
+					expect( textdec_timestamptz.decode('294276-12-31 23:58:59.1231+03').iso8601(5) ).
+						to eq( Time.new(294276, 12, 31, 23, 58, 59.1231, "+03:00").iso8601(5) )
 				end
 				it 'decodes timestamps with hour:minute timezone' do
 					expect( textdec_timestamptz.decode('2015-01-26 17:26:42.691511-04:15') ).
 						to be_within(0.000001).of( Time.new(2015,01,26, 17, 26, 42.691511, "-04:15") )
-					expect( textdec_timestamptz.decode('2015-01-26 17:26:42.691511-0430') ).
-						to be_within(0.000001).of( Time.new(2015,01,26, 17, 26, 42.691511, "-04:30") )
+					expect( textdec_timestamptz.decode('2015-07-26 17:26:42.691511-04:30') ).
+						to be_within(0.000001).of( Time.new(2015,07,26, 17, 26, 42.691511, "-04:30") )
 					expect( textdec_timestamptz.decode('2015-01-26 17:26:42.691511+10:45') ).
 						to be_within(0.000001).of( Time.new(2015,01,26, 17, 26, 42.691511, "+10:45") )
 				end
@@ -113,6 +146,81 @@ describe "PG::Type derivations" do
 					expect( textdec_timestamptz.decode('1916-01-01 00:00:00-00:25:21') ).
 						to be_within(0.000001).of( Time.new(1916, 1, 1, 0, 0, 0, "-00:25:21") )
 				end
+				it 'decodes timestamps with date before 1823' do
+					expect( textdec_timestamp.decode('1822-01-02 23:23:59.123456').iso8601(5) ).
+						to eq( Time.new(1822,01,02, 23, 23, 59.123456).iso8601(5) )
+					expect( textdec_timestamputc.decode('1822-01-02 23:23:59.123456').iso8601(5) ).
+						to eq( Time.utc(1822,01,02, 23, 23, 59.123456).iso8601(5) )
+					expect( textdec_timestampul.decode('1822-01-02 23:23:59.123456').iso8601(5) ).
+						to eq( Time.utc(1822,01,02, 23, 23, 59.123456).getlocal.iso8601(5) )
+					expect( textdec_timestamptz.decode('1822-01-02 23:23:59.123456+04').iso8601(5) ).
+						to eq( Time.new(1822,01,02, 23, 23, 59.123456, "+04:00").iso8601(5) )
+				end
+				it 'decodes timestamps with date after 2116' do
+					expect( textdec_timestamp.decode('2117-01-02 23:23:59.123456').iso8601(5) ).
+						to eq( Time.new(2117,01,02, 23, 23, 59.123456).iso8601(5) )
+					expect( textdec_timestamputc.decode('2117-01-02 23:23:59.123456').iso8601(5) ).
+						to eq( Time.utc(2117,01,02, 23, 23, 59.123456).iso8601(5) )
+					expect( textdec_timestampul.decode('2117-01-02 23:23:59.123456').iso8601(5) ).
+						to eq( Time.utc(2117,01,02, 23, 23, 59.123456).getlocal.iso8601(5) )
+					expect( textdec_timestamptz.decode('2117-01-02 23:23:59.123456+04').iso8601(5) ).
+						to eq( Time.new(2117,01,02, 23, 23, 59.123456, "+04:00").iso8601(5) )
+				end
+				it 'decodes timestamps with variable number of digits for the useconds part' do
+					sec = "59.12345678912345"
+					(4..sec.length).each do |i|
+						expect( textdec_timestamp.decode("2016-01-02 23:23:#{sec[0,i]}") ).
+										to be_within(0.000001).of( Time.new(2016,01,02, 23, 23, sec[0,i].to_f) )
+					end
+				end
+				it 'decodes timestamps with leap-second' do
+					expect( textdec_timestamp.decode('1998-12-31 23:59:60.1234') ).
+						to be_within(0.000001).of( Time.new(1998,12,31, 23, 59, 60.1234) )
+				end
+
+				def textdec_timestamptz_decode_should_fail(str)
+					expect(textdec_timestamptz.decode(str)).to eq(str)
+				end
+
+				it 'fails when the timestamp is an empty string' do
+					textdec_timestamptz_decode_should_fail('')
+				end
+				it 'fails when the timestamp contains values with less digits than expected' do
+					textdec_timestamptz_decode_should_fail('2016-0-02 23:23:59.123456+00:25:21')
+					textdec_timestamptz_decode_should_fail('2016-01-0 23:23:59.123456+00:25:21')
+					textdec_timestamptz_decode_should_fail('2016-01-02 2:23:59.123456+00:25:21')
+					textdec_timestamptz_decode_should_fail('2016-01-02 23:2:59.123456+00:25:21')
+					textdec_timestamptz_decode_should_fail('2016-01-02 23:23:5.123456+00:25:21')
+					textdec_timestamptz_decode_should_fail('2016-01-02 23:23:59.+00:25:21')
+					textdec_timestamptz_decode_should_fail('2016-01-02 23:23:59.123456+0:25:21')
+					textdec_timestamptz_decode_should_fail('2016-01-02 23:23:59.123456+00:2:21')
+					textdec_timestamptz_decode_should_fail('2016-01-02 23:23:59.123456+00:25:2')
+				end
+				it 'fails when the timestamp contains values with more digits than expected' do
+					textdec_timestamptz_decode_should_fail('2016-011-02 23:23:59.123456+00:25:21')
+					textdec_timestamptz_decode_should_fail('2016-01-022 23:23:59.123456+00:25:21')
+					textdec_timestamptz_decode_should_fail('2016-01-02 233:23:59.123456+00:25:21')
+					textdec_timestamptz_decode_should_fail('2016-01-02 23:233:59.123456+00:25:21')
+					textdec_timestamptz_decode_should_fail('2016-01-02 23:23:599.123456+00:25:21')
+					textdec_timestamptz_decode_should_fail('2016-01-02 23:23:59.123456+000:25:21')
+					textdec_timestamptz_decode_should_fail('2016-01-02 23:23:59.123456+00:255:21')
+					textdec_timestamptz_decode_should_fail('2016-01-02 23:23:59.123456+00:25:211')
+				end
+				it 'fails when the timestamp contains values with invalid characters' do
+					str = '2013-01-02 23:23:59.123456+00:25:21'
+					str.length.times do |i|
+						textdec_timestamptz_decode_should_fail(str[0,i] + "x" + str[i+1..-1])
+					end
+				end
+				it 'fails when the timestamp contains leading characters' do
+					textdec_timestamptz_decode_should_fail(' 2016-01-02 23:23:59.123456')
+				end
+				it 'fails when the timestamp contains trailing characters' do
+					textdec_timestamptz_decode_should_fail('2016-01-02 23:23:59.123456 ')
+				end
+				it 'fails when the timestamp contains non ASCII character' do
+					textdec_timestamptz_decode_should_fail('2016-01ª02 23:23:59.123456')
+				end
 			end
 
 			context 'identifier quotation' do
@@ -127,6 +235,13 @@ describe "PG::Type derivations" do
 					expect( quoted_type.decode(%[a.b]) ).to eq( ['a','b'] )
 					expect( quoted_type.decode(%[a]) ).to eq( ['a'] )
 				end
+
+				it 'should split identifier string with correct character encoding' do
+					quoted_type = PG::TextDecoder::Identifier.new
+					v = quoted_type.decode(%[Héllo].encode("iso-8859-1")).first
+					expect( v.encoding ).to eq( Encoding::ISO_8859_1 )
+					expect( v ).to eq( %[Héllo].encode(Encoding::ISO_8859_1) )
+				end
 			end
 
 			it "should raise when decode method is called with wrong args" do
@@ -140,6 +255,11 @@ describe "PG::Type derivations" do
 				expect( textdec_string.decode( nil )).to be_nil
 				expect( textdec_int.decode( nil )).to be_nil
 			end
+
+			it "should be defined on an encoder but not on a decoder instance" do
+				expect( textdec_int.respond_to?(:decode) ).to be_truthy
+				expect( textenc_int.respond_to?(:decode) ).to be_falsey
+			end
 		end
 
 		describe '#encode' do
@@ -190,16 +310,98 @@ describe "PG::Type derivations" do
 				end
 			end
 
+			it "should encode floats" do
+				expect( textenc_float.encode(0) ).to eq( "0.0" )
+				expect( textenc_float.encode(-1) ).to eq( "-1.0" )
+				expect( textenc_float.encode(-1.234567890123456789) ).to eq( "-1.234567890123457" )
+				expect( textenc_float.encode(9) ).to eq( "9.0" )
+				expect( textenc_float.encode(10) ).to eq( "10.0" )
+				expect( textenc_float.encode(-99) ).to eq( "-99.0" )
+				expect( textenc_float.encode(-100) ).to eq( "-100.0" )
+				expect( textenc_float.encode(999) ).to eq( "999.0" )
+				expect( textenc_float.encode(-1000) ).to eq( "-1000.0" )
+				expect( textenc_float.encode(1234.567890123456789) ).to eq( "1234.567890123457" )
+				expect( textenc_float.encode(-9999) ).to eq( "-9999.0" )
+				expect( textenc_float.encode(10000) ).to eq( "10000.0" )
+				expect( textenc_float.encode(99999) ).to eq( "99999.0" )
+				expect( textenc_float.encode(-100000) ).to eq( "-100000.0" )
+				expect( textenc_float.encode(-999999) ).to eq( "-999999.0" )
+				expect( textenc_float.encode(1000000) ).to eq( "1000000.0" )
+				expect( textenc_float.encode(9999999) ).to eq( "9999999.0" )
+				expect( textenc_float.encode(-100000000000000) ).to eq( "-100000000000000.0" )
+				expect( textenc_float.encode(123456789012345) ).to eq( "123456789012345.0" )
+				expect( textenc_float.encode(-999999999999999) ).to eq( "-999999999999999.0" )
+				expect( textenc_float.encode(1000000000000000) ).to eq( "1e15" )
+				expect( textenc_float.encode(-1234567890123456) ).to eq( "-1.234567890123456e15" )
+				expect( textenc_float.encode(9999999999999999) ).to eq( "1e16" )
+
+				expect( textenc_float.encode(-0.0) ).to eq( "0.0" )
+				expect( textenc_float.encode(0.1) ).to eq( "0.1" )
+				expect( textenc_float.encode(0.1234567890123456789) ).to eq( "0.1234567890123457" )
+				expect( textenc_float.encode(-0.9) ).to eq( "-0.9" )
+				expect( textenc_float.encode(-0.01234567890123456789) ).to eq( "-0.01234567890123457" )
+				expect( textenc_float.encode(0.09) ).to eq( "0.09" )
+				expect( textenc_float.encode(0.001234567890123456789) ).to eq( "0.001234567890123457" )
+				expect( textenc_float.encode(-0.009) ).to eq( "-0.009" )
+				expect( textenc_float.encode(-0.0001234567890123456789) ).to eq( "-0.0001234567890123457" )
+				expect( textenc_float.encode(0.0009) ).to eq( "0.0009" )
+				expect( textenc_float.encode(0.00001) ).to eq( "1e-5" )
+				expect( textenc_float.encode(0.00001234567890123456789) ).to eq( "1.234567890123457e-5" )
+				expect( textenc_float.encode(-0.00009) ).to eq( "-9e-5" )
+				expect( textenc_float.encode(-0.11) ).to eq( "-0.11" )
+				expect( textenc_float.encode(10.11) ).to eq( "10.11" )
+				expect( textenc_float.encode(-1.234567890123456789E-280) ).to eq( "-1.234567890123457e-280" )
+				expect( textenc_float.encode(-1.234567890123456789E280) ).to eq( "-1.234567890123457e280" )
+				expect( textenc_float.encode(9876543210987654321E280) ).to eq( "9.87654321098765e298" )
+				expect( textenc_float.encode(9876543210987654321E-400) ).to eq( "0.0" )
+				expect( textenc_float.encode(9876543210987654321E400) ).to eq( "Infinity" )
+			end
+
 			it "should encode special floats equally to Float#to_s" do
 				expect( textenc_float.encode(Float::INFINITY) ).to eq( Float::INFINITY.to_s )
 				expect( textenc_float.encode(-Float::INFINITY) ).to eq( (-Float::INFINITY).to_s )
 				expect( textenc_float.encode(-Float::NAN) ).to eq( Float::NAN.to_s )
 			end
 
+			it "should encode various inputs to numeric format" do
+				expect( textenc_numeric.encode(0) ).to eq( "0" )
+				expect( textenc_numeric.encode(1) ).to eq( "1" )
+				expect( textenc_numeric.encode(-12345678901234567890123) ).to eq( "-12345678901234567890123" )
+				expect( textenc_numeric.encode(0.0) ).to eq( "0.0" )
+				expect( textenc_numeric.encode(1.0) ).to eq( "1.0" )
+				expect( textenc_numeric.encode(-1.23456789012e45) ).to eq( "-1.23456789012e45" )
+				expect( textenc_numeric.encode(Float::NAN) ).to eq( Float::NAN.to_s )
+				expect( textenc_numeric.encode(BigDecimal(0)) ).to eq( "0.0" )
+				expect( textenc_numeric.encode(BigDecimal(1)) ).to eq( "1.0" )
+				expect( textenc_numeric.encode(BigDecimal("-12345678901234567890.1234567")) ).to eq( "-12345678901234567890.1234567" )
+				expect( textenc_numeric.encode(" 123 ") ).to eq( " 123 " )
+			end
+
 			it "encodes binary string to bytea" do
 				expect( textenc_bytea.encode("\x00\x01\x02\x03\xef".b) ).to eq( "\\x00010203ef" )
 			end
 
+			context 'timestamps' do
+				it 'encodes timestamps without timezone' do
+					expect( textenc_timestamp.encode(Time.new(2016,1,2, 23, 23, 59.123456, 3*60*60)) ).
+						to match( /^2016-01-02 23:23:59.12345\d+$/ )
+					expect( textenc_timestamp.encode(Time.new(2016,8,2, 23, 23, 59.123456, 3*60*60)) ).
+						to match( /^2016-08-02 23:23:59.12345\d+$/ )
+				end
+				it 'encodes timestamps with UTC timezone' do
+					expect( textenc_timestamputc.encode(Time.new(2016,1,2, 23, 23, 59.123456, 3*60*60)) ).
+						to match( /^2016-01-02 20:23:59.12345\d+$/ )
+					expect( textenc_timestamputc.encode(Time.new(2016,8,2, 23, 23, 59.123456, 3*60*60)) ).
+						to match( /^2016-08-02 20:23:59.12345\d+$/ )
+				end
+				it 'encodes timestamps with hour timezone' do
+					expect( textenc_timestamptz.encode(Time.new(2016,1,02, 23, 23, 59.123456, -4*60*60)) ).
+						to match( /^2016-01-02 23:23:59.12345\d+ \-04:00$/ )
+					expect( textenc_timestamptz.encode(Time.new(2016,8,02, 23, 23, 59.123456, 10*60*60)) ).
+						to match( /^2016-08-02 23:23:59.12345\d+ \+10:00$/ )
+				end
+			end
+
 			context 'identifier quotation' do
 				it 'should quote and escape identifier' do
 					quoted_type = PG::TextEncoder::Identifier.new
@@ -209,6 +411,13 @@ describe "PG::Type derivations" do
 					expect( quoted_type.encode( nil ) ).to be_nil
 				end
 
+				it 'should quote identifiers with correct character encoding' do
+					quoted_type = PG::TextEncoder::Identifier.new
+					v = quoted_type.encode(['Héllo'], "iso-8859-1")
+					expect( v ).to eq( %["Héllo"].encode(Encoding::ISO_8859_1) )
+					expect( v.encoding ).to eq( Encoding::ISO_8859_1 )
+				end
+
 				it "will raise a TypeError for invalid arguments to quote_ident" do
 					quoted_type = PG::TextEncoder::Identifier.new
 					expect{ quoted_type.encode( [nil] ) }.to raise_error(TypeError)
@@ -220,6 +429,12 @@ describe "PG::Type derivations" do
 				expect( intenc_incrementer.encode(3) ).to eq( "4 " )
 			end
 
+			it "should encode with ruby encoder and given character encoding" do
+				r = intenc_incrementer_with_encoding.encode(3, Encoding::CP850)
+				expect( r ).to eq( "4 CP850" )
+				expect( r.encoding ).to eq( Encoding::CP850 )
+			end
+
 			it "should return when ruby encoder returns non string values" do
 				expect( intenc_incrementer_with_int_result.encode(3) ).to eq( 4 )
 			end
@@ -228,6 +443,11 @@ describe "PG::Type derivations" do
 				expect( textenc_string.encode( nil )).to be_nil
 				expect( textenc_int.encode( nil )).to be_nil
 			end
+
+			it "should be defined on a decoder but not on an encoder instance" do
+				expect( textenc_int.respond_to?(:encode) ).to be_truthy
+				expect( textdec_int.respond_to?(:encode) ).to be_falsey
+			end
 		end
 
 		it "should be possible to marshal encoders" do
@@ -244,7 +464,7 @@ describe "PG::Type derivations" do
 
 		it "should respond to to_h" do
 			expect( textenc_int.to_h ).to eq( {
-				name: 'Integer', oid: 23, format: 0
+				name: 'Integer', oid: 23, format: 0, flags: 0
 			} )
 		end
 
@@ -275,6 +495,7 @@ describe "PG::Type derivations" do
 		describe "Array types" do
 			let!(:textenc_string_array) { PG::TextEncoder::Array.new elements_type: textenc_string }
 			let!(:textdec_string_array) { PG::TextDecoder::Array.new elements_type: textdec_string }
+			let!(:textdec_string_array_raise) { PG::TextDecoder::Array.new elements_type: textdec_string, flags: PG::Coder:: FORMAT_ERROR_TO_RAISE }
 			let!(:textenc_int_array) { PG::TextEncoder::Array.new elements_type: textenc_int, needs_quotation: false }
 			let!(:textdec_int_array) { PG::TextDecoder::Array.new elements_type: textdec_int, needs_quotation: false }
 			let!(:textenc_float_array) { PG::TextEncoder::Array.new elements_type: textenc_float, needs_quotation: false }
@@ -340,6 +561,57 @@ describe "PG::Type derivations" do
 						it 'respects a different delimiter' do
 							expect( textdec_string_array_with_delimiter.decode(%[{1;2;3}]) ).to eq( ['1','2','3'] )
 						end
+
+						it 'ignores array dimensions' do
+							expect( textdec_string_array.decode(%[[2:4]={1,2,3}]) ).to eq( ['1','2','3'] )
+							expect( textdec_string_array.decode(%[[]={1,2,3}]) ).to eq( ['1','2','3'] )
+							expect( textdec_string_array.decode(%[  [-1:+2]=  {4,3,2,1}]) ).to eq( ['4','3','2','1'] )
+						end
+
+						it 'ignores spaces after array' do
+							expect( textdec_string_array.decode(%[[2:4]={1,2,3}  ]) ).to eq( ['1','2','3'] )
+							expect( textdec_string_array.decode(%[{1,2,3}   ]) ).to eq( ['1','2','3'] )
+						end
+
+						describe "with malformed syntax are deprecated" do
+							it 'accepts broken array dimensions' do
+								expect( textdec_string_array.decode(%([2:4={1,2,3})) ).to eq([['1','2','3']])
+								expect( textdec_string_array.decode(%(2:4]={1,2,3})) ).to eq([['1','2','3']])
+								expect( textdec_string_array.decode(%(={1,2,3})) ).to eq([['1','2','3']])
+								expect( textdec_string_array.decode(%([x]={1,2,3})) ).to eq([['1','2','3']])
+								expect( textdec_string_array.decode(%([]{1,2,3})) ).to eq([['1','2','3']])
+								expect( textdec_string_array.decode(%(1,2,3)) ).to eq(['','2'])
+							end
+
+							it 'accepts malformed arrays' do
+								expect( textdec_string_array.decode(%({1,2,3)) ).to eq(['1','2'])
+								expect( textdec_string_array.decode(%({1,2,3}})) ).to eq(['1','2','3'])
+								expect( textdec_string_array.decode(%({1,2,3}x)) ).to eq(['1','2','3'])
+								expect( textdec_string_array.decode(%({{1,2},{2,3})) ).to eq([['1','2'],['2','3']])
+								expect( textdec_string_array.decode(%({{1,2},{2,3}}x)) ).to eq([['1','2'],['2','3']])
+								expect( textdec_string_array.decode(%({[1,2},{2,3}}})) ).to eq(['[1','2'])
+							end
+						end
+
+						describe "with malformed syntax are raised with pg-2.0+" do
+							it 'complains about broken array dimensions' do
+								expect{ textdec_string_array_raise.decode(%([2:4={1,2,3})) }.to raise_error(TypeError)
+								expect{ textdec_string_array_raise.decode(%(2:4]={1,2,3})) }.to raise_error(TypeError)
+								expect{ textdec_string_array_raise.decode(%(={1,2,3})) }.to raise_error(TypeError)
+								expect{ textdec_string_array_raise.decode(%([x]={1,2,3})) }.to raise_error(TypeError)
+								expect{ textdec_string_array_raise.decode(%([]{1,2,3})) }.to raise_error(TypeError)
+								expect{ textdec_string_array_raise.decode(%(1,2,3)) }.to raise_error(TypeError)
+							end
+
+							it 'complains about malformed array' do
+								expect{ textdec_string_array_raise.decode(%({1,2,3)) }.to raise_error(TypeError)
+								expect{ textdec_string_array_raise.decode(%({1,2,3}})) }.to raise_error(TypeError)
+								expect{ textdec_string_array_raise.decode(%({1,2,3}x)) }.to raise_error(TypeError)
+								expect{ textdec_string_array_raise.decode(%({{1,2},{2,3})) }.to raise_error(TypeError)
+								expect{ textdec_string_array_raise.decode(%({{1,2},{2,3}}x)) }.to raise_error(TypeError)
+								expect{ textdec_string_array_raise.decode(%({[1,2},{2,3}}})) }.to raise_error(TypeError)
+							end
+						end
 					end
 
 					context 'bytea' do
@@ -424,7 +696,7 @@ describe "PG::Type derivations" do
 						expect( textenc_int_array.encode(['1',['2'],'3']) ).to eq( %[{1,{2},3}] )
 					end
 					it 'encodes an array of float8 with sub arrays' do
-						expect( textenc_float_array.encode([1000.11,[-0.00221,[3.31,-441]],[nil,6.61],-7.71]) ).to match(Regexp.new(%[^{1.0001*E+*03,{-2.2*E-*03,{3.3*E+*00,-4.4*E+*02}},{NULL,6.6*E+*00},-7.7*E+*00}$].gsub(/([\.\+\{\}\,])/, "\\\\\\1").gsub(/\*/, "\\d*")))
+						expect( textenc_float_array.encode([1000.11,[-0.00000221,[3.31,-441]],[nil,6.61],-7.71]) ).to match(Regexp.new(%[^{1000.1*,{-2.2*e-*6,{3.3*,-441.0}},{NULL,6.6*},-7.7*}$].gsub(/([\.\+\{\}\,])/, "\\\\\\1").gsub(/\*/, "\\d*")))
 					end
 				end
 				context 'two dimensional arrays' do
@@ -447,9 +719,18 @@ describe "PG::Type derivations" do
 				end
 
 				context 'array of types with encoder in ruby space' do
-					it 'encodes with quotation' do
+					it 'encodes with quotation and default character encoding' do
+						array_type = PG::TextEncoder::Array.new elements_type: intenc_incrementer, needs_quotation: true
+						r = array_type.encode([3,4])
+						expect( r ).to eq( %[{"4 ","5 "}] )
+						expect( r.encoding ).to eq( Encoding::ASCII_8BIT )
+					end
+
+					it 'encodes with quotation and given character encoding' do
 						array_type = PG::TextEncoder::Array.new elements_type: intenc_incrementer, needs_quotation: true
-						expect( array_type.encode([3,4]) ).to eq( %[{"4 ","5 "}] )
+						r = array_type.encode([3,4], Encoding::CP850)
+						expect( r ).to eq( %[{"4 ","5 "}] )
+						expect( r.encoding ).to eq( Encoding::CP850 )
 					end
 
 					it 'encodes without quotation' do
@@ -457,6 +738,20 @@ describe "PG::Type derivations" do
 						expect( array_type.encode([3,4]) ).to eq( %[{4 ,5 }] )
 					end
 
+					it 'encodes with default character encoding' do
+						array_type = PG::TextEncoder::Array.new elements_type: intenc_incrementer_with_encoding
+						r = array_type.encode([3,4])
+						expect( r ).to eq( %[{"4 ASCII-8BIT","5 ASCII-8BIT"}] )
+						expect( r.encoding ).to eq( Encoding::ASCII_8BIT )
+					end
+
+					it 'encodes with given character encoding' do
+						array_type = PG::TextEncoder::Array.new elements_type: intenc_incrementer_with_encoding
+						r = array_type.encode([3,4], Encoding::CP850)
+						expect( r ).to eq( %[{"4 CP850","5 CP850"}] )
+						expect( r.encoding ).to eq( Encoding::CP850 )
+					end
+
 					it "should raise when ruby encoder returns non string values" do
 						array_type = PG::TextEncoder::Array.new elements_type: intenc_incrementer_with_int_result, needs_quotation: false
 						expect{ array_type.encode([3,4]) }.to raise_error(TypeError)
@@ -473,6 +768,13 @@ describe "PG::Type derivations" do
 						quoted_type = PG::TextEncoder::QuotedLiteral.new elements_type: textenc_string_array
 						expect( quoted_type.encode(["'A\",","\\B'"]) ).to eq( %['{"''A\\",","\\\\B''"}'] )
 					end
+
+					it 'should quote literals with correct character encoding' do
+						quoted_type = PG::TextEncoder::QuotedLiteral.new elements_type: textenc_string_array
+						v = quoted_type.encode(["Héllo"], "iso-8859-1")
+						expect( v.encoding ).to eq( Encoding::ISO_8859_1 )
+						expect( v ).to eq( %['{Héllo}'].encode(Encoding::ISO_8859_1) )
+					end
 				end
 			end
 
@@ -482,15 +784,15 @@ describe "PG::Type derivations" do
 				expect( lt.to_h ).to eq( textenc_int_array.to_h )
 			end
 
-			it "should be possible to marshal encoders" do
-				mt = Marshal.dump(textdec_int_array)
+			it "should be possible to marshal decoders" do
+				mt = Marshal.dump(textdec_string_array_raise)
 				lt = Marshal.load(mt)
-				expect( lt.to_h ).to eq( textdec_int_array.to_h )
+				expect( lt.to_h ).to eq( textdec_string_array_raise.to_h )
 			end
 
 			it "should respond to to_h" do
 				expect( textenc_int_array.to_h ).to eq( {
-					name: nil, oid: 0, format: 0,
+					name: nil, oid: 0, format: 0, flags: 0,
 					elements_type: textenc_int, needs_quotation: false, delimiter: ','
 				} )
 			end
@@ -522,9 +824,19 @@ describe "PG::Type derivations" do
 			expect( e.encode("(\xFBm") ).to eq("KPtt")
 		end
 
+		it 'should encode Strings as base64 with correct character encoding' do
+			e = PG::TextEncoder::ToBase64.new
+			v = e.encode("Héllo".encode("utf-16le"), "iso-8859-1")
+			expect( v ).to eq("SOlsbG8=")
+			expect( v.encoding ).to eq(Encoding::ISO_8859_1)
+		end
+
 		it "should encode Strings as base64 in BinaryDecoder" do
 			e = PG::BinaryDecoder::ToBase64.new
 			expect( e.decode("x") ).to eq("eA==")
+			v = e.decode("Héllo".encode("utf-16le"))
+			expect( v ).to eq("SADpAGwAbABvAA==")
+			expect( v.encoding ).to eq(Encoding::ASCII_8BIT)
 		end
 
 		it "should encode Integers as base64" do
@@ -611,6 +923,12 @@ describe "PG::Type derivations" do
 					expect( encoder.encode([:xyz, 123, 2456, 34567, 456789, 5678901, [1,2,3], 12.1, "abcdefg", nil]) ).
 						to eq("xyz\t123\t2456\t34567\t456789\t5678901\t[1, 2, 3]\t12.1\tabcdefg\t\\N\n")
 				end
+
+				it 'should output a string with correct character encoding' do
+					v = encoder.encode(["Héllo"], "iso-8859-1")
+					expect( v.encoding ).to eq( Encoding::ISO_8859_1 )
+					expect( v ).to eq( "Héllo\n".encode(Encoding::ISO_8859_1) )
+				end
 			end
 
 			context "with TypeMapByClass" do
@@ -672,9 +990,15 @@ describe "PG::Type derivations" do
 				end
 
 				describe '#decode' do
-					it "should decode different types of Ruby objects" do
+					it "should decode COPY text format to array of strings" do
 						expect( decoder.decode("123\t \0#\t#\n#\r#\\ \t234\t#\x01#\002\n".gsub("#", "\\"))).to eq( ["123", " \0\t\n\r\\ ", "234", "\x01\x02"] )
 					end
+
+					it 'should respect input character encoding' do
+						v = decoder.decode("Héllo\n".encode("iso-8859-1")).first
+						expect( v.encoding ).to eq(Encoding::ISO_8859_1)
+						expect( v ).to eq("Héllo".encode("iso-8859-1"))
+					end
 				end
 			end
 
@@ -694,4 +1018,106 @@ describe "PG::Type derivations" do
 			end
 		end
 	end
+
+	describe PG::RecordCoder do
+		describe PG::TextEncoder::Record do
+			context "with default typemap" do
+				let!(:encoder) do
+					PG::TextEncoder::Record.new
+				end
+
+				it "should encode different types of Ruby objects" do
+					expect( encoder.encode([:xyz, 123, 2456, 34567, 456789, 5678901, [1,2,3], 12.1, "abcdefg", nil]) ).
+						to eq('("xyz","123","2456","34567","456789","5678901","[1, 2, 3]","12.1","abcdefg",)')
+				end
+
+				it 'should output a string with correct character encoding' do
+					v = encoder.encode(["Héllo"], "iso-8859-1")
+					expect( v.encoding ).to eq( Encoding::ISO_8859_1 )
+					expect( v ).to eq( '("Héllo")'.encode(Encoding::ISO_8859_1) )
+				end
+			end
+
+			context "with TypeMapByClass" do
+				let!(:tm) do
+					tm = PG::TypeMapByClass.new
+					tm[Integer] = textenc_int
+					tm[Float] = intenc_incrementer
+					tm[Array] = PG::TextEncoder::Array.new elements_type: textenc_string
+					tm
+				end
+				let!(:encoder) do
+					PG::TextEncoder::Record.new type_map: tm
+				end
+
+				it "should have reasonable default values" do
+					expect( encoder.name ).to be_nil
+				end
+
+				it "copies all attributes with #dup" do
+					encoder.name = "test"
+					encoder.type_map = PG::TypeMapByColumn.new []
+					encoder2 = encoder.dup
+					expect( encoder.object_id ).to_not eq( encoder2.object_id )
+					expect( encoder2.name ).to eq( "test" )
+					expect( encoder2.type_map ).to be_a_kind_of( PG::TypeMapByColumn )
+				end
+
+				describe '#encode' do
+					it "should encode different types of Ruby objects" do
+						expect( encoder.encode([]) ).to eq("()")
+						expect( encoder.encode(["a"]) ).to eq('("a")')
+						expect( encoder.encode([:xyz, 123, 2456, 34567, 456789, 5678901, [1,2,3], 12.1, "abcdefg", nil]) ).
+							to eq('("xyz","123","2456","34567","456789","5678901","{1,2,3}","13 ","abcdefg",)')
+					end
+
+					it "should escape special characters" do
+						expect( encoder.encode([" \"\t\n\\\r"]) ).to eq("(\" \"\"\t\n##\r\")".gsub("#", "\\"))
+					end
+				end
+			end
+		end
+
+		describe PG::TextDecoder::Record do
+			context "with default typemap" do
+				let!(:decoder) do
+					PG::TextDecoder::Record.new
+				end
+
+				describe '#decode' do
+					it "should decode composite text format to array of strings" do
+						expect( decoder.decode('("fuzzy dice",,"",42,)') ).to eq( ["fuzzy dice",nil, "", "42", nil] )
+					end
+
+					it 'should respect input character encoding' do
+						v = decoder.decode("(Héllo)".encode("iso-8859-1")).first
+						expect( v.encoding ).to eq(Encoding::ISO_8859_1)
+						expect( v ).to eq("Héllo".encode("iso-8859-1"))
+					end
+
+					it 'should raise an error on malformed input' do
+						expect{ decoder.decode('') }.to raise_error(ArgumentError, /"" - Missing left parenthesis/)
+						expect{ decoder.decode('(') }.to raise_error(ArgumentError, /"\(" - Unexpected end of input/)
+						expect{ decoder.decode('(\\') }.to raise_error(ArgumentError, /"\(\\" - Unexpected end of input/)
+						expect{ decoder.decode('()x') }.to raise_error(ArgumentError, /"\(\)x" - Junk after right parenthesis/)
+					end
+				end
+			end
+
+			context "with TypeMapByColumn" do
+				let!(:tm) do
+					PG::TypeMapByColumn.new [textdec_int, textdec_string, intdec_incrementer, nil]
+				end
+				let!(:decoder) do
+					PG::TextDecoder::Record.new type_map: tm
+				end
+
+				describe '#decode' do
+					it "should decode different types of Ruby objects" do
+						expect( decoder.decode("(123,\" #,#\n#\r#\\ \",234,#\x01#\002)".gsub("#", "\\"))).to eq( [123, " ,\n\r\\ ", 235, "\x01\x02"] )
+					end
+				end
+			end
+		end
+	end
 end