pg 0.15.1 → 0.16.0

data/spec/pg/result_spec.rb

@@ -73,15 +73,30 @@ describe PG::Result do
 			should == 'relation "nonexistant_table" does not exist'
 		result.error_field( PG::PG_DIAG_MESSAGE_DETAIL ).should be_nil()
 		result.error_field( PG::PG_DIAG_MESSAGE_HINT ).should be_nil()
-		statement_pos = RSpec.configuration.exclusion_filter[:postgresql_90] ? nil : '15'
-		result.error_field( PG::PG_DIAG_STATEMENT_POSITION ).should == statement_pos
+		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
@@ -275,4 +290,56 @@ describe PG::Result do
 		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

@@ -27,5 +27,18 @@ describe PG 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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Michael Granger
@@ -30,7 +30,7 @@ cert_chain:
   6mKCwjpegytE0oifXfF8k75A9105cBnNiMZOe1tXiqYc/exCgWvbggurzDOcRkZu
   /YSusaiDXHKU2O3Akc3htA==
   -----END CERTIFICATE-----
-date: 2013-04-08 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
@@ -66,14 +66,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -149,11 +149,13 @@ extra_rdoc_files:
 - README-Windows.rdoc
 - README.ja.rdoc
 - README.rdoc
+- ext/errorcodes.txt
 - POSTGRES
 - LICENSE
 - ext/gvl_wrappers.c
 - ext/pg.c
 - ext/pg_connection.c
+- ext/pg_errors.c
 - ext/pg_result.c
 files:
 - .gemtest
@@ -170,12 +172,16 @@ files:
 - README.rdoc
 - Rakefile
 - Rakefile.cross
+- ext/errorcodes.def
+- ext/errorcodes.rb
+- ext/errorcodes.txt
 - ext/extconf.rb
 - ext/gvl_wrappers.c
 - ext/gvl_wrappers.h
 - ext/pg.c
 - ext/pg.h
 - ext/pg_connection.c
+- ext/pg_errors.c
 - ext/pg_result.c
 - ext/vc/pg.sln
 - ext/vc/pg_18/pg.vcproj
@@ -237,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: pg
-rubygems_version: 2.0.3
+rubygems_version: 2.0.5
 signing_key: 
 specification_version: 4
 summary: Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/]