pg 1.0.0 → 1.2.3

data/spec/pg/basic_type_mapping_spec.rb

@@ -1,9 +1,25 @@
-#!/usr/bin/env rspec
+# -*- rspec -*-
 # encoding: utf-8
 
 require_relative '../helpers'
 
 require 'pg'
+require 'time'
+
+def restore_type(types)
+	[0, 1].each do |format|
+		[types].flatten.each do |type|
+			PG::BasicTypeRegistry.alias_type(format, "restore_#{type}", type)
+		end
+	end
+	yield
+ensure
+	[0, 1].each do |format|
+		[types].flatten.each do |type|
+			PG::BasicTypeRegistry.alias_type(format, type, "restore_#{type}")
+		end
+	end
+end
 
 describe 'Basic type mapping' do
 
@@ -16,8 +32,8 @@ describe 'Basic type mapping' do
 		# Encoding Examples
 		#
 
-		it "should do basic param encoding", :ruby_19 do
-			res = @conn.exec_params( "SELECT $1::int8,$2::float,$3,$4::TEXT",
+		it "should do basic param encoding" do
+			res = @conn.exec_params( "SELECT $1::int8, $2::float, $3, $4::TEXT",
 				[1, 2.1, true, "b"], nil, basic_type_mapping )
 
 			expect( res.values ).to eq( [
@@ -27,21 +43,168 @@ describe 'Basic type mapping' do
 			expect( result_typenames(res) ).to eq( ['bigint', 'double precision', 'boolean', 'text'] )
 		end
 
-		it "should do array param encoding" do
-			res = @conn.exec_params( "SELECT $1,$2,$3,$4", [
-					[1, 2, 3], [[1, 2], [3, nil]],
-					[1.11, 2.21],
-					['/,"'.gsub("/", "\\"), nil, 'abcäöü'],
+		it "should do basic Time encoding" do
+			res = @conn.exec_params( "SELECT $1 AT TIME ZONE '-02'",
+				[Time.new(2019, 12, 8, 20, 38, 12.123, "-01:00")], nil, basic_type_mapping )
+
+			expect( res.values ).to eq( [[ "2019-12-08 23:38:12.123" ]] )
+		end
+
+		it "should do basic param encoding of various float values" do
+			res = @conn.exec_params( "SELECT $1::float, $2::float, $3::float, $4::float, $5::float, $6::float, $7::float, $8::float, $9::float, $10::float, $11::float, $12::float",
+				[0, 7, 9, 0.1, 0.9, -0.11, 10.11,
+			   9876543210987654321e-400,
+			   9876543210987654321e400,
+			   -1.234567890123456789e-280,
+			   -1.234567890123456789e280,
+			   9876543210987654321e280
+			  ], nil, basic_type_mapping )
+
+			expect( res.values[0][0, 9] ).to eq(
+					[ "0", "7", "9", "0.1", "0.9", "-0.11", "10.11", "0", "Infinity" ]
+			)
+
+			expect( res.values[0][9]  ).to match( /^-1\.2345678901234\d*e\-280$/ )
+			expect( res.values[0][10] ).to match( /^-1\.2345678901234\d*e\+280$/ )
+			expect( res.values[0][11] ).to match(  /^9\.8765432109876\d*e\+298$/ )
+
+			expect( result_typenames(res) ).to eq( ['double precision'] * 12 )
+		end
+
+		it "should do default array-as-array param encoding" do
+			expect( basic_type_mapping.encode_array_as).to eq(:array)
+			res = @conn.exec_params( "SELECT $1,$2,$3,$4,$5,$6", [
+					[1, 2, 3], # Integer -> bigint[]
+					[[1, 2], [3, nil]], # Integer two dimensions -> bigint[]
+					[1.11, 2.21], # Float -> double precision[]
+					['/,"'.gsub("/", "\\"), nil, 'abcäöü'], # String -> text[]
+					[BigDecimal("123.45")], # BigDecimal -> numeric[]
+					[IPAddr.new('1234::5678')], # IPAddr -> inet[]
 				], nil, basic_type_mapping )
 
 			expect( res.values ).to eq( [[
-					'{1,2,3}', '{{1,2},{3,NULL}}',
+					'{1,2,3}',
+					'{{1,2},{3,NULL}}',
 					'{1.11,2.21}',
 					'{"//,/"",NULL,abcäöü}'.gsub("/", "\\"),
+					'{123.45}',
+					'{1234::5678}',
+			]] )
+
+			expect( result_typenames(res) ).to eq( ['bigint[]', 'bigint[]', 'double precision[]', 'text[]', 'numeric[]', 'inet[]'] )
+		end
+
+		it "should do default array-as-array param encoding with Time objects" do
+			res = @conn.exec_params( "SELECT $1", [
+					[Time.new(2019, 12, 8, 20, 38, 12.123, "-01:00")], # Time -> timestamptz[]
+				], nil, basic_type_mapping )
+
+			expect( res.values[0][0] ).to match( /\{\"2019-12-08 \d\d:38:12.123[+-]\d\d\"\}/ )
+			expect( result_typenames(res) ).to eq( ['timestamp with time zone[]'] )
+		end
+
+		it "should do array-as-json encoding" do
+			basic_type_mapping.encode_array_as = :json
+			expect( basic_type_mapping.encode_array_as).to eq(:json)
+
+			res = @conn.exec_params( "SELECT $1::JSON, $2::JSON", [
+					[1, {a: 5}, true, ["a", 2], [3.4, nil]],
+					['/,"'.gsub("/", "\\"), nil, 'abcäöü'],
+				], nil, basic_type_mapping )
+
+			expect( res.values ).to eq( [[
+					'[1,{"a":5},true,["a",2],[3.4,null]]',
+					'["//,/"",null,"abcäöü"]'.gsub("/", "\\"),
+			]] )
+
+			expect( result_typenames(res) ).to eq( ['json', 'json'] )
+		end
+
+		it "should do hash-as-json encoding" do
+			res = @conn.exec_params( "SELECT $1::JSON, $2::JSON", [
+					{a: 5, b: ["a", 2], c: nil},
+					{qu: '/,"'.gsub("/", "\\"), ni: nil, uml: 'abcäöü'},
+				], nil, basic_type_mapping )
+
+			expect( res.values ).to eq( [[
+					'{"a":5,"b":["a",2],"c":null}',
+					'{"qu":"//,/"","ni":null,"uml":"abcäöü"}'.gsub("/", "\\"),
+			]] )
+
+			expect( result_typenames(res) ).to eq( ['json', 'json'] )
+		end
+
+		describe "Record encoding" do
+			before :all do
+				@conn.exec("CREATE TYPE test_record1 AS (i int, d float, t text)")
+				@conn.exec("CREATE TYPE test_record2 AS (i int, r test_record1)")
+			end
+
+			after :all do
+				@conn.exec("DROP TYPE IF EXISTS test_record2 CASCADE")
+				@conn.exec("DROP TYPE IF EXISTS test_record1 CASCADE")
+			end
+
+			it "should do array-as-record encoding" do
+				basic_type_mapping.encode_array_as = :record
+				expect( basic_type_mapping.encode_array_as).to eq(:record)
+
+				res = @conn.exec_params( "SELECT $1::test_record1, $2::test_record2, $3::text", [
+						[5, 3.4, "txt"],
+				    [1, [2, 4.5, "bcd"]],
+				    [4, 5, 6],
+					], nil, basic_type_mapping )
+
+				expect( res.values ).to eq( [[
+						'(5,3.4,txt)',
+				    '(1,"(2,4.5,bcd)")',
+						'("4","5","6")',
+				]] )
+
+				expect( result_typenames(res) ).to eq( ['test_record1', 'test_record2', 'text'] )
+			end
+		end
+
+		it "should do bigdecimal param encoding" do
+			large = ('123456790'*10) << '.' << ('012345679')
+			res = @conn.exec_params( "SELECT $1::numeric,$2::numeric",
+				[BigDecimal('1'), BigDecimal(large)], nil, basic_type_mapping )
+
+			expect( res.values ).to eq( [
+					[ "1.0", large ],
+			] )
+
+			expect( result_typenames(res) ).to eq( ['numeric', 'numeric'] )
+		end
+
+		it "should do IPAddr param encoding" do
+			res = @conn.exec_params( "SELECT $1::inet,$2::inet,$3::cidr,$4::cidr",
+				['1.2.3.4', IPAddr.new('1234::5678'), '1.2.3.4', IPAddr.new('1234:5678::/32')], nil, basic_type_mapping )
+
+			expect( res.values ).to eq( [
+					[ '1.2.3.4', '1234::5678', '1.2.3.4/32', '1234:5678::/32'],
+			] )
+
+			expect( result_typenames(res) ).to eq( ['inet', 'inet', 'cidr', 'cidr'] )
+		end
+
+		it "should do array of string encoding on unknown classes" do
+			iv = Class.new do
+				def to_s
+					"abc"
+				end
+			end.new
+			res = @conn.exec_params( "SELECT $1", [
+					[iv, iv], # Unknown -> text[]
+				], nil, basic_type_mapping )
+
+			expect( res.values ).to eq( [[
+					'{abc,abc}',
 			]] )
 
-			expect( result_typenames(res) ).to eq( ['bigint[]', 'bigint[]', 'double precision[]', 'text[]'] )
+			expect( result_typenames(res) ).to eq( ['text[]'] )
 		end
+
 	end
 
 
@@ -55,7 +218,7 @@ describe 'Basic type mapping' do
 		# Decoding Examples
 		#
 
-		it "should do OID based type conversions", :ruby_19 do
+		it "should do OID based type conversions" do
 			res = @conn.exec( "SELECT 1, 'a', 2.0::FLOAT, TRUE, '2013-06-30'::DATE, generate_series(4,5)" )
 			expect( res.map_types!(basic_type_mapping).values ).to eq( [
 					[ 1, 'a', 2.0, true, Date.new(2013,6,30), 4 ],
@@ -78,14 +241,14 @@ describe 'Basic type mapping' do
 
 			it "should do boolean type conversions" do
 				[1, 0].each do |format|
-					res = @conn.exec( "SELECT true::BOOLEAN, false::BOOLEAN, NULL::BOOLEAN", [], format )
+					res = @conn.exec_params( "SELECT true::BOOLEAN, false::BOOLEAN, NULL::BOOLEAN", [], format )
 					expect( res.values ).to eq( [[true, false, nil]] )
 				end
 			end
 
 			it "should do binary type conversions" do
 				[1, 0].each do |format|
-					res = @conn.exec( "SELECT E'\\\\000\\\\377'::BYTEA", [], format )
+					res = @conn.exec_params( "SELECT E'\\\\000\\\\377'::BYTEA", [], format )
 					expect( res.values ).to eq( [[["00ff"].pack("H*")]] )
 					expect( res.values[0][0].encoding ).to eq( Encoding::ASCII_8BIT ) if Object.const_defined? :Encoding
 				end
@@ -93,7 +256,7 @@ describe 'Basic type mapping' do
 
 			it "should do integer type conversions" do
 				[1, 0].each do |format|
-					res = @conn.exec( "SELECT -8999::INT2, -899999999::INT4, -8999999999999999999::INT8", [], format )
+					res = @conn.exec_params( "SELECT -8999::INT2, -899999999::INT4, -8999999999999999999::INT8", [], format )
 					expect( res.values ).to eq( [[-8999, -899999999, -8999999999999999999]] )
 				end
 			end
@@ -101,7 +264,7 @@ describe 'Basic type mapping' do
 			it "should do string type conversions" do
 				@conn.internal_encoding = 'utf-8' if Object.const_defined? :Encoding
 				[1, 0].each do |format|
-					res = @conn.exec( "SELECT 'abcäöü'::TEXT", [], format )
+					res = @conn.exec_params( "SELECT 'abcäöü'::TEXT", [], format )
 					expect( res.values ).to eq( [['abcäöü']] )
 					expect( res.values[0][0].encoding ).to eq( Encoding::UTF_8 ) if Object.const_defined? :Encoding
 				end
@@ -109,7 +272,7 @@ describe 'Basic type mapping' do
 
 			it "should do float type conversions" do
 				[1, 0].each do |format|
-					res = @conn.exec( "SELECT -8.999e3::FLOAT4,
+					res = @conn.exec_params( "SELECT -8.999e3::FLOAT4,
 														8.999e10::FLOAT4,
 														-8999999999e-99::FLOAT8,
 														NULL::FLOAT4,
@@ -127,35 +290,107 @@ describe 'Basic type mapping' do
 				end
 			end
 
-			it "should do datetime without time zone type conversions" do
-				[0].each do |format|
-					res = @conn.exec( "SELECT CAST('2013-12-31 23:58:59+02' AS TIMESTAMP WITHOUT TIME ZONE),
-																		CAST('1913-12-31 23:58:59.123-03' AS TIMESTAMP WITHOUT TIME ZONE),
-																		CAST('infinity' AS TIMESTAMP WITHOUT TIME ZONE),
-																		CAST('-infinity' AS TIMESTAMP WITHOUT TIME ZONE)", [], format )
-					expect( res.getvalue(0,0) ).to eq( Time.new(2013, 12, 31, 23, 58, 59) )
-					expect( res.getvalue(0,1) ).to be_within(1e-3).of(Time.new(1913, 12, 31, 23, 58, 59.123))
-					expect( res.getvalue(0,2) ).to eq( 'infinity' )
-					expect( res.getvalue(0,3) ).to eq( '-infinity' )
+			it "should do text datetime without time zone type conversions" do
+				# for backward compat text timestamps without time zone are treated as local times
+				res = @conn.exec_params( "SELECT CAST('2013-12-31 23:58:59+02' AS TIMESTAMP WITHOUT TIME ZONE),
+																	CAST('1913-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
+																	CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
+																	CAST('294276-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
+																	CAST('infinity' AS TIMESTAMP WITHOUT TIME ZONE),
+																	CAST('-infinity' AS TIMESTAMP WITHOUT TIME ZONE)", [], 0 )
+				expect( res.getvalue(0,0) ).to eq( Time.new(2013, 12, 31, 23, 58, 59) )
+				expect( res.getvalue(0,1).iso8601(3) ).to eq( Time.new(1913, 12, 31, 23, 58, 59.1231).iso8601(3) )
+				expect( res.getvalue(0,2).iso8601(3) ).to eq( Time.new(-4713, 11, 24, 23, 58, 59.1231).iso8601(3) )
+				expect( res.getvalue(0,3).iso8601(3) ).to eq( Time.new(294276, 12, 31, 23, 58, 59.1231).iso8601(3) )
+				expect( res.getvalue(0,4) ).to eq( 'infinity' )
+				expect( res.getvalue(0,5) ).to eq( '-infinity' )
+			end
+
+			[1, 0].each do |format|
+				it "should convert format #{format} timestamps per TimestampUtc" do
+					restore_type("timestamp") do
+						PG::BasicTypeRegistry.register_type 0, 'timestamp', nil, PG::TextDecoder::TimestampUtc
+						@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
+						res = @conn.exec_params( "SELECT CAST('2013-07-31 23:58:59+02' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('1913-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('294276-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('infinity' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('-infinity' AS TIMESTAMP WITHOUT TIME ZONE)", [], format )
+						expect( res.getvalue(0,0).iso8601(3) ).to eq( Time.utc(2013, 7, 31, 23, 58, 59).iso8601(3) )
+						expect( res.getvalue(0,1).iso8601(3) ).to eq( Time.utc(1913, 12, 31, 23, 58, 59.1231).iso8601(3) )
+						expect( res.getvalue(0,2).iso8601(3) ).to eq( Time.utc(-4713, 11, 24, 23, 58, 59.1231).iso8601(3) )
+						expect( res.getvalue(0,3).iso8601(3) ).to eq( Time.utc(294276, 12, 31, 23, 58, 59.1231).iso8601(3) )
+						expect( res.getvalue(0,4) ).to eq( 'infinity' )
+						expect( res.getvalue(0,5) ).to eq( '-infinity' )
+					end
 				end
 			end
 
-			it "should do datetime with time zone type conversions" do
-				[0].each do |format|
-					res = @conn.exec( "SELECT CAST('2013-12-31 23:58:59+02' AS TIMESTAMP WITH TIME ZONE),
-																		CAST('1913-12-31 23:58:59.123-03' AS TIMESTAMP WITH TIME ZONE),
+			[1, 0].each do |format|
+				it "should convert format #{format} timestamps per TimestampUtcToLocal" do
+					restore_type("timestamp") do
+						PG::BasicTypeRegistry.register_type 0, 'timestamp', nil, PG::TextDecoder::TimestampUtcToLocal
+						PG::BasicTypeRegistry.register_type 1, 'timestamp', nil, PG::BinaryDecoder::TimestampUtcToLocal
+						@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
+						res = @conn.exec_params( "SELECT CAST('2013-07-31 23:58:59+02' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('1913-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('294276-12-31 23:58:59.1231-03' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('infinity' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('-infinity' AS TIMESTAMP WITHOUT TIME ZONE)", [], format )
+						expect( res.getvalue(0,0).iso8601(3) ).to eq( Time.utc(2013, 7, 31, 23, 58, 59).getlocal.iso8601(3) )
+						expect( res.getvalue(0,1).iso8601(3) ).to eq( Time.utc(1913, 12, 31, 23, 58, 59.1231).getlocal.iso8601(3) )
+						expect( res.getvalue(0,2).iso8601(3) ).to eq( Time.utc(-4713, 11, 24, 23, 58, 59.1231).getlocal.iso8601(3) )
+						expect( res.getvalue(0,3).iso8601(3) ).to eq( Time.utc(294276, 12, 31, 23, 58, 59.1231).getlocal.iso8601(3) )
+						expect( res.getvalue(0,4) ).to eq( 'infinity' )
+						expect( res.getvalue(0,5) ).to eq( '-infinity' )
+					end
+				end
+			end
+
+			[1, 0].each do |format|
+				it "should convert format #{format} timestamps per TimestampLocal" do
+					restore_type("timestamp") do
+						PG::BasicTypeRegistry.register_type 0, 'timestamp', nil, PG::TextDecoder::TimestampLocal
+						PG::BasicTypeRegistry.register_type 1, 'timestamp', nil, PG::BinaryDecoder::TimestampLocal
+						@conn.type_map_for_results = PG::BasicTypeMapForResults.new(@conn)
+						res = @conn.exec_params( "SELECT CAST('2013-07-31 23:58:59' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('1913-12-31 23:58:59.1231' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('294276-12-31 23:58:59.1231+03' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('infinity' AS TIMESTAMP WITHOUT TIME ZONE),
+																			CAST('-infinity' AS TIMESTAMP WITHOUT TIME ZONE)", [], format )
+						expect( res.getvalue(0,0).iso8601(3) ).to eq( Time.new(2013, 7, 31, 23, 58, 59).iso8601(3) )
+						expect( res.getvalue(0,1).iso8601(3) ).to eq( Time.new(1913, 12, 31, 23, 58, 59.1231).iso8601(3) )
+						expect( res.getvalue(0,2).iso8601(3) ).to eq( Time.new(-4713, 11, 24, 23, 58, 59.1231).iso8601(3) )
+						expect( res.getvalue(0,3).iso8601(3) ).to eq( Time.new(294276, 12, 31, 23, 58, 59.1231).iso8601(3) )
+						expect( res.getvalue(0,4) ).to eq( 'infinity' )
+						expect( res.getvalue(0,5) ).to eq( '-infinity' )
+					end
+				end
+			end
+
+			[0, 1].each do |format|
+				it "should convert format #{format} timestamps with time zone" do
+					res = @conn.exec_params( "SELECT CAST('2013-12-31 23:58:59+02' AS TIMESTAMP WITH TIME ZONE),
+																		CAST('1913-12-31 23:58:59.1231-03' AS TIMESTAMP WITH TIME ZONE),
+																		CAST('4714-11-24 23:58:59.1231-03 BC' AS TIMESTAMP WITH TIME ZONE),
+																		CAST('294276-12-31 23:58:59.1231+03' AS TIMESTAMP WITH TIME ZONE),
 																		CAST('infinity' AS TIMESTAMP WITH TIME ZONE),
 																		CAST('-infinity' AS TIMESTAMP WITH TIME ZONE)", [], format )
-					expect( res.getvalue(0,0) ).to eq( Time.new(2013, 12, 31, 23, 58, 59, "+02:00") )
-					expect( res.getvalue(0,1) ).to be_within(1e-3).of(Time.new(1913, 12, 31, 23, 58, 59.123, "-03:00"))
-					expect( res.getvalue(0,2) ).to eq( 'infinity' )
-					expect( res.getvalue(0,3) ).to eq( '-infinity' )
+					expect( res.getvalue(0,0) ).to be_within(1e-3).of( Time.new(2013, 12, 31, 23, 58, 59, "+02:00").getlocal )
+					expect( res.getvalue(0,1) ).to be_within(1e-3).of( Time.new(1913, 12, 31, 23, 58, 59.1231, "-03:00").getlocal )
+					expect( res.getvalue(0,2) ).to be_within(1e-3).of( Time.new(-4713, 11, 24, 23, 58, 59.1231, "-03:00").getlocal )
+					expect( res.getvalue(0,3) ).to be_within(1e-3).of( Time.new(294276, 12, 31, 23, 58, 59.1231, "+03:00").getlocal )
+					expect( res.getvalue(0,4) ).to eq( 'infinity' )
+					expect( res.getvalue(0,5) ).to eq( '-infinity' )
 				end
 			end
 
 			it "should do date type conversions" do
 				[0].each do |format|
-					res = @conn.exec( "SELECT CAST('2113-12-31' AS DATE),
+					res = @conn.exec_params( "SELECT CAST('2113-12-31' AS DATE),
 																		CAST('1913-12-31' AS DATE),
 																		CAST('infinity' AS DATE),
 																		CAST('-infinity' AS DATE)", [], format )
@@ -166,10 +401,31 @@ describe 'Basic type mapping' do
 				end
 			end
 
+			it "should do numeric type conversions" do
+				[0].each do |format|
+					small = '123456790123.12'
+					large = ('123456790'*10) << '.' << ('012345679')
+					numerics = [
+						'1',
+						'1.0',
+						'1.2',
+						small,
+						large,
+					]
+					sql_numerics = numerics.map { |v| "CAST(#{v} AS numeric)" }
+					res = @conn.exec_params( "SELECT #{sql_numerics.join(',')}", [], format )
+					expect( res.getvalue(0,0) ).to eq( BigDecimal('1') )
+					expect( res.getvalue(0,1) ).to eq( BigDecimal('1') )
+					expect( res.getvalue(0,2) ).to eq( BigDecimal('1.2') )
+					expect( res.getvalue(0,3) ).to eq( BigDecimal(small) )
+					expect( res.getvalue(0,4) ).to eq( BigDecimal(large) )
+				end
+			end
+
 			it "should do JSON conversions", :postgresql_94 do
 				[0].each do |format|
 					['JSON', 'JSONB'].each do |type|
-						res = @conn.exec( "SELECT CAST('123' AS #{type}),
+						res = @conn.exec_params( "SELECT CAST('123' AS #{type}),
 																			CAST('12.3' AS #{type}),
 																			CAST('true' AS #{type}),
 																			CAST('false' AS #{type}),
@@ -189,7 +445,7 @@ describe 'Basic type mapping' do
 
 			it "should do array type conversions" do
 				[0].each do |format|
-					res = @conn.exec( "SELECT CAST('{1,2,3}' AS INT2[]), CAST('{{1,2},{3,4}}' AS INT2[][]),
+					res = @conn.exec_params( "SELECT CAST('{1,2,3}' AS INT2[]), CAST('{{1,2},{3,4}}' AS INT2[][]),
 															CAST('{1,2,3}' AS INT4[]),
 															CAST('{1,2,3}' AS INT8[]),
 															CAST('{1,2,3}' AS TEXT[]),
@@ -207,6 +463,75 @@ describe 'Basic type mapping' do
 					expect( res.getvalue(0,7) ).to eq( [1.0,2.0,3.0] )
 				end
 			end
+
+			it "should do inet type conversions" do
+				[0].each do |format|
+					vals = [
+						'1.2.3.4',
+						'0.0.0.0/0',
+						'1.0.0.0/8',
+						'1.2.0.0/16',
+						'1.2.3.0/24',
+						'1.2.3.4/24',
+						'1.2.3.4/32',
+						'1.2.3.128/25',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012',
+						'::/0',
+						'1234:3456::/32',
+						'1234:3456:5678:789a::/64',
+						'1234:3456:5678:789a:9abc:bced::/96',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012/128',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012/0',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012/32',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012/64',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012/96',
+					]
+					sql_vals = vals.map{|v| "CAST('#{v}' AS inet)"}
+					res = @conn.exec_params(("SELECT " + sql_vals.join(', ')), [], format )
+					vals.each_with_index do |v, i|
+						expect( res.getvalue(0,i) ).to eq( IPAddr.new(v) )
+					end
+				end
+			end
+
+			it "should do cidr type conversions" do
+				[0].each do |format|
+					vals = [
+						'0.0.0.0/0',
+						'1.0.0.0/8',
+						'1.2.0.0/16',
+						'1.2.3.0/24',
+						'1.2.3.4/32',
+						'1.2.3.128/25',
+						'::/0',
+						'1234:3456::/32',
+						'1234:3456:5678:789a::/64',
+						'1234:3456:5678:789a:9abc:bced::/96',
+						'1234:3456:5678:789a:9abc:bced:edf0:f012/128',
+					]
+					sql_vals = vals.map { |v| "CAST('#{v}' AS cidr)" }
+					res = @conn.exec_params(("SELECT " + sql_vals.join(', ')), [], format )
+					vals.each_with_index do |v, i|
+						val = res.getvalue(0,i)
+						ip, prefix = v.split('/', 2)
+						expect( val.to_s ).to eq( ip )
+						if val.respond_to?(:prefix)
+							val_prefix = val.prefix
+						else
+							default_prefix = (val.family == Socket::AF_INET ? 32 : 128)
+							range = val.to_range
+							val_prefix	= default_prefix - Math.log(((range.end.to_i - range.begin.to_i) + 1), 2).to_i
+						end
+						if v.include?('/')
+							expect( val_prefix ).to eq( prefix.to_i )
+						elsif v.include?('.')
+							expect( val_prefix ).to eq( 32 )
+						else
+							expect( val_prefix ).to eq( 128 )
+						end
+					end
+				end
+			end
 		end
 
 		context "with usage of result oids for copy decoder selection" do