pg 0.18.0 → 1.1.4

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
@@ -15,6 +16,11 @@ describe "PG::Type derivations" do
 	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 }
 	let!(:textdec_bytea) { PG::TextDecoder::Bytea.new }
 	let!(:binaryenc_int2) { PG::BinaryEncoder::Int2.new }
@@ -37,6 +43,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)
@@ -65,7 +79,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 )
@@ -85,6 +99,150 @@ describe "PG::Type derivations" do
 				expect( textdec_bytea.decode("\\377\\000") ).to eq( "\xff\0".b )
 			end
 
+			context 'timestamps' do
+				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('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-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
+				it 'decodes timestamps with hour:minute:sec timezone' do
+					# SET TIME ZONE 'Europe/Dublin'; -- Was UTC−00:25:21 until 1916
+					# SELECT '1900-01-01'::timestamptz;
+					# -- "1900-01-01 00:00:00-00:25:21"
+					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
+				it 'should build an array out of an quoted identifier string' do
+					quoted_type = PG::TextDecoder::Identifier.new
+					expect( quoted_type.decode(%["A.".".B"]) ).to eq( ["A.", ".B"] )
+					expect( quoted_type.decode(%["'A"".""B'"]) ).to eq( ['\'A"."B\''] )
+				end
+
+				it 'should split unquoted identifier string' do
+					quoted_type = PG::TextDecoder::Identifier.new
+					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
 				expect{ textdec_int.decode() }.to raise_error(ArgumentError)
 				expect{ textdec_int.decode("123", 2, 3, 4) }.to raise_error(ArgumentError)
@@ -156,10 +314,60 @@ describe "PG::Type derivations" 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
+					expect( quoted_type.encode(['schema','table','col']) ).to eq( %["schema"."table"."col"] )
+					expect( quoted_type.encode(['A.','.B']) ).to eq( %["A.".".B"] )
+					expect( quoted_type.encode(%['A"."B']) ).to eq( %["'A"".""B'"] )
+					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)
+					expect{ quoted_type.encode( [['a']] ) }.to raise_error(TypeError)
+				end
+			end
+
 			it "should encode with ruby encoder" 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
@@ -215,6 +423,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 }
@@ -280,6 +489,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
@@ -347,20 +607,6 @@ describe "PG::Type derivations" do
 					array_type = PG::TextDecoder::Array.new elements_type: nil
 					expect( array_type.decode(%[{3,4}]) ).to eq( ['3','4'] )
 				end
-
-				context 'identifier quotation' do
-					it 'should build an array out of an quoted identifier string' do
-						quoted_type = PG::TextDecoder::Identifier.new elements_type: textdec_string
-						expect( quoted_type.decode(%["A.".".B"]) ).to eq( ["A.", ".B"] )
-						expect( quoted_type.decode(%["'A"".""B'"]) ).to eq( ['\'A"."B\''] )
-					end
-
-					it 'should split unquoted identifier string' do
-						quoted_type = PG::TextDecoder::Identifier.new elements_type: textdec_string
-						expect( quoted_type.decode(%[a.b]) ).to eq( ['a','b'] )
-						expect( quoted_type.decode(%[a]) ).to eq( ['a'] )
-					end
-				end
 			end
 
 			describe '#encode' do
@@ -401,9 +647,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
@@ -411,6 +666,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)
@@ -422,27 +691,18 @@ describe "PG::Type derivations" do
 					expect( textenc_float_array.encode(1234) ).to eq( "1234" )
 				end
 
-				context 'identifier quotation' do
-					it 'should quote and escape identifier' do
-						quoted_type = PG::TextEncoder::Identifier.new elements_type: textenc_string
-						expect( quoted_type.encode(['schema','table','col']) ).to eq( %["schema"."table"."col"] )
-						expect( quoted_type.encode(['A.','.B']) ).to eq( %["A.".".B"] )
-						expect( quoted_type.encode(%['A"."B']) ).to eq( %["'A"".""B'"] )
-					end
-
-					it 'shouldn\'t quote or escape identifier if requested to not do' do
-						quoted_type = PG::TextEncoder::Identifier.new elements_type: textenc_string,
-								needs_quotation: false
-						expect( quoted_type.encode(['a','b']) ).to eq( %[a.b] )
-						expect( quoted_type.encode(%[a.b]) ).to eq( %[a.b] )
-					end
-				end
-
 				context 'literal quotation' do
 					it 'should quote and escape literals' 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
 
@@ -489,11 +749,22 @@ describe "PG::Type derivations" do
 			expect( e.encode("xxxx") ).to eq("eHh4eA==")
 			expect( e.encode("xxxxx") ).to eq("eHh4eHg=")
 			expect( e.encode("\0\n\t") ).to eq("AAoJ")
+			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
@@ -517,6 +788,7 @@ describe "PG::Type derivations" do
 			expect( e.decode("eHh4eA==") ).to eq("xxxx")
 			expect( e.decode("eHh4eHg=") ).to eq("xxxxx")
 			expect( e.decode("AAoJ") ).to eq("\0\n\t")
+			expect( e.decode("KPtt") ).to eq("(\xFBm")
 		end
 
 		it "should decode base64 in BinaryEncoder" do
@@ -579,6 +851,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
@@ -640,9 +918,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
 

data/spec/pg_spec.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env rspec
+# -*- rspec -*-
 # encoding: utf-8
 
 require_relative 'helpers'
@@ -7,7 +7,7 @@ require 'pg'
 
 describe PG do
 
-	it "knows what version of the libpq library is loaded", :postgresql_91 do
+	it "knows what version of the libpq library is loaded" do
 		expect( PG.library_version ).to be_an( Integer )
 		expect( PG.library_version ).to be >= 90100
 	end