pg 0.12.0 → 0.16.0

data/spec/{pgresult_spec.rb → pg/result_spec.rb}

@@ -3,32 +3,40 @@
 
 BEGIN {
 	require 'pathname'
-	require 'rbconfig'
 
-	basedir = Pathname( __FILE__ ).dirname.parent
+	basedir = Pathname( __FILE__ ).dirname.parent.parent
 	libdir = basedir + 'lib'
-	archlib = libdir + Config::CONFIG['sitearch']
 
 	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
 	$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 'rspec'
 require 'spec/lib/helpers'
 require 'pg'
 
-describe PGresult do
-	include PgTestingHelpers
+describe PG::Result do
 
 	before( :all ) do
-		@conn = setup_testing_db( "PGresult" )
+		@conn = setup_testing_db( "PG_Result" )
 	end
 
 	before( :each ) do
 		@conn.exec( 'BEGIN' )
 	end
 
+	after( :each ) do
+		@conn.exec( 'ROLLBACK' )
+	end
+
+	after( :all ) do
+		teardown_testing_db( @conn )
+	end
+
+
+	#
+	# Examples
+	#
 
 	it "should act as an array of hashes" do
 		res = @conn.exec("SELECT 1 AS a, 2 AS b")
@@ -36,6 +44,13 @@ describe PGresult do
 		res[0]['b'].should== '2'
 	end
 
+	it "should yield a row as an array" do
+		res = @conn.exec("SELECT 1 AS a, 2 AS b")
+		list = []
+		res.each_row { |r| list << r }
+		list.should eq [['1', '2']]
+	end
+
 	it "should insert nil AS NULL and return NULL as nil" do
 		res = @conn.exec("SELECT $1::int AS n", [nil])
 		res[0]['n'].should be_nil()
@@ -51,21 +66,37 @@ describe PGresult do
 
 		result = exception.result
 
-		result.should be_a( PGresult )
-		result.error_field( PGresult::PG_DIAG_SEVERITY ).should == 'ERROR'
-		result.error_field( PGresult::PG_DIAG_SQLSTATE ).should == '42P01'
-		result.error_field( PGresult::PG_DIAG_MESSAGE_PRIMARY ).
+		result.should be_a( described_class() )
+		result.error_field( PG::PG_DIAG_SEVERITY ).should == 'ERROR'
+		result.error_field( PG::PG_DIAG_SQLSTATE ).should == '42P01'
+		result.error_field( PG::PG_DIAG_MESSAGE_PRIMARY ).
 			should == 'relation "nonexistant_table" does not exist'
-		result.error_field( PGresult::PG_DIAG_MESSAGE_DETAIL ).should be_nil()
-		result.error_field( PGresult::PG_DIAG_MESSAGE_HINT ).should be_nil()
-		result.error_field( PGresult::PG_DIAG_STATEMENT_POSITION ).should == '15'
-		result.error_field( PGresult::PG_DIAG_INTERNAL_POSITION ).should be_nil()
-		result.error_field( PGresult::PG_DIAG_INTERNAL_QUERY ).should be_nil()
-		result.error_field( PGresult::PG_DIAG_CONTEXT ).should be_nil()
-		result.error_field( PGresult::PG_DIAG_SOURCE_FILE ).should =~ /parse_relation\.c$/
-		result.error_field( PGresult::PG_DIAG_SOURCE_LINE ).should == '857'
-		result.error_field( PGresult::PG_DIAG_SOURCE_FUNCTION ).should == 'parserOpenTable'
+		result.error_field( PG::PG_DIAG_MESSAGE_DETAIL ).should be_nil()
+		result.error_field( PG::PG_DIAG_MESSAGE_HINT ).should be_nil()
+		result.error_field( PG::PG_DIAG_STATEMENT_POSITION ).should == '15'
+		result.error_field( PG::PG_DIAG_INTERNAL_POSITION ).should be_nil()
+		result.error_field( PG::PG_DIAG_INTERNAL_QUERY ).should be_nil()
+		result.error_field( PG::PG_DIAG_CONTEXT ).should be_nil()
+		result.error_field( PG::PG_DIAG_SOURCE_FILE ).should =~ /parse_relation\.c$|namespace\.c$/
+		result.error_field( PG::PG_DIAG_SOURCE_LINE ).should =~ /^\d+$/
+		result.error_field( PG::PG_DIAG_SOURCE_FUNCTION ).should =~ /^parserOpenTable$|^RangeVarGetRelid$/
+	end
+
+	it "encapsulates database object names for integrity constraint violations", :postgresql_93 do
+		@conn.exec( "CREATE TABLE integrity (id SERIAL PRIMARY KEY)" )
+		exception = nil
+		begin
+			@conn.exec( "INSERT INTO integrity VALUES (NULL)" )
+		rescue PGError => err
+			exception = err
+		end
+		result = exception.result
 
+		result.error_field( PG::PG_DIAG_SCHEMA_NAME ).should == 'public'
+		result.error_field( PG::PG_DIAG_TABLE_NAME ).should == 'integrity'
+		result.error_field( PG::PG_DIAG_COLUMN_NAME ).should == 'id'
+		result.error_field( PG::PG_DIAG_DATATYPE_NAME ).should be_nil
+		result.error_field( PG::PG_DIAG_CONSTRAINT_NAME ).should be_nil
 	end
 
 	it "should detect division by zero as SQLSTATE 22012" do
@@ -73,7 +104,7 @@ describe PGresult do
 		begin
 			res = @conn.exec("SELECT 1/0")
 		rescue PGError => e
-			sqlstate = e.result.result_error_field( PGresult::PG_DIAG_SQLSTATE ).to_i
+			sqlstate = e.result.result_error_field( PG::PG_DIAG_SQLSTATE ).to_i
 		end
 		sqlstate.should == 22012
 	end
@@ -81,27 +112,31 @@ describe PGresult do
 	it "should return the same bytes in binary format that are sent in binary format" do
 		binary_file = File.join(Dir.pwd, 'spec/data', 'random_binary_data')
 		bytes = File.open(binary_file, 'rb').read
-		res = @conn.exec('VALUES ($1::bytea)', 
+		res = @conn.exec('VALUES ($1::bytea)',
 			[ { :value => bytes, :format => 1 } ], 1)
 		res[0]['column1'].should== bytes
+		res.getvalue(0,0).should == bytes
+		res.values[0][0].should == bytes
+		res.column_values(0)[0].should == bytes
 	end
 
 	it "should return the same bytes in binary 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, 'rb').read
-		out_bytes = nil
+		bytes = File.open(binary_file, 'rb').read
 		@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
+		res = @conn.exec("VALUES ('#{PG::Connection.escape_bytea(bytes)}'::bytea)", [], 1)
+		res[0]['column1'].should == bytes
+		res.getvalue(0,0).should == bytes
+		res.values[0][0].should == bytes
+		res.column_values(0)[0].should == bytes
 	end
 
 	it "should return the same bytes in text format that are sent in binary format" do
 		binary_file = File.join(Dir.pwd, 'spec/data', 'random_binary_data')
 		bytes = File.open(binary_file, 'rb').read
-		res = @conn.exec('VALUES ($1::bytea)', 
+		res = @conn.exec('VALUES ($1::bytea)',
 			[ { :value => bytes, :format => 1 } ])
-		PGconn.unescape_bytea(res[0]['column1']).should== bytes
+		PG::Connection.unescape_bytea(res[0]['column1']).should== bytes
 	end
 
 	it "should return the same bytes in text format that are sent as inline text" do
@@ -110,13 +145,13 @@ describe PGresult do
 
 		out_bytes = nil
 		@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'])
+		res = @conn.exec("VALUES ('#{PG::Connection.escape_bytea(in_bytes)}'::bytea)", [], 0)
+		out_bytes = PG::Connection.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'
+	it "should return the parameter type of the specified prepared statement parameter", :postgresql_92 do
+		query = 'SELECT * FROM pg_stat_activity WHERE user = $1::name AND query = $2::text'
 		@conn.prepare( 'queryfinder', query )
 		res = @conn.describe_prepared( 'queryfinder' )
 
@@ -163,19 +198,19 @@ describe PGresult do
 		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
+	it "should raise an exception when an invalid index is passed to PG::Result#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
+	it "should raise an exception when an invalid (negative) index is passed to PG::Result#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
+	it "shouldn't raise an exception when a valid index is passed to PG::Result#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
@@ -189,25 +224,25 @@ describe PGresult do
 		res.ftable( 0 ).should == be_nonzero()
 	end
 
-	it "should raise an exception when an invalid index is passed to PGresult#ftable" do
+	it "should raise an exception when an invalid index is passed to PG::Result#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
+	it "should raise an exception when an invalid (negative) index is passed to PG::Result#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 " +
+	it "shouldn't raise an exception when a valid index is passed to PG::Result#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
+		res.ftable( 1 ).should == PG::INVALID_OID # and it shouldn't raise an exception, either
 	end
 
 	# PQftablecol
@@ -219,32 +254,92 @@ describe PGresult do
 		res.ftablecol( 1 ).should == 2
 	end
 
-	it "should raise an exception when an invalid index is passed to PGresult#ftablecol" do
+	it "should raise an exception when an invalid index is passed to PG::Result#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
+	it "should raise an exception when an invalid (negative) index is passed to PG::Result#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 " +
+	it "shouldn't raise an exception when a valid index is passed to PG::Result#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' )
+	it "can be manually checked for failed result status (async API)" do
+		@conn.send_query( "SELECT * FROM nonexistant_table" )
+		res = @conn.get_result
+		expect {
+			res.check
+		}.to raise_error( PG::Error, /relation "nonexistant_table" does not exist/ )
 	end
 
-	after( :all ) do
-		teardown_testing_db( @conn )
+	it "can return the values of a single field" do
+		res = @conn.exec( "SELECT 1 AS x, 'a' AS y UNION ALL SELECT 2, 'b'" )
+		res.field_values( 'x' ).should == ['1', '2']
+		res.field_values( 'y' ).should == ['a', 'b']
+		expect{ res.field_values( '' ) }.to raise_error(IndexError)
+		expect{ res.field_values( :x ) }.to raise_error(TypeError)
+	end
+
+	it "should raise a proper exception for a nonexistant table" do
+		expect {
+			@conn.exec( "SELECT * FROM nonexistant_table" )
+		}.to raise_error( PG::UndefinedTable, /relation "nonexistant_table" does not exist/ )
+	end
+
+	it "should raise a more generic exception for an unknown SQLSTATE" do
+		old_error = PG::ERROR_CLASSES.delete('42P01')
+		begin
+			expect {
+				@conn.exec( "SELECT * FROM nonexistant_table" )
+			}.to raise_error{|error|
+				error.should be_an_instance_of(PG::SyntaxErrorOrAccessRuleViolation)
+				error.to_s.should match(/relation "nonexistant_table" does not exist/)
+			}
+		ensure
+			PG::ERROR_CLASSES['42P01'] = old_error
+		end
+	end
+
+	it "should raise a ServerError for an unknown SQLSTATE class" do
+		old_error1 = PG::ERROR_CLASSES.delete('42P01')
+		old_error2 = PG::ERROR_CLASSES.delete('42')
+		begin
+			expect {
+				@conn.exec( "SELECT * FROM nonexistant_table" )
+			}.to raise_error{|error|
+				error.should be_an_instance_of(PG::ServerError)
+				error.to_s.should match(/relation "nonexistant_table" does not exist/)
+			}
+		ensure
+			PG::ERROR_CLASSES['42P01'] = old_error1
+			PG::ERROR_CLASSES['42'] = old_error2
+		end
+	end
+
+	it "should raise a proper exception for a nonexistant schema" do
+		expect {
+			@conn.exec( "DROP SCHEMA nonexistant_schema" )
+		}.to raise_error( PG::InvalidSchemaName, /schema "nonexistant_schema" does not exist/ )
+	end
+
+	it "the raised result should be nil in case of a connection error" do
+		c = PGconn.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" )
+		expect {
+			c.exec "select 1"
+		}.to raise_error{|error|
+			error.should be_an_instance_of(PG::UnableToSend)
+			error.result.should == nil
+		}
 	end
 end

data/spec/pg_spec.rb

@@ -0,0 +1,44 @@
+#!/usr/bin/env rspec
+# encoding: utf-8
+
+BEGIN {
+	require 'pathname'
+
+	basedir = Pathname( __FILE__ ).dirname.parent
+	libdir = basedir + 'lib'
+
+	$LOAD_PATH.unshift( basedir.to_s ) unless $LOAD_PATH.include?( basedir.to_s )
+	$LOAD_PATH.unshift( libdir.to_s ) unless $LOAD_PATH.include?( libdir.to_s )
+}
+
+require 'rspec'
+require 'spec/lib/helpers'
+require 'pg'
+
+describe PG do
+
+	it "knows what version of the libpq library is loaded", :postgresql_91 do
+		PG.library_version.should be_an( Integer )
+		PG.library_version.should >= 90100
+	end
+
+
+	it "knows whether or not the library is threadsafe" do
+		PG.should be_threadsafe()
+	end
+
+	it "does have hierarchical error classes" do
+		PG::UndefinedTable.ancestors[0,4].should == [
+				PG::UndefinedTable,
+				PG::SyntaxErrorOrAccessRuleViolation,
+				PG::ServerError,
+				PG::Error]
+
+		PG::InvalidSchemaName.ancestors[0,3].should == [
+				PG::InvalidSchemaName,
+				PG::ServerError,
+				PG::Error]
+	end
+
+end
+