pg 0.18.4-x86-mingw32 → 0.19.0.pre20160817083826-x86-mingw32

data/spec/pg/type_map_by_class_spec.rb

@@ -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
 

data/spec/pg/type_map_by_mri_type_spec.rb

@@ -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_spec.rb

@@ -39,6 +39,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)
@@ -127,6 +135,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
@@ -209,6 +224,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 +242,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
@@ -447,9 +475,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 +494,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 +524,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
 
@@ -522,9 +580,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 +679,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
@@ -675,6 +749,12 @@ describe "PG::Type derivations" do
 					it "should decode different types of Ruby objects" 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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 0.18.4
+  version: 0.19.0.pre20160817083826
 platform: x86-mingw32
 authors:
 - Michael Granger
@@ -11,27 +11,26 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
-  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTUwNDAxMjEyNDEzWhcNMTYwMzMxMjEyNDEzWjA+MQwwCgYDVQQDDANnZWQx
-  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
-  +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
-  cDthr3zdao4HnyrzAIQf7BO5Y8KBwVD+yyXCD/N65TTwqsQnO3ie7U5/9ut1rnNr
-  OkOzAscMwkfQxBkXDzjvAWa6UF4c5c9kR/T79iA21kDx9+bUMentU59aCJtUcbxa
-  7kcKJhPEYsk4OdxR9q2dphNMFDQsIdRO8rywX5FRHvcb+qnXC17RvxLHtOjysPtp
-  EWsYoZMxyCDJpUqbwoeiM+tAHoz2ABMv3Ahie3Qeb6+MZNAtMmaWfBx3dg2u+/WN
-  AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
-  qoHr122fGKelqffzEQBhszAcBgNVHREEFTATgRFnZWRARmFlcmllTVVELm9yZzAc
-  BgNVHRIEFTATgRFnZWRARmFlcmllTVVELm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-  lUKo3NXePpuvN3QGsOLJ6QhNd4+Q9Rz75GipuMrCl296V8QFkd2gg9EG44Pqtk+9
-  Zac8TkKc9bCSR0snakp+cCPplVvZF0/gMzkSTUJkDBHlNV16z73CyWpbQQa+iLJ4
-  uisI6gF2ZXK919MYLn2bFJfb7OsCvVfyTPqq8afPY+rq9vlf9ZPwU49AlD8bPRic
-  0LX0gO5ykvETIOv+WgGcqp96ceNi9XVuJMh20uWuw6pmv/Ub2RqAf82jQSbpz09G
-  G8LHR7EjtPPmqCCunfyecJ6MmCNaiJCBxq2NYzyNmluPyHT8+0fuB5kccUVZm6CD
-  xn3DzOkDE6NYbk8gC9rTsA==
+  MIIDPDCCAiSgAwIBAgIBAzANBgkqhkiG9w0BAQUFADBEMQ0wCwYDVQQDDARsYXJz
+  MR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZImiZPyLGQB
+  GRYCZGUwHhcNMTYwNjI1MTUyOTE0WhcNMTcwNjI1MTUyOTE0WjBEMQ0wCwYDVQQD
+  DARsYXJzMR8wHQYKCZImiZPyLGQBGRYPZ3JlaXotcmVpbnNkb3JmMRIwEAYKCZIm
+  iZPyLGQBGRYCZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZb4Uv
+  RFJfRu/VEWiy3psh2jinETjiuBrL0NeRFGf8H7iU9+gx/DI/FFhfHGLrDeIskrJx
+  YIWDMmEjVO10UUdj7wu4ZhmU++0Cd7Kq9/TyP/shIP3IjqHjVLCnJ3P6f1cl5rxZ
+  gqo+d3BAoDrmPk0rtaf6QopwUw9RBiF8V4HqvpiY+ruJotP5UQDP4/lVOKvA8PI9
+  P0GmVbFBrbc7Zt5h78N3UyOK0u+nvOC23BvyHXzCtcFsXCoEkt+Wwh0RFqVZdnjM
+  LMO2vULHKKHDdX54K/sbVCj9pN9h1aotNzrEyo55zxn0G9PHg/G3P8nMvAXPkUTe
+  brhXrfCwWRvOXA4TAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0G
+  A1UdDgQWBBRAHK81igrXodaDj8a8/BIKsaZrETANBgkqhkiG9w0BAQUFAAOCAQEA
+  q2VlqIpcq21tixYN4SvBjHbFlZ3Ji8ibEqAF5LnECFgTKHZHLC32Uz3rxrHQpuQm
+  ZlzQY8fDCsGc0lh6YrHbUGg7BoDyTJnRMGBnXGHHsXSIYpmC7x+qAxp8xf1AvvEl
+  kmcb7LJN+2QzrpgJmDpNIPJMejM5NOvg1e+qvpNWpOf1u/S0HMpw4u4I99wbiZSo
+  ZQVoPQLB5AFRh5V3qOk6/qF1TxIAQl+OEqUGT7UWv2XYYaZS2FLbK8MqRyWzAYSc
+  PizTJCem24R2bzZN5VGvA5tpqgwytgcFq1PZofgFxK2uKPCS+tmsA8wIjjGzFsnR
+  WfgqWGyHn5K4wejsMic/uA==
   -----END CERTIFICATE-----
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
@@ -53,14 +52,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -109,14 +108,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +161,7 @@ dependencies:
 description: |-
   Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].
 
-  It works with {PostgreSQL 8.4 and later}[http://www.postgresql.org/support/versioning/].
+  It works with {PostgreSQL 9.1 and later}[http://www.postgresql.org/support/versioning/].
 
   A small example usage:
 
@@ -174,7 +173,7 @@ description: |-
     conn = PG.connect( dbname: 'sales' )
     conn.exec( "SELECT * FROM pg_stat_activity" ) do |result|
       puts "     PID | User             | Query"
-    result.each do |row|
+      result.each do |row|
         puts " %7d | %-16s | %s " %
           row.values_at('procpid', 'usename', 'current_query')
       end
@@ -262,7 +261,8 @@ files:
 - lib/2.0/pg_ext.so
 - lib/2.1/pg_ext.so
 - lib/2.2/pg_ext.so
-- lib/i386-mingw32/libpq.dll
+- lib/2.3/pg_ext.so
+- lib/libpq.dll
 - lib/pg.rb
 - lib/pg/basic_type_mapping.rb
 - lib/pg/coder.rb
@@ -307,9 +307,7 @@ files:
 - spec/pg_spec.rb
 homepage: https://bitbucket.org/ged/ruby-pg
 licenses:
-- BSD
-- Ruby
-- GPL
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -321,15 +319,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/]