pg 0.21.0 → 1.1.4

data/lib/pg/type_map_by_column.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 
 require 'pg' unless defined?( PG )
 

data/spec/helpers.rb

@@ -1,11 +1,13 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 
 require 'pathname'
 require 'rspec'
 require 'shellwords'
 require 'pg'
 
-TEST_DIRECTORY = Pathname.getwd + "tmp_test_specs"
+DEFAULT_TEST_DIR_STR = File.join(Dir.pwd, "tmp_test_specs")
+TEST_DIR_STR = ENV['RUBY_PG_TEST_DIR'] || DEFAULT_TEST_DIR_STR
+TEST_DIRECTORY = Pathname.new(TEST_DIR_STR)
 
 module PG::TestingHelpers
 
@@ -20,12 +22,11 @@ module PG::TestingHelpers
 
 			mod.around( :each ) do |example|
 				begin
+					@conn.set_default_encoding
 					@conn.exec( 'BEGIN' ) unless example.metadata[:without_transaction]
-					if PG.respond_to?( :library_version )
-						desc = example.source_location.join(':')
-						@conn.exec_params %Q{SET application_name TO '%s'} %
-							[@conn.escape_string(desc.slice(-60))]
-					end
+					desc = example.source_location.join(':')
+					@conn.exec %Q{SET application_name TO '%s'} %
+						[@conn.escape_string(desc.slice(-60))]
 					example.run
 				ensure
 					@conn.exec( 'ROLLBACK' ) unless example.metadata[:without_transaction]
@@ -197,8 +198,8 @@ module PG::TestingHelpers
 		@test_pgdata = TEST_DIRECTORY + 'data'
 		@test_pgdata.mkpath
 
-		@port = 54321
-		ENV['PGPORT'] = @port.to_s
+		ENV['PGPORT'] ||= "54321"
+		@port = ENV['PGPORT'].to_i
 		ENV['PGHOST'] = 'localhost'
 		@conninfo = "host=localhost port=#{@port} dbname=test"
 
@@ -251,7 +252,7 @@ module PG::TestingHelpers
 
 	def check_for_lingering_connections( conn )
 		conn.exec( "SELECT * FROM pg_stat_activity" ) do |res|
-			conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid }
+			conns = res.find_all {|row| row['pid'].to_i != conn.backend_pid && ["client backend", nil].include?(row["backend_type"]) }
 			unless conns.empty?
 				puts "Lingering connections remain:"
 				conns.each do |row|
@@ -264,7 +265,7 @@ module PG::TestingHelpers
 
 	# Retrieve the names of the column types of a given result set.
 	def result_typenames(res)
-		@conn.exec( "SELECT " + res.nfields.times.map{|i| "format_type($#{i*2+1},$#{i*2+2})"}.join(","),
+		@conn.exec_params( "SELECT " + res.nfields.times.map{|i| "format_type($#{i*2+1},$#{i*2+2})"}.join(","),
 				res.nfields.times.map{|i| [res.ftype(i), res.fmod(i)] }.flatten ).
 				values[0]
 	end
@@ -318,6 +319,39 @@ module PG::TestingHelpers
 		return ConnStillUsableMatcher.new
 	end
 
+	def wait_for_polling_ok(conn, meth = :connect_poll)
+		status = conn.send(meth)
+
+		while status != PG::PGRES_POLLING_OK
+			if status == PG::PGRES_POLLING_READING
+				select( [conn.socket_io], [], [], 5.0 ) or
+					raise "Asynchronous connection timed out!"
+
+			elsif status == PG::PGRES_POLLING_WRITING
+				select( [], [conn.socket_io], [], 5.0 ) or
+					raise "Asynchronous connection timed out!"
+			end
+			status = conn.send(meth)
+		end
+	end
+
+	def wait_for_query_result(conn)
+		result = nil
+		loop do
+			# Buffer any incoming data on the socket until a full result is ready.
+			conn.consume_input
+			while conn.is_busy
+				select( [conn.socket_io], nil, nil, 5.0 ) or
+					raise "Timeout waiting for query response."
+				conn.consume_input
+			end
+
+			# Fetch the next result. If there isn't one, the query is finished
+			result = conn.get_result || break
+		end
+		result
+	end
+
 end
 
 
@@ -339,14 +373,8 @@ RSpec.configure do |config|
 	config.filter_run_excluding :socket_io unless
 		PG::Connection.instance_methods.map( &:to_sym ).include?( :socket_io )
 
-	if PG.library_version < 90200
-		config.filter_run_excluding( :postgresql_92, :postgresql_93, :postgresql_94, :postgresql_95 )
-	elsif PG.library_version < 90300
-		config.filter_run_excluding( :postgresql_93, :postgresql_94, :postgresql_95 )
-	elsif PG.library_version < 90400
-		config.filter_run_excluding( :postgresql_94, :postgresql_95 )
-	elsif PG.library_version < 90500
-		config.filter_run_excluding( :postgresql_95 )
-	end
+	config.filter_run_excluding( :postgresql_93 ) if PG.library_version <  90300
+	config.filter_run_excluding( :postgresql_94 ) if PG.library_version <  90400
+	config.filter_run_excluding( :postgresql_95 ) if PG.library_version <  90500
+	config.filter_run_excluding( :postgresql_10 ) if PG.library_version < 100000
 end
-

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
 
@@ -42,6 +58,30 @@ describe 'Basic type mapping' do
 
 			expect( result_typenames(res) ).to eq( ['bigint[]', 'bigint[]', 'double precision[]', 'text[]'] )
 		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
+
 	end
 
 
@@ -78,14 +118,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 +133,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 +141,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 +149,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 +167,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 +278,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 +322,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 +340,76 @@ 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|
+						val = res.getvalue(0,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