pg 0.18.0.pre20141017160319 → 0.18.0.pre20141117110243

data/spec/pg/type_map_by_column_spec.rb

@@ -46,6 +46,28 @@ describe PG::TypeMapByColumn do
 		expect( cm.oids ).to eq( [23, 25, 700, 123456, nil] )
 	end
 
+	it "should gracefully handle not initialized state" do
+		# PG::TypeMapByColumn is not initialized in allocate function, like other
+		# type maps, but in #initialize. So it might be not called by derived classes.
+
+		not_init = Class.new(PG::TypeMapByColumn) do
+			def initialize
+				# no super call
+			end
+		end.new
+
+		expect{ @conn.exec_params( "SELECT $1", [ 0 ], 0, not_init ) }.to raise_error(NotImplementedError)
+
+		res = @conn.exec( "SELECT 1" )
+		expect{ res.type_map = not_init }.to raise_error(NotImplementedError)
+
+		@conn.copy_data("COPY (SELECT 1) TO STDOUT") do
+			decoder = PG::TextDecoder::CopyRow.new(type_map: not_init)
+			expect{ @conn.get_copy_data(false, decoder) }.to raise_error(NotImplementedError)
+			@conn.get_copy_data
+		end
+	end
+
 
 	#
 	# Encoding Examples
@@ -95,6 +117,25 @@ describe PG::TypeMapByColumn do
 		}.to raise_error(ArgumentError, /mapped columns/)
 	end
 
+	it "should verify the default type map for query params as well" do
+		tm1 = PG::TypeMapByColumn.new([])
+		expect{
+			@conn.exec_params( "SELECT $1", [ 123 ], 0, PG::TypeMapByColumn.new([nil]).with_default_type_map(tm1) )
+		}.to raise_error(ArgumentError, /mapped columns/)
+	end
+
+	it "forwards query param conversions to the #default_type_map" do
+		tm1 = PG::TypeMapByClass.new
+		tm1[Integer] = PG::TextEncoder::Integer.new name: 'INT2', oid: 21
+
+		tm2 = PG::TypeMapByColumn.new( [textenc_int, nil, nil] ).with_default_type_map( tm1 )
+		res = @conn.exec_params( "SELECT $1, $2, $3::TEXT", [1, 2, :abc], 0, tm2 )
+
+		expect( res.ftype(0) ).to eq( 23 ) # tm2
+		expect( res.ftype(1) ).to eq( 21 ) # tm1
+		expect( res.getvalue(0,2) ).to eq( "abc" ) # TypeMapAllStrings
+	end
+
 	#
 	# Decoding Examples
 	#
@@ -122,6 +163,52 @@ describe PG::TypeMapByColumn do
 		expect{ res.type_map = PG::TypeMapByColumn.new([]) }.to raise_error(ArgumentError, /mapped columns/)
 	end
 
+	it "should verify the default type map for result values as well" do
+		res = @conn.exec( "SELECT 1" )
+		tm1 = PG::TypeMapByColumn.new([])
+		expect{
+			res.type_map = PG::TypeMapByColumn.new([nil]).with_default_type_map(tm1)
+		}.to raise_error(ArgumentError, /mapped columns/)
+	end
+
+	it "forwards result value conversions to a TypeMapByOid as #default_type_map" do
+		# One run with implicit built TypeMapByColumn and another with online lookup
+		[0, 10].each do |max_rows|
+			tm1 = PG::TypeMapByOid.new
+			tm1.add_coder PG::TextDecoder::Integer.new name: 'INT2', oid: 21
+			tm1.max_rows_for_online_lookup = max_rows
+
+			tm2 = PG::TypeMapByColumn.new( [textdec_int, nil, nil] ).with_default_type_map( tm1 )
+			res = @conn.exec( "SELECT '1'::INT4, '2'::INT2, '3'::INT8" ).map_types!( tm2 )
+
+			expect( res.getvalue(0,0) ).to eq( 1 ) # tm2
+			expect( res.getvalue(0,1) ).to eq( 2 ) # tm1
+			expect( res.getvalue(0,2) ).to eq( "3" ) # TypeMapAllStrings
+		end
+	end
+
+	it "forwards get_copy_data conversions to another TypeMapByColumn as #default_type_map" do
+		tm1 = PG::TypeMapByColumn.new( [textdec_int, nil, nil] )
+		tm2 = PG::TypeMapByColumn.new( [nil, textdec_int, nil] ).with_default_type_map( tm1 )
+		decoder = PG::TextDecoder::CopyRow.new(type_map: tm2)
+		@conn.copy_data("COPY (SELECT 1, 2, 3) TO STDOUT", decoder) do
+			expect( @conn.get_copy_data ).to eq( [1, 2, '3'] )
+			@conn.get_copy_data
+		end
+	end
+
+	it "will deny copy queries with different column count" do
+		[[2, 2], [2, 3], [3, 2]].each do |cols1, cols2|
+			tm1 = PG::TypeMapByColumn.new( [textdec_int, nil, nil][0, cols1] )
+			tm2 = PG::TypeMapByColumn.new( [nil, textdec_int, nil][0, cols2] ).with_default_type_map( tm1 )
+			decoder = PG::TextDecoder::CopyRow.new(type_map: tm2)
+			@conn.copy_data("COPY (SELECT 1, 2, 3) TO STDOUT", decoder) do
+				expect{ @conn.get_copy_data }.to raise_error(ArgumentError, /number of copy fields/)
+				@conn.get_copy_data
+			end
+		end
+	end
+
 	#
 	# Decoding Examples text format
 	#

data/spec/pg/type_map_by_mri_type_spec.rb

@@ -87,6 +87,20 @@ describe PG::TypeMapByMriType do
 		expect{ tm[123] = textenc_float }.to raise_error(TypeError)
 	end
 
+	it "forwards query param conversions to the #default_type_map" do
+		tm1 = PG::TypeMapByColumn.new( [textenc_int, nil, nil] )
+
+		tm2 = PG::TypeMapByMriType.new
+		tm2['T_FIXNUM'] = PG::TextEncoder::Integer.new name: 'INT2', oid: 21
+		tm2.default_type_map = tm1
+
+		res = @conn.exec_params( "SELECT $1, $2, $3::TEXT", ['1', 2, 3], 0, tm2 )
+
+		expect( res.ftype(0) ).to eq( 23 ) # tm1
+		expect( res.ftype(1) ).to eq( 21 ) # tm2
+		expect( res.getvalue(0,2) ).to eq( "3" ) # TypeMapAllStrings
+	end
+
 	#
 	# Decoding Examples
 	#

data/spec/pg/type_map_by_oid_spec.rb

@@ -85,6 +85,27 @@ describe PG::TypeMapByOid do
 		expect( tm2.coders ).to eq( [textdec_int, nil, textdec_float, pass_through_type] )
 	end
 
+	it "forwards result value conversions to another TypeMapByOid as #default_type_map" do
+		# One run with implicit built TypeMapByColumn and another with online lookup
+		# for each type map.
+		[[0, 0], [0, 10], [10, 0], [10, 10]].each do |max_rows1, max_rows2|
+			tm1 = PG::TypeMapByOid.new
+			tm1.add_coder PG::TextDecoder::Integer.new name: 'INT2', oid: 21
+			tm1.max_rows_for_online_lookup = max_rows1
+
+			tm2 = PG::TypeMapByOid.new
+			tm2.add_coder PG::TextDecoder::Integer.new name: 'INT4', oid: 23
+			tm2.max_rows_for_online_lookup = max_rows2
+			tm2.default_type_map = tm1
+
+			res = @conn.exec( "SELECT '1'::INT4, '2'::INT2, '3'::INT8" ).map_types!( tm2 )
+
+			expect( res.getvalue(0,0) ).to eq( 1 ) # tm2
+			expect( res.getvalue(0,1) ).to eq( 2 ) # tm1
+			expect( res.getvalue(0,2) ).to eq( "3" ) # TypeMapAllStrings
+		end
+	end
+
 	#
 	# Decoding Examples text format
 	#

data/spec/pg/type_spec.rb

@@ -15,6 +15,7 @@ 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_bytea) { PG::TextEncoder::Bytea.new }
 	let!(:textdec_bytea) { PG::TextDecoder::Bytea.new }
 	let!(:binaryenc_int2) { PG::BinaryEncoder::Int2.new }
 	let!(:binaryenc_int4) { PG::BinaryEncoder::Int4.new }
@@ -92,8 +93,8 @@ describe "PG::Type derivations" do
 			end
 
 			it "should pass through nil values" do
-				expect( textdec_string.encode( nil )).to be_nil
-				expect( textdec_int.encode( nil )).to be_nil
+				expect( textdec_string.decode( nil )).to be_nil
+				expect( textdec_int.decode( nil )).to be_nil
 			end
 		end
 
@@ -155,6 +156,10 @@ describe "PG::Type derivations" do
 				expect( textenc_float.encode(-Float::NAN) ).to eq( Float::NAN.to_s )
 			end
 
+			it "encodes binary string to bytea" do
+				expect( textenc_bytea.encode("\x00\x01\x02\x03\xef".b) ).to eq( "\\x00010203ef" )
+			end
+
 			it "should encode with ruby encoder" do
 				expect( intenc_incrementer.encode(3) ).to eq( "4 " )
 			end
@@ -192,6 +197,21 @@ describe "PG::Type derivations" do
 			expect( t.format ).to eq( 0 )
 			expect( t.oid ).to eq( 0 )
 			expect( t.name ).to be_nil
+
+			t = PG::BinaryEncoder::Int4.new
+			expect( t.format ).to eq( 1 )
+			expect( t.oid ).to eq( 0 )
+			expect( t.name ).to be_nil
+
+			t = PG::TextDecoder::String.new
+			expect( t.format ).to eq( 0 )
+			expect( t.oid ).to eq( 0 )
+			expect( t.name ).to be_nil
+
+			t = PG::BinaryDecoder::String.new
+			expect( t.format ).to eq( 1 )
+			expect( t.oid ).to eq( 0 )
+			expect( t.name ).to be_nil
 		end
 	end
 
@@ -565,12 +585,12 @@ describe "PG::Type derivations" do
 				end
 			end
 
-			context "with TypeMapByMriType" do
+			context "with TypeMapByClass" do
 				let!(:tm) do
-					tm = PG::TypeMapByMriType.new
-					tm['T_FIXNUM'] = textenc_int
-					tm['T_FLOAT'] = intenc_incrementer
-					tm['T_ARRAY'] = PG::TextEncoder::Array.new elements_type: textenc_string
+					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

data/spec/pg_spec.rb

@@ -12,6 +12,20 @@ describe PG do
 		expect( PG.library_version ).to be >= 90100
 	end
 
+	it "can select which of both security libraries to initialize" do
+		# This setting does nothing here, because there is already a connection
+		# to the server, at this point in time.
+		PG.init_openssl(false, true)
+		PG.init_openssl(1, 0)
+	end
+
+	it "can select whether security libraries to initialize" do
+		# This setting does nothing here, because there is already a connection
+		# to the server, at this point in time.
+		PG.init_ssl(false)
+		PG.init_ssl(1)
+	end
+
 
 	it "knows whether or not the library is threadsafe" do
 		expect( PG ).to be_threadsafe()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 0.18.0.pre20141017160319
+  version: 0.18.0.pre20141117110243
 platform: ruby
 authors:
 - Michael Granger
@@ -11,27 +11,26 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
-  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTQwMzE5MDQzNTI2WhcNMTUwMzE5MDQzNTI2WjA+MQwwCgYDVQQDDANnZWQx
-  GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
-  +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
-  cDthr3zdao4HnyrzAIQf7BO5Y8KBwVD+yyXCD/N65TTwqsQnO3ie7U5/9ut1rnNr
-  OkOzAscMwkfQxBkXDzjvAWa6UF4c5c9kR/T79iA21kDx9+bUMentU59aCJtUcbxa
-  7kcKJhPEYsk4OdxR9q2dphNMFDQsIdRO8rywX5FRHvcb+qnXC17RvxLHtOjysPtp
-  EWsYoZMxyCDJpUqbwoeiM+tAHoz2ABMv3Ahie3Qeb6+MZNAtMmaWfBx3dg2u+/WN
-  AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
-  qoHr122fGKelqffzEQBhszAcBgNVHREEFTATgRFnZWRARmFlcmllTVVELm9yZzAc
-  BgNVHRIEFTATgRFnZWRARmFlcmllTVVELm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-  TuL1Bzl6TBs1YEzEubFHb9XAPgehWzzUudjDKzTRd+uyZmxnomBqTCQjT5ucNRph
-  3jZ6bhLNooLQxTjIuHodeGcEMHZdt4Yi7SyPmw5Nry12z6wrDp+5aGps3HsE5WsQ
-  Zq2EuyEOc96g31uoIvjNdieKs+1kE+K+dJDjtw+wTH2i63P7r6N/NfPPXpxsFquo
-  wcYRRrHdR7GhdJeT+V8Q8Bi5bglCUGdx+8scMgkkePc98k9osQHypbACmzO+Bqkv
-  c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
-  ggcrPfcYeTwWlfZPu2LrBg==
+  MIIDLjCCAhagAwIBAgIBAjANBgkqhkiG9w0BAQUFADA9MQ4wDAYDVQQDDAVrYW5p
+  czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
+  Fw0xNDAyMjYwOTMzMDBaFw0xNTAyMjYwOTMzMDBaMD0xDjAMBgNVBAMMBWthbmlz
+  MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
+  HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
+  9xi+EdVOkTV2/AVFKThcbTAQGiF/bT1n2M+B1GTybRzMg6hyhOJeGPqIhLfJEpxn
+  lJi4+ENAVT4MpqHEAGB8yFoPC0GqiOHQsdHxQV3P3c2OZqG+yJey74QtwA2tLcLn
+  Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
+  L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
+  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
+  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQEFBQADggEBAFmIAhRT0awqLQN9e4Uv
+  ZEk+jUWv4zkb+TWiKFJXlwjPyjGbZY9gVfOwAwMibYOK/t/+57ZzW3d0L12OUwvo
+  on84NVvYtIr1/iskJFWFkMoIquAFCdi9p68stSPMQK2XcrJJuRot29fJtropsZBa
+  2cpaNd/sRYdK4oep2usdKifA1lI0hIkPb3r5nLfwG2lAqBH7WZsUICHcTgR0VEbG
+  z9Ug5qQp9Uz73xC9YdGvGiuOX53LYobHAR4MWi2xxDlHI+ER8mRz0eY2FUuNu/Wj
+  GrqF74zpLl7/KFdHC8VmzwZS18hvDjxeLVuVI2gIGnBInqnlqv05g/l4/1pISh5j
+  dS4=
   -----END CERTIFICATE-----
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
@@ -195,11 +194,13 @@ extra_rdoc_files:
 - ext/pg_text_encoder.c
 - ext/pg_type_map.c
 - ext/pg_type_map_all_strings.c
+- ext/pg_type_map_by_class.c
 - ext/pg_type_map_by_column.c
 - ext/pg_type_map_by_mri_type.c
 - ext/pg_type_map_by_oid.c
 - ext/util.c
 files:
+- ".gemtest"
 - BSDL
 - ChangeLog
 - Contributors.rdoc
@@ -232,6 +233,7 @@ files:
 - ext/pg_text_encoder.c
 - ext/pg_type_map.c
 - ext/pg_type_map_all_strings.c
+- ext/pg_type_map_by_class.c
 - ext/pg_type_map_by_column.c
 - ext/pg_type_map_by_mri_type.c
 - ext/pg_type_map_by_oid.c
@@ -274,6 +276,7 @@ files:
 - spec/pg/basic_type_mapping_spec.rb
 - spec/pg/connection_spec.rb
 - spec/pg/result_spec.rb
+- spec/pg/type_map_by_class_spec.rb
 - spec/pg/type_map_by_column_spec.rb
 - spec/pg/type_map_by_mri_type_spec.rb
 - spec/pg/type_map_by_oid_spec.rb