pg 0.18.3 → 1.0.0

data/spec/pg/result_spec.rb

@@ -39,7 +39,7 @@ describe PG::Result do
 		expect( e.to_a ).to eq [{'a'=>'1', 'b'=>'2'}]
 	end
 
-	context "result streaming", :postgresql_92 do
+	context "result streaming" do
 		it "can iterate over all tuples in single row mode" do
 			@conn.send_query( "SELECT generate_series(2,4) AS a; SELECT 1 AS b, generate_series(5,6) AS c" )
 			@conn.set_single_row_mode
@@ -100,11 +100,11 @@ describe PG::Result do
 		expect( res[0]['n'] ).to be_nil()
 	end
 
-	it "encapsulates errors in a PGError object" do
+	it "encapsulates errors in a PG::Error object" do
 		exception = nil
 		begin
 			@conn.exec( "SELECT * FROM nonexistant_table" )
-		rescue PGError => err
+		rescue PG::Error => err
 			exception = err
 		end
 
@@ -136,7 +136,7 @@ describe PG::Result do
 		exception = nil
 		begin
 			@conn.exec( "INSERT INTO integrity VALUES (NULL)" )
-		rescue PGError => err
+		rescue PG::Error => err
 			exception = err
 		end
 		result = exception.result
@@ -152,7 +152,7 @@ describe PG::Result do
 		sqlstate = nil
 		begin
 			res = @conn.exec("SELECT 1/0")
-		rescue PGError => e
+		rescue PG::Error => e
 			sqlstate = e.result.result_error_field( PG::PG_DIAG_SQLSTATE ).to_i
 		end
 		expect( sqlstate ).to eq( 22012 )
@@ -199,7 +199,7 @@ describe PG::Result do
 		expect( out_bytes ).to eq( in_bytes )
 	end
 
-	it "returns the parameter type of the specified prepared statement parameter", :postgresql_92 do
+	it "returns the parameter type of the specified prepared statement parameter" do
 		query = 'SELECT * FROM pg_stat_activity WHERE user = $1::name AND query = $2::text'
 		@conn.prepare( 'queryfinder', query )
 		res = @conn.describe_prepared( 'queryfinder' )
@@ -386,7 +386,7 @@ describe PG::Result do
 	end
 
 	it "the raised result is nil in case of a connection error" do
-		c = PGconn.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" )
+		c = PG::Connection.connect_start( '127.0.0.1', 54320, "", "", "me", "xxxx", "somedb" )
 		expect {
 			c.exec "select 1"
 		}.to raise_error {|error|
@@ -403,6 +403,13 @@ describe PG::Result do
 		expect( r.cleared? ).to eq(true)
 	end
 
+	it "can be inspected before and after clear" do
+		r = @conn.exec "select 1"
+		expect( r.inspect ).to match(/status=PGRES_TUPLES_OK/)
+		r.clear
+		expect( r.inspect ).to match(/cleared/)
+	end
+
 	context 'result value conversions with TypeMapByColumn' do
 		let!(:textdec_int){ PG::TextDecoder::Integer.new name: 'INT4', oid: 23 }
 		let!(:textdec_float){ PG::TextDecoder::Float.new name: 'FLOAT4', oid: 700 }

data/spec/pg/type_map_by_class_spec.rb

@@ -59,7 +59,7 @@ describe PG::TypeMapByClass do
 	it "should retrieve particular conversions" do
 		expect( tm[Integer] ).to eq(binaryenc_int)
 		expect( tm[Float] ).to eq(textenc_float)
-		expect( tm[Bignum] ).to be_nil
+		expect( tm[Range] ).to be_nil
 		expect( derived_tm[raise_class] ).to be_kind_of(Proc)
 		expect( derived_tm[Array] ).to eq(:array_type_map_for)
 	end
@@ -102,7 +102,7 @@ describe PG::TypeMapByClass do
 
 	it "should allow mixed type conversions" do
 		res = @conn.exec_params( "SELECT $1, $2, $3", [5, 1.23, :TestSymbol], 0, tm )
-		expect( res.values ).to eq([['5', '1.23', '[:TestSymbol]']])
+		expect( res.values ).to eq([['5', '1.23', "[:TestSymbol, #{@conn.internal_encoding.inspect}]"]])
 		expect( res.ftype(0) ).to eq(20)
 	end
 

data/spec/pg/type_map_by_mri_type_spec.rb

@@ -116,7 +116,7 @@ describe PG::TypeMapByMriType do
 
 	it "should allow mixed type conversions" do
 		res = @conn.exec_params( "SELECT $1, $2, $3", [5, 1.23, :TestSymbol], 0, tm )
-		expect( res.values ).to eq([['5', '1.23', '[:TestSymbol]']])
+		expect( res.values ).to eq([['5', '1.23', "[:TestSymbol, #{@conn.internal_encoding.inspect}]"]])
 		expect( res.ftype(0) ).to eq(20)
 	end
 

data/spec/pg/type_spec.rb

@@ -39,6 +39,14 @@ describe "PG::Type derivations" do
 		end.new
 	end
 
+	let!(:intenc_incrementer_with_encoding) do
+		Class.new(PG::SimpleEncoder) do
+			def encode(value, encoding)
+				r = (value.to_i + 1).to_s + " #{encoding}"
+				r.encode!(encoding)
+			end
+		end.new
+	end
 	let!(:intenc_incrementer_with_int_result) do
 		Class.new(PG::SimpleEncoder) do
 			def encode(value)
@@ -67,7 +75,7 @@ describe "PG::Type derivations" do
 				expect( intdec_incrementer.decode("3") ).to eq( 4 )
 			end
 
-			it "should decode integers of different lengths form text format" do
+			it "should decode integers of different lengths from text format" do
 				30.times do |zeros|
 					expect( textdec_int.decode("1" + "0"*zeros) ).to eq( 10 ** zeros )
 					expect( textdec_int.decode(zeros==0 ? "0" : "9"*zeros) ).to eq( 10 ** zeros - 1 )
@@ -127,6 +135,13 @@ describe "PG::Type derivations" do
 					expect( quoted_type.decode(%[a.b]) ).to eq( ['a','b'] )
 					expect( quoted_type.decode(%[a]) ).to eq( ['a'] )
 				end
+
+				it 'should split identifier string with correct character encoding' do
+					quoted_type = PG::TextDecoder::Identifier.new
+					v = quoted_type.decode(%[Héllo].encode("iso-8859-1")).first
+					expect( v.encoding ).to eq( Encoding::ISO_8859_1 )
+					expect( v ).to eq( %[Héllo].encode(Encoding::ISO_8859_1) )
+				end
 			end
 
 			it "should raise when decode method is called with wrong args" do
@@ -206,6 +221,20 @@ describe "PG::Type derivations" do
 					expect( quoted_type.encode(['schema','table','col']) ).to eq( %["schema"."table"."col"] )
 					expect( quoted_type.encode(['A.','.B']) ).to eq( %["A.".".B"] )
 					expect( quoted_type.encode(%['A"."B']) ).to eq( %["'A"".""B'"] )
+					expect( quoted_type.encode( nil ) ).to be_nil
+				end
+
+				it 'should quote identifiers with correct character encoding' do
+					quoted_type = PG::TextEncoder::Identifier.new
+					v = quoted_type.encode(['Héllo'], "iso-8859-1")
+					expect( v ).to eq( %["Héllo"].encode(Encoding::ISO_8859_1) )
+					expect( v.encoding ).to eq( Encoding::ISO_8859_1 )
+				end
+
+				it "will raise a TypeError for invalid arguments to quote_ident" do
+					quoted_type = PG::TextEncoder::Identifier.new
+					expect{ quoted_type.encode( [nil] ) }.to raise_error(TypeError)
+					expect{ quoted_type.encode( [['a']] ) }.to raise_error(TypeError)
 				end
 			end
 
@@ -213,6 +242,12 @@ describe "PG::Type derivations" do
 				expect( intenc_incrementer.encode(3) ).to eq( "4 " )
 			end
 
+			it "should encode with ruby encoder and given character encoding" do
+				r = intenc_incrementer_with_encoding.encode(3, Encoding::CP850)
+				expect( r ).to eq( "4 CP850" )
+				expect( r.encoding ).to eq( Encoding::CP850 )
+			end
+
 			it "should return when ruby encoder returns non string values" do
 				expect( intenc_incrementer_with_int_result.encode(3) ).to eq( 4 )
 			end
@@ -440,9 +475,18 @@ describe "PG::Type derivations" do
 				end
 
 				context 'array of types with encoder in ruby space' do
-					it 'encodes with quotation' do
+					it 'encodes with quotation and default character encoding' do
+						array_type = PG::TextEncoder::Array.new elements_type: intenc_incrementer, needs_quotation: true
+						r = array_type.encode([3,4])
+						expect( r ).to eq( %[{"4 ","5 "}] )
+						expect( r.encoding ).to eq( Encoding::ASCII_8BIT )
+					end
+
+					it 'encodes with quotation and given character encoding' do
 						array_type = PG::TextEncoder::Array.new elements_type: intenc_incrementer, needs_quotation: true
-						expect( array_type.encode([3,4]) ).to eq( %[{"4 ","5 "}] )
+						r = array_type.encode([3,4], Encoding::CP850)
+						expect( r ).to eq( %[{"4 ","5 "}] )
+						expect( r.encoding ).to eq( Encoding::CP850 )
 					end
 
 					it 'encodes without quotation' do
@@ -450,6 +494,20 @@ describe "PG::Type derivations" do
 						expect( array_type.encode([3,4]) ).to eq( %[{4 ,5 }] )
 					end
 
+					it 'encodes with default character encoding' do
+						array_type = PG::TextEncoder::Array.new elements_type: intenc_incrementer_with_encoding
+						r = array_type.encode([3,4])
+						expect( r ).to eq( %[{"4 ASCII-8BIT","5 ASCII-8BIT"}] )
+						expect( r.encoding ).to eq( Encoding::ASCII_8BIT )
+					end
+
+					it 'encodes with given character encoding' do
+						array_type = PG::TextEncoder::Array.new elements_type: intenc_incrementer_with_encoding
+						r = array_type.encode([3,4], Encoding::CP850)
+						expect( r ).to eq( %[{"4 CP850","5 CP850"}] )
+						expect( r.encoding ).to eq( Encoding::CP850 )
+					end
+
 					it "should raise when ruby encoder returns non string values" do
 						array_type = PG::TextEncoder::Array.new elements_type: intenc_incrementer_with_int_result, needs_quotation: false
 						expect{ array_type.encode([3,4]) }.to raise_error(TypeError)
@@ -466,6 +524,13 @@ describe "PG::Type derivations" do
 						quoted_type = PG::TextEncoder::QuotedLiteral.new elements_type: textenc_string_array
 						expect( quoted_type.encode(["'A\",","\\B'"]) ).to eq( %['{"''A\\",","\\\\B''"}'] )
 					end
+
+					it 'should quote literals with correct character encoding' do
+						quoted_type = PG::TextEncoder::QuotedLiteral.new elements_type: textenc_string_array
+						v = quoted_type.encode(["Héllo"], "iso-8859-1")
+						expect( v.encoding ).to eq( Encoding::ISO_8859_1 )
+						expect( v ).to eq( %['{Héllo}'].encode(Encoding::ISO_8859_1) )
+					end
 				end
 			end
 
@@ -515,9 +580,19 @@ describe "PG::Type derivations" do
 			expect( e.encode("(\xFBm") ).to eq("KPtt")
 		end
 
+		it 'should encode Strings as base64 with correct character encoding' do
+			e = PG::TextEncoder::ToBase64.new
+			v = e.encode("Héllo".encode("utf-16le"), "iso-8859-1")
+			expect( v ).to eq("SOlsbG8=")
+			expect( v.encoding ).to eq(Encoding::ISO_8859_1)
+		end
+
 		it "should encode Strings as base64 in BinaryDecoder" do
 			e = PG::BinaryDecoder::ToBase64.new
 			expect( e.decode("x") ).to eq("eA==")
+			v = e.decode("Héllo".encode("utf-16le"))
+			expect( v ).to eq("SADpAGwAbABvAA==")
+			expect( v.encoding ).to eq(Encoding::ASCII_8BIT)
 		end
 
 		it "should encode Integers as base64" do
@@ -604,6 +679,12 @@ describe "PG::Type derivations" do
 					expect( encoder.encode([:xyz, 123, 2456, 34567, 456789, 5678901, [1,2,3], 12.1, "abcdefg", nil]) ).
 						to eq("xyz\t123\t2456\t34567\t456789\t5678901\t[1, 2, 3]\t12.1\tabcdefg\t\\N\n")
 				end
+
+				it 'should output a string with correct character encoding' do
+					v = encoder.encode(["Héllo"], "iso-8859-1")
+					expect( v.encoding ).to eq( Encoding::ISO_8859_1 )
+					expect( v ).to eq( "Héllo\n".encode(Encoding::ISO_8859_1) )
+				end
 			end
 
 			context "with TypeMapByClass" do
@@ -668,6 +749,12 @@ describe "PG::Type derivations" do
 					it "should decode different types of Ruby objects" do
 						expect( decoder.decode("123\t \0#\t#\n#\r#\\ \t234\t#\x01#\002\n".gsub("#", "\\"))).to eq( ["123", " \0\t\n\r\\ ", "234", "\x01\x02"] )
 					end
+
+					it 'should respect input character encoding' do
+						v = decoder.decode("Héllo\n".encode("iso-8859-1")).first
+						expect( v.encoding ).to eq(Encoding::ISO_8859_1)
+						expect( v ).to eq("Héllo".encode("iso-8859-1"))
+					end
 				end
 			end
 

data/spec/pg_spec.rb

@@ -7,7 +7,7 @@ require 'pg'
 
 describe PG do
 
-	it "knows what version of the libpq library is loaded", :postgresql_91 do
+	it "knows what version of the libpq library is loaded" do
 		expect( PG.library_version ).to be_an( Integer )
 		expect( PG.library_version ).to be >= 90100
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 0.18.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Michael Granger
@@ -11,27 +11,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
+  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTUwNDAxMjEyNDEzWhcNMTYwMzMxMjEyNDEzWjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTcwOTI3MDAzMDQ0WhcNMTgwOTI3MDAzMDQ0WjA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDb92mkyYwuGBg1oRxt2tkH
-  +Uo3LAsaL/APBfSLzy8o3+B3AUHKCjMUaVeBoZdWtMHB75X3VQlvXfZMyBxj59Vo
-  cDthr3zdao4HnyrzAIQf7BO5Y8KBwVD+yyXCD/N65TTwqsQnO3ie7U5/9ut1rnNr
-  OkOzAscMwkfQxBkXDzjvAWa6UF4c5c9kR/T79iA21kDx9+bUMentU59aCJtUcbxa
-  7kcKJhPEYsk4OdxR9q2dphNMFDQsIdRO8rywX5FRHvcb+qnXC17RvxLHtOjysPtp
-  EWsYoZMxyCDJpUqbwoeiM+tAHoz2ABMv3Ahie3Qeb6+MZNAtMmaWfBx3dg2u+/WN
-  AgMBAAGjdTBzMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSZ0hCV
-  qoHr122fGKelqffzEQBhszAcBgNVHREEFTATgRFnZWRARmFlcmllTVVELm9yZzAc
-  BgNVHRIEFTATgRFnZWRARmFlcmllTVVELm9yZzANBgkqhkiG9w0BAQUFAAOCAQEA
-  lUKo3NXePpuvN3QGsOLJ6QhNd4+Q9Rz75GipuMrCl296V8QFkd2gg9EG44Pqtk+9
-  Zac8TkKc9bCSR0snakp+cCPplVvZF0/gMzkSTUJkDBHlNV16z73CyWpbQQa+iLJ4
-  uisI6gF2ZXK919MYLn2bFJfb7OsCvVfyTPqq8afPY+rq9vlf9ZPwU49AlD8bPRic
-  0LX0gO5ykvETIOv+WgGcqp96ceNi9XVuJMh20uWuw6pmv/Ub2RqAf82jQSbpz09G
-  G8LHR7EjtPPmqCCunfyecJ6MmCNaiJCBxq2NYzyNmluPyHT8+0fuB5kccUVZm6CD
-  xn3DzOkDE6NYbk8gC9rTsA==
+  ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC/JWGRHO+USzR97vXjkFgt
+  83qeNf2KHkcvrRTSnR64i6um/ziin0I0oX23H7VYrDJC9A/uoUa5nGRJS5Zw/+wW
+  ENcvWVZS4iUzi4dsYJGY6yEOsXh2CcF46+QevV8iE+UmbkU75V7Dy1JCaUOyizEt
+  TH5UHsOtUU7k9TYARt/TgYZKuaoAMZZd5qyVqhF1vV+7/Qzmp89NGflXf2xYP26a
+  4MAX2qqKX/FKXqmFO+AGsbwYTEds1mksBF3fGsFgsQWxftG8GfZQ9+Cyu2+l1eOw
+  cZ+lPcg834G9DrqW2zhqUoLr1MTly4pqxYGb7XoDhoR7dd1kFE2a067+DzWC/ADt
+  +QkcqWUm5oh1fN0eqr7NsZlVJDulFgdiiYPQiIN7UNsii4Wc9aZqBoGcYfBeQNPZ
+  soo/6za/bWajOKUmDhpqvaiRv9EDpVLzuj53uDoukMMwxCMfgb04+ckQ0t2G7wqc
+  /D+K9JW9DDs3Yjgv9k4h7YMhW5gftosd+NkNC/+Y2CkCAwEAAaN1MHMwCQYDVR0T
+  BAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFHKN/nkRusdqCJEuq3lgB3fJvyTg
+  MBwGA1UdEQQVMBOBEWdlZEBGYWVyaWVNVUQub3JnMBwGA1UdEgQVMBOBEWdlZEBG
+  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBBQUAA4IBgQB/qyi5pCjK8ceoKalfVAjS
+  vG64FEnLnD1bm39T5UaFIRmo+abZtfpg2QhwKvPbPjOicau2+m+MDQ2Cc3tgyaC3
+  dZxcP6w8APFg4AId09uWAZKf0xajvBMS2aOz8Bbmag6fwqRRkTMqsNYnmqcF7aRT
+  DuEzbEMfaOUYjU9RuB48vr4q8yRft0ww+3jq5iwNkrX1buL2pwBbyvgms6D/BV41
+  MaTVMjsHqJUwU2xVfhGtxGAWAer5S1HGYHkbio6mGVtiie0uWjmnzi7ppIlMr48a
+  7BNTsoZ+/JRk3iQWmmNsyFT7xfqBKye7cH11BX8V8P4MeGB5YWlMI+Myj5DZY3fQ
+  st2AGD4rb1l0ia7PfubcBThSIdz61eCb8gRi/RiZZwb3/7+eyEncLJzt2Ob9fGSF
+  X0qdrKi+2aZZ0NGuFj9AItBsVmAvkBGIpX4TEKQp5haEbPpmaqO5nIIhV26PXmyT
+  OMKv6pWsoS81vw5KAGBmfX8nht/Py90DQrbRvakATGI=
   -----END CERTIFICATE-----
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hoe-mercurial
@@ -53,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hoe-highline
   requirement: !ruby/object:Gem::Requirement
@@ -76,93 +81,99 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
+  name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.2
 - !ruby/object:Gem::Dependency
-  name: rake-compiler-dock
+  name: hoe-bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: hoe-bundler
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.16'
 description: |-
   Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/].
 
-  It works with {PostgreSQL 8.4 and later}[http://www.postgresql.org/support/versioning/].
+  It works with {PostgreSQL 9.2 and later}[http://www.postgresql.org/support/versioning/].
 
   A small example usage:
 
@@ -174,7 +185,7 @@ description: |-
     conn = PG.connect( dbname: 'sales' )
     conn.exec( "SELECT * FROM pg_stat_activity" ) do |result|
       puts "     PID | User             | Query"
-    result.each do |row|
+      result.each do |row|
         puts " %7d | %-16s | %s " %
           row.values_at('procpid', 'usename', 'current_query')
       end
@@ -269,24 +280,6 @@ files:
 - lib/pg/text_decoder.rb
 - lib/pg/text_encoder.rb
 - lib/pg/type_map_by_column.rb
-- sample/array_insert.rb
-- sample/async_api.rb
-- sample/async_copyto.rb
-- sample/async_mixed.rb
-- sample/check_conn.rb
-- sample/copyfrom.rb
-- sample/copyto.rb
-- sample/cursor.rb
-- sample/disk_usage_report.rb
-- sample/issue-119.rb
-- sample/losample.rb
-- sample/minimal-testcase.rb
-- sample/notify_wait.rb
-- sample/pg_statistics.rb
-- sample/replication_monitor.rb
-- sample/test_binary_values.rb
-- sample/wal_shipper.rb
-- sample/warehouse_partitions.rb
 - spec/data/expected_trace.out
 - spec/data/random_binary_data
 - spec/helpers.rb
@@ -303,17 +296,11 @@ files:
 - spec/pg_spec.rb
 homepage: https://bitbucket.org/ged/ruby-pg
 licenses:
-- BSD
-- Ruby
-- GPL
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "-f"
-- fivefish
-- "-t"
-- 'pg: The Ruby Interface to PostgreSQL'
-- "-m"
+- "--main"
 - README.rdoc
 require_paths:
 - lib
@@ -321,7 +308,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -329,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Pg is the Ruby interface to the {PostgreSQL RDBMS}[http://www.postgresql.org/]

data/sample/array_insert.rb

@@ -1,20 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pg'
-
-c = PG.connect( dbname: 'test' )
-
-# this one works:
-c.exec( "DROP TABLE IF EXISTS foo" )
-c.exec( "CREATE TABLE foo (strings character varying[]);" )
-
-# But using a prepared statement works:
-c.set_error_verbosity( PG::PQERRORS_VERBOSE )
-c.prepare( 'stmt', "INSERT INTO foo VALUES ($1);" )
-
-# This won't work
-#c.exec_prepared( 'stmt', ["ARRAY['this','that']"] )
-
-# but this will:
-c.exec_prepared( 'stmt', ["{'this','that'}"] )
-

data/sample/async_api.rb

@@ -1,106 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pg'
-
-# This is a example of how to use the asynchronous API to query the
-# server without blocking other threads. It's intentionally low-level;
-# if you hooked up the PG::Connection#socket to some kind of reactor, you
-# could make this much nicer.
-
-TIMEOUT = 5.0 # seconds to wait for an async operation to complete
-
-# Print 'x' continuously to demonstrate that other threads aren't
-# blocked while waiting for the connection, for the query to be sent,
-# for results, etc. You might want to sleep inside the loop or
-# comment this out entirely for cleaner output.
-progress_thread = Thread.new { loop { print 'x' } }
-
-# Output progress messages
-def output_progress( msg )
-	puts "\n>>> #{msg}\n"
-end
-
-# Start the connection
-output_progress "Starting connection..."
-conn = PG::Connection.connect_start( :dbname => 'test' ) or
-	abort "Unable to create a new connection!"
-abort "Connection failed: %s" % [ conn.error_message ] if
-	conn.status == PG::CONNECTION_BAD
-
-# Now grab a reference to the underlying socket so we know when the
-# connection is established
-socket = conn.socket_io
-
-# Track the progress of the connection, waiting for the socket to become readable/writable
-# before polling it
-poll_status = PG::PGRES_POLLING_WRITING
-until poll_status == PG::PGRES_POLLING_OK ||
-	  poll_status == PG::PGRES_POLLING_FAILED
-
-	# If the socket needs to read, wait 'til it becomes readable to poll again
-	case poll_status
-	when PG::PGRES_POLLING_READING
-		output_progress "  waiting for socket to become readable"
-		select( [socket], nil, nil, TIMEOUT ) or
-			raise "Asynchronous connection timed out!"
-
-	# ...and the same for when the socket needs to write
-	when PG::PGRES_POLLING_WRITING
-		output_progress "  waiting for socket to become writable"
-		select( nil, [socket], nil, TIMEOUT ) or
-			raise "Asynchronous connection timed out!"
-	end
-
-	# Output a status message about the progress
-	case conn.status
-	when PG::CONNECTION_STARTED
-		output_progress "  waiting for connection to be made."
-	when PG::CONNECTION_MADE
-		output_progress "  connection OK; waiting to send."
-	when PG::CONNECTION_AWAITING_RESPONSE
-		output_progress "  waiting for a response from the server."
-	when PG::CONNECTION_AUTH_OK
-		output_progress "  received authentication; waiting for backend start-up to finish."
-	when PG::CONNECTION_SSL_STARTUP
-		output_progress "  negotiating SSL encryption."
-	when PG::CONNECTION_SETENV
-		output_progress "  negotiating environment-driven parameter settings."
-	when PG::CONNECTION_NEEDED
-		output_progress "  internal state: connect() needed."
-	end
-
-	# Check to see if it's finished or failed yet
-	poll_status = conn.connect_poll
-end
-
-abort "Connect failed: %s" % [ conn.error_message ] unless conn.status == PG::CONNECTION_OK
-
-output_progress "Sending query"
-conn.send_query( "SELECT * FROM pg_stat_activity" )
-
-# Fetch results until there aren't any more
-loop do
-	output_progress "  waiting for a response"
-
-	# Buffer any incoming data on the socket until a full result is ready.
-	conn.consume_input
-	while conn.is_busy
-		select( [socket], nil, nil, TIMEOUT ) 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 or break
-
-	puts "\n\nQuery result:\n%p\n" % [ result.values ]
-end
-
-output_progress "Done."
-conn.finish
-
-if defined?( progress_thread )
-	progress_thread.kill
-	progress_thread.join
-end
-