pg 0.8.0 → 0.9.0.pre156

data/spec/m17n_spec.rb

@@ -0,0 +1,139 @@
+#!/usr/bin/env spec
+# encoding: utf-8
+
+BEGIN {
+	require 'pathname'
+	require 'rbconfig'
+
+	basedir = Pathname( __FILE__ ).dirname.parent
+	libdir = basedir + 'lib'
+	archlib = libdir + Config::CONFIG['sitearch']
+
+	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
+	$LOAD_PATH.unshift( archlib.to_s ) unless $LOAD_PATH.include?( archlib.to_s )
+}
+
+require 'pg'
+
+require 'rubygems'
+require 'spec'
+require 'spec/lib/helpers'
+
+describe "multinationalization support" do
+	include PgTestingHelpers
+
+	RUBY_VERSION_VEC = RUBY_VERSION.split('.').map {|c| c.to_i }.pack("N*")
+	MIN_RUBY_VERSION_VEC = [1,9,1].pack('N*')
+
+
+	before( :all ) do
+		@conn = nil
+		if RUBY_VERSION_VEC >= MIN_RUBY_VERSION_VEC
+			@conn = setup_testing_db( "m17n" )
+			@conn.exec( 'BEGIN' )
+		end
+	end
+
+	before( :each ) do
+		pending "depends on m17n support in Ruby >= 1.9.1" if @conn.nil?
+	end
+
+
+	it "should return the same bytes in text format that are sent as inline text" do
+		binary_file = File.join(Dir.pwd, 'spec/data', 'random_binary_data')
+		in_bytes = File.open(binary_file, 'r:ASCII-8BIT').read
+
+		out_bytes = nil
+		@conn.transaction do |conn|
+			conn.exec("SET standard_conforming_strings=on")
+			res = conn.exec("VALUES ('#{PGconn.escape_bytea(in_bytes)}'::bytea)", [], 0)
+			out_bytes = PGconn.unescape_bytea(res[0]['column1'])
+		end
+		out_bytes.should== in_bytes
+	end
+
+	describe "rubyforge #22925: m17n support" do
+		it "should return results in the same encoding as the client (iso-8859-1)" do
+			out_string = nil
+			@conn.transaction do |conn|
+				conn.internal_encoding = 'iso8859-1'
+				res = conn.exec("VALUES ('fantasia')", [], 0)
+				out_string = res[0]['column1']
+			end
+			out_string.should == 'fantasia'
+			out_string.encoding.should == Encoding::ISO8859_1
+		end
+
+		it "should return results in the same encoding as the client (utf-8)" do
+			out_string = nil
+			@conn.transaction do |conn|
+				conn.internal_encoding = 'utf-8'
+				res = conn.exec("VALUES ('世界線航跡蔵')", [], 0)
+				out_string = res[0]['column1']
+			end
+			out_string.should == '世界線航跡蔵'
+			out_string.encoding.should == Encoding::UTF_8
+		end
+
+		it "should return results in the same encoding as the client (EUC-JP)" do
+			out_string = nil
+			@conn.transaction do |conn|
+				conn.internal_encoding = 'EUC-JP'
+				stmt = "VALUES ('世界線航跡蔵')".encode('EUC-JP')
+				res = conn.exec(stmt, [], 0)
+				out_string = res[0]['column1']
+			end
+			out_string.should == '世界線航跡蔵'.encode('EUC-JP')
+			out_string.encoding.should == Encoding::EUC_JP
+		end
+
+		it "returns the results in the correct encoding even if the client_encoding has " +
+		   "changed since the results were fetched" do
+			out_string = nil
+			@conn.transaction do |conn|
+				conn.internal_encoding = 'EUC-JP'
+				stmt = "VALUES ('世界線航跡蔵')".encode('EUC-JP')
+				res = conn.exec(stmt, [], 0)
+				conn.internal_encoding = 'utf-8'
+				out_string = res[0]['column1']
+			end
+			out_string.should == '世界線航跡蔵'.encode('EUC-JP')
+			out_string.encoding.should == Encoding::EUC_JP
+		end
+
+		it "the connection should return ASCII-8BIT when the server encoding is SQL_ASCII" do
+			@conn.external_encoding.should == Encoding::ASCII_8BIT
+		end
+
+		it "works around the unsupported JOHAB encoding by returning stuff in 'ASCII_8BIT'" do
+			pending "figuring out how to create a string in the JOHAB encoding" do
+				out_string = nil
+				@conn.transaction do |conn|
+					conn.exec( "set client_encoding = 'JOHAB';" )
+					stmt = "VALUES ('foo')".encode('JOHAB')
+					res = conn.exec( stmt, [], 0 )
+					out_string = res[0]['column1']
+				end
+				out_string.should == 'foo'.encode(Encoding::ASCII_8BIT)
+				out_string.encoding.should == Encoding::ASCII_8BIT
+			end
+		end
+
+		it "should use client encoding for escaped string" do
+			original = "string to escape".force_encoding("euc-jp")
+			@conn.set_client_encoding("euc_jp")
+			escaped  = @conn.escape(original)
+			escaped.encoding.should == Encoding::EUC_JP
+		end
+
+	end
+
+
+	after( :each ) do
+		@conn.exec( 'ROLLBACK' ) if @conn
+	end
+
+	after( :all ) do
+		teardown_testing_db( @conn ) if @conn
+	end
+end

data/spec/pgconn_spec.rb

@@ -1,36 +1,37 @@
-require 'rubygems'
-require 'spec'
+#!/usr/bin/env spec
+# encoding: utf-8
+
+BEGIN {
+	require 'pathname'
+	require 'rbconfig'
+
+	basedir = Pathname( __FILE__ ).dirname.parent
+	libdir = basedir + 'lib'
+	archlib = libdir + Config::CONFIG['sitearch']
+
+	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
+	$LOAD_PATH.unshift( archlib.to_s ) unless $LOAD_PATH.include?( archlib.to_s )
+}
 
-$LOAD_PATH.unshift('ext')
 require 'pg'
 
+require 'rubygems'
+require 'spec'
+require 'spec/lib/helpers'
+require 'timeout'
+
 describe PGconn do
+	include PgTestingHelpers
 
 	before( :all ) do
-		puts "======  TESTING PGconn  ======"
-		@test_directory = File.join(Dir.getwd, "tmp_test_#{rand}")
-		@test_pgdata = File.join(@test_directory, 'data')
-		if File.exists?(@test_directory) then
-			raise "test directory exists!"
-		end
-    @port = 54321
-		@conninfo = "host=localhost port=#{@port} dbname=test"
-		Dir.mkdir(@test_directory)
-		Dir.mkdir(@test_pgdata)
-		cmds = []
-		cmds << "initdb -D \"#{@test_pgdata}\""
-    cmds << "pg_ctl -o \"-p #{@port}\" -D \"#{@test_pgdata}\" start"
-		cmds << "sleep 5"
-    cmds << "createdb -p #{@port} test"
-
-		cmds.each do |cmd|
-			if not system(cmd) then
-				raise "Error executing cmd: #{cmd}: #{$?}"
-			end
-		end
-		@conn = PGconn.connect(@conninfo)
+		@conn = setup_testing_db( "PGconn" )
+	end
+
+	before( :each ) do
+		@conn.exec( 'BEGIN' )
 	end
 
+
 	it "should connect successfully with connection string" do
 		tmpconn = PGconn.connect(@conninfo)
 		tmpconn.status.should== PGconn::CONNECTION_OK
@@ -86,7 +87,6 @@ describe PGconn do
 			# be careful to explicitly close files so that the
 			# directory can be removed and we don't have to wait for
 			# the GC to run.
-
 			expected_trace_file = File.join(Dir.getwd, "spec/data", "expected_trace.out")
 			expected_trace_data = open(expected_trace_file, 'rb').read
 			trace_file = open(File.join(@test_directory, "test_trace.out"), 'wb')
@@ -101,7 +101,7 @@ describe PGconn do
 			trace_data.should == expected_trace_data
 		end
 	end
-	
+
 	it "should cancel a query" do
 		error = false
 		@conn.send_query("SELECT pg_sleep(1000)")
@@ -113,18 +113,179 @@ describe PGconn do
 		error.should == true
 	end
 
-	after( :all ) do
-		puts ""
-		@conn.finish
-		cmds = []
-		cmds << "pg_ctl -D \"#{@test_pgdata}\" stop"
-		cmds << "rm -rf \"#{@test_directory}\""
-		cmds.each do |cmd|
-			if not system(cmd) then
-				raise "Error executing cmd: #{cmd}: #{$?}"
+	it "should not read past the end of a large object" do
+		@conn.transaction do
+			oid = @conn.lo_create( 0 )
+			fd = @conn.lo_open( oid, PGconn::INV_READ|PGconn::INV_WRITE )
+			@conn.lo_write( fd, "foobar" )
+			@conn.lo_read( fd, 10 ).should be_nil()
+			@conn.lo_lseek( fd, 0, PGconn::SEEK_SET )
+			@conn.lo_read( fd, 10 ).should == 'foobar'
+		end
+	end
+
+
+	it "should wait for NOTIFY events via select()" do
+		@conn.exec( 'ROLLBACK' )
+		@conn.exec( 'LISTEN woo' )
+
+		pid = fork do
+			conn = PGconn.connect( @conninfo )
+			sleep 1
+			conn.exec( 'NOTIFY woo' )
+			conn.finish
+			exit!
+		end
+
+		@conn.wait_for_notify( 10 ).should == 'woo'
+		@conn.exec( 'UNLISTEN woo' )
+
+		Process.wait( pid )
+	end
+
+	it "yields the result if block is given to exec" do
+		rval = @conn.exec( "select 1234::int as a union select 5678::int as a" ) do |result|
+			values = []
+			result.should be_kind_of( PGresult )
+			result.ntuples.should == 2
+			result.each do |tuple|
+				values << tuple['a']
+			end
+			values
+		end
+
+		rval.should have( 2 ).members
+		rval.should include( '5678', '1234' )
+	end
+
+
+	it "correctly finishes COPY queries passed to #async_exec" do
+		@conn.async_exec( "COPY (SELECT 1 UNION ALL SELECT 2) TO STDOUT" )
+
+		results = []
+		begin
+			data = @conn.get_copy_data( true )
+			if false == data
+				@conn.block( 2.0 )
+				data = @conn.get_copy_data( true )
 			end
+			results << data if data
+		end until data.nil?
+
+		results.should have( 2 ).members
+		results.should include( "1\n", "2\n" )
+	end
+
+
+	it "PGconn#block shouldn't block a second thread" do
+		t = Thread.new do
+			@conn.send_query( "select pg_sleep(3)" )
+			@conn.block
 		end
-		puts "====== COMPLETED TESTING PGconn  ======"
-		puts ""
+
+		# :FIXME: There's a race here, but hopefully it's pretty small.
+		t.should be_alive()
+
+		@conn.cancel
+		t.join
+	end
+
+	it "PGconn#block should allow a timeout" do
+		@conn.send_query( "select pg_sleep(3)" )
+
+		start = Time.now
+		@conn.block( 0.1 )
+		finish = Time.now
+
+		(finish - start).should be_close( 0.1, 0.05 )
+	end
+
+
+	it "can encrypt a string given a password and username" do
+		PGconn.encrypt_password("postgres", "postgres").
+			should =~ /\S+/
+	end
+
+
+	it "raises an appropriate error if either of the required arguments for encrypt_password " +
+	   "is not valid" do
+		expect {
+			PGconn.encrypt_password( nil, nil )
+		}.to raise_error( TypeError )
+		expect {
+			PGconn.encrypt_password( "postgres", nil )
+		}.to raise_error( TypeError )
+		expect {
+			PGconn.encrypt_password( nil, "postgres" )
+		}.to raise_error( TypeError )
+	end
+
+
+	it "allows fetching a column of values from a result by column number" do
+		res = @conn.exec( 'VALUES (1,2),(2,3),(3,4)' )
+		res.column_values( 0 ).should == %w[1 2 3]
+		res.column_values( 1 ).should == %w[2 3 4]
+	end
+
+
+	it "allows fetching a column of values from a result by field name" do
+		res = @conn.exec( 'VALUES (1,2),(2,3),(3,4)' )
+		res.field_values( 'column1' ).should == %w[1 2 3]
+		res.field_values( 'column2' ).should == %w[2 3 4]
+	end
+
+
+	it "raises an error if selecting an invalid column index" do
+		res = @conn.exec( 'VALUES (1,2),(2,3),(3,4)' )
+		expect {
+			res.column_values( 20 )
+		}.to raise_error( IndexError )
+	end
+
+
+	it "raises an error if selecting an invalid field name" do
+		res = @conn.exec( 'VALUES (1,2),(2,3),(3,4)' )
+		expect {
+			res.field_values( 'hUUuurrg' )
+		}.to raise_error( IndexError )
+	end
+
+
+	it "raises an error if column index is not a number" do
+		res = @conn.exec( 'VALUES (1,2),(2,3),(3,4)' )
+		expect {
+			res.column_values( 'hUUuurrg' )
+		}.to raise_error( TypeError )
+	end
+
+
+	it "can connect asynchronously" do
+		serv = TCPServer.new( '127.0.0.1', 54320 )
+		conn = PGconn.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" )
+		conn.connect_poll.should == PGconn::PGRES_POLLING_WRITING
+		select( nil, [IO.for_fd(conn.socket)], nil, 0.2 )
+		serv.close
+		if conn.connect_poll == PGconn::PGRES_POLLING_READING
+			select( [IO.for_fd(conn.socket)], nil, nil, 0.2 )
+		end
+		conn.connect_poll.should == PGconn::PGRES_POLLING_FAILED
+	end
+
+	it "discards previous results (if any) before waiting on an #async_exec"
+
+	it "calls the block if one is provided to #async_exec" do
+		result = nil
+		@conn.async_exec( "select 47 as one" ) do |pg_res|
+			result = pg_res[0]
+		end
+		result.should == { 'one' => '47' }
+	end
+
+	after( :each ) do
+		@conn.exec( 'ROLLBACK' )
+	end
+
+	after( :all ) do
+		teardown_testing_db( @conn )
 	end
 end

data/spec/pgresult_spec.rb

@@ -1,37 +1,36 @@
-require 'rubygems'
-require 'spec'
+#!/usr/bin/env spec
+# encoding: utf-8
+
+BEGIN {
+	require 'pathname'
+	require 'rbconfig'
+
+	basedir = Pathname( __FILE__ ).dirname.parent
+	libdir = basedir + 'lib'
+	archlib = libdir + Config::CONFIG['sitearch']
+
+	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
+	$LOAD_PATH.unshift( archlib.to_s ) unless $LOAD_PATH.include?( archlib.to_s )
+}
 
-$LOAD_PATH.unshift('ext')
 require 'pg'
 
-describe PGconn do
+require 'rubygems'
+require 'spec'
+require 'spec/lib/helpers'
+
+describe PGresult do
+	include PgTestingHelpers
 
 	before( :all ) do
-		puts "======  TESTING PGresult  ======"
-		@test_directory = File.join(Dir.getwd, "tmp_test_#{rand}")
-		@test_pgdata = File.join(@test_directory, 'data')
-		if File.exists?(@test_directory) then
-			raise "test directory exists!"
-		end
-    @port = 54321
-		@conninfo = "host=localhost port=#{@port} dbname=test"
-		Dir.mkdir(@test_directory)
-		Dir.mkdir(@test_pgdata)
-		cmds = []
-		cmds << "initdb -D \"#{@test_pgdata}\""
-    cmds << "pg_ctl -o \"-p #{@port}\" -D \"#{@test_pgdata}\" start"
-		cmds << "sleep 5"
-    cmds << "createdb -p #{@port} test"
-
-		cmds.each do |cmd|
-			if not system(cmd) then
-				raise "Error executing cmd: #{cmd}: #{$?}"
-			end
-		end
-		puts "\n\n"
-		@conn = PGconn.connect(@conninfo)
+		@conn = setup_testing_db( "PGresult" )
+	end
+
+	before( :each ) do
+		@conn.exec( 'BEGIN' )
 	end
 
+
 	it "should act as an array of hashes" do
 		res = @conn.exec("SELECT 1 AS a, 2 AS b")
 		res[0]['a'].should== '1'
@@ -66,12 +65,10 @@ describe PGconn do
 		binary_file = File.join(Dir.pwd, 'spec/data', 'random_binary_data')
 		in_bytes = File.open(binary_file, 'rb').read
 		out_bytes = nil
-		@conn.transaction do |conn|
-			conn.exec("SET standard_conforming_strings=on")
-			res = conn.exec("VALUES ('#{PGconn.escape_bytea(in_bytes)}'::bytea)", [], 1)
-			out_bytes = res[0]['column1']
-		end
-		out_bytes.should== in_bytes
+		@conn.exec("SET standard_conforming_strings=on")
+		res = @conn.exec("VALUES ('#{PGconn.escape_bytea(in_bytes)}'::bytea)", [], 1)
+		out_bytes = res[0]['column1']
+		out_bytes.should == in_bytes
 	end
 
 	it "should return the same bytes in text format that are sent in binary format" do
@@ -87,26 +84,135 @@ describe PGconn do
 		in_bytes = File.open(binary_file, 'rb').read
 
 		out_bytes = nil
-		@conn.transaction do |conn|
-			conn.exec("SET standard_conforming_strings=on")
-			res = conn.exec("VALUES ('#{PGconn.escape_bytea(in_bytes)}'::bytea)", [], 0)
-			out_bytes = PGconn.unescape_bytea(res[0]['column1'])
-		end
-		out_bytes.should== in_bytes
+		@conn.exec("SET standard_conforming_strings=on")
+		res = @conn.exec("VALUES ('#{PGconn.escape_bytea(in_bytes)}'::bytea)", [], 0)
+		out_bytes = PGconn.unescape_bytea(res[0]['column1'])
+		out_bytes.should == in_bytes
+	end
+
+	it "should return the parameter type of the specified prepared statment parameter" do
+		query = 'SELECT * FROM pg_stat_activity WHERE user = $1::name AND current_query = $2::text'
+		@conn.prepare( 'queryfinder', query )
+		res = @conn.describe_prepared( 'queryfinder' )
+
+		@conn.exec( 'SELECT format_type($1, -1)', [res.paramtype(0)] ).getvalue( 0, 0 ).
+			should == 'name'
+		@conn.exec( 'SELECT format_type($1, -1)', [res.paramtype(1)] ).getvalue( 0, 0 ).
+			should == 'text'
+	end
+
+	it "should raise an exception when a negative index is given to #fformat" do
+		res = @conn.exec('SELECT * FROM pg_stat_activity')
+		expect {
+			res.fformat( -1 )
+		}.to raise_error( ArgumentError, /column number/i )
+	end
+
+	it "should raise an exception when a negative index is given to #fmod" do
+		res = @conn.exec('SELECT * FROM pg_stat_activity')
+		expect {
+			res.fmod( -1 )
+		}.to raise_error( ArgumentError, /column number/i )
+	end
+
+	it "should raise an exception when a negative index is given to #[]" do
+		res = @conn.exec('SELECT * FROM pg_stat_activity')
+		expect {
+			res[ -1 ]
+		}.to raise_error( IndexError, /-1 is out of range/i )
+	end
+
+	# PQfmod
+	it "can return the type modifier for a result column" do
+		@conn.exec( 'CREATE TABLE fmodtest ( foo varchar(33) )' )
+		res = @conn.exec( 'SELECT * FROM fmodtest' )
+		res.fmod( 0 ).should == 33 + 4 # Column length + varlena size (4)
+	end
+
+	it "should raise an exception when an invalid index is passed to PGresult#fmod" do
+		@conn.exec( 'CREATE TABLE fmodtest ( foo varchar(33) )' )
+		res = @conn.exec( 'SELECT * FROM fmodtest' )
+		expect { res.fmod(1) }.to raise_error( ArgumentError )
+	end
+
+	it "should raise an exception when an invalid (negative) index is passed to PGresult#fmod" do
+		@conn.exec( 'CREATE TABLE fmodtest ( foo varchar(33) )' )
+		res = @conn.exec( 'SELECT * FROM fmodtest' )
+		expect { res.fmod(-11) }.to raise_error( ArgumentError )
+	end
+
+	it "shouldn't raise an exception when a valid index is passed to PGresult#fmod for a column with no typemod" do
+		@conn.exec( 'CREATE TABLE fmodtest ( foo text )' )
+		res = @conn.exec( 'SELECT * FROM fmodtest' )
+		res.fmod( 0 ).should == -1 # and it shouldn't raise an exception, either
+	end
+
+	# PQftable
+	it "can return the oid of the table from which a result column was fetched" do
+		@conn.exec( 'CREATE TABLE ftabletest ( foo text )' )
+		res = @conn.exec( 'SELECT * FROM ftabletest' )
+
+		res.ftable( 0 ).should == be_nonzero()
+	end
+
+	it "should raise an exception when an invalid index is passed to PGresult#ftable" do
+		@conn.exec( 'CREATE TABLE ftabletest ( foo text )' )
+		res = @conn.exec( 'SELECT * FROM ftabletest' )
+
+		expect { res.ftable(18) }.to raise_error( ArgumentError )
+	end
+
+	it "should raise an exception when an invalid (negative) index is passed to PGresult#ftable" do
+		@conn.exec( 'CREATE TABLE ftabletest ( foo text )' )
+		res = @conn.exec( 'SELECT * FROM ftabletest' )
+
+		expect { res.ftable(-2) }.to raise_error( ArgumentError )
+	end
+
+	it "shouldn't raise an exception when a valid index is passed to PGresult#ftable for a " +
+	   "column with no corresponding table" do
+		@conn.exec( 'CREATE TABLE ftabletest ( foo text )' )
+		res = @conn.exec( 'SELECT foo, LENGTH(foo) as length FROM ftabletest' )
+		res.ftable( 1 ).should == PGresult::InvalidOid # and it shouldn't raise an exception, either
+	end
+
+	# PQftablecol
+	it "can return the column number (within its table) of a column in a result" do
+		@conn.exec( 'CREATE TABLE ftablecoltest ( foo text, bar numeric )' )
+		res = @conn.exec( 'SELECT * FROM ftablecoltest' )
+
+		res.ftablecol( 0 ).should == 1
+		res.ftablecol( 1 ).should == 2
+	end
+
+	it "should raise an exception when an invalid index is passed to PGresult#ftablecol" do
+		@conn.exec( 'CREATE TABLE ftablecoltest ( foo text, bar numeric )' )
+		res = @conn.exec( 'SELECT * FROM ftablecoltest' )
+
+		expect { res.ftablecol(32) }.to raise_error( ArgumentError )
+	end
+
+	it "should raise an exception when an invalid (negative) index is passed to PGresult#ftablecol" do
+		@conn.exec( 'CREATE TABLE ftablecoltest ( foo text, bar numeric )' )
+		res = @conn.exec( 'SELECT * FROM ftablecoltest' )
+
+		expect { res.ftablecol(-1) }.to raise_error( ArgumentError )
+	end
+
+	it "shouldn't raise an exception when a valid index is passed to PGresult#ftablecol for a " +
+	   "column with no corresponding table" do
+		@conn.exec( 'CREATE TABLE ftablecoltest ( foo text )' )
+		res = @conn.exec( 'SELECT foo, LENGTH(foo) as length FROM ftablecoltest' )
+		res.ftablecol(1).should == 0 # and it shouldn't raise an exception, either
+	end
+
+
+
+	after( :each ) do
+		@conn.exec( 'ROLLBACK' )
 	end
 
 	after( :all ) do
-		puts ""
-		@conn.finish
-		cmds = []
-		cmds << "pg_ctl -D \"#{@test_pgdata}\" stop"
-		cmds << "rm -rf \"#{@test_directory}\""
-		cmds.each do |cmd|
-			if not system(cmd) then
-				raise "Error executing cmd: #{cmd}: #{$?}"
-			end
-		end
-		puts "======  COMPLETED TESTING PGresult  ======"
-		puts ""
+		teardown_testing_db( @conn )
 	end
 end