pg 0.18.4 → 0.21.0

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)
@@ -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
@@ -209,6 +224,13 @@ describe "PG::Type derivations" do
 					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)
@@ -220,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
@@ -447,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
@@ -457,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)
@@ -473,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
 
@@ -522,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
@@ -611,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
@@ -675,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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg
 version: !ruby/object:Gem::Version
-  version: 0.18.4
+  version: 0.21.0
 platform: ruby
 authors:
 - Michael Granger
@@ -11,27 +11,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDbDCCAlSgAwIBAgIBATANBgkqhkiG9w0BAQUFADA+MQwwCgYDVQQDDANnZWQx
+  MIIEbDCCAtSgAwIBAgIBATANBgkqhkiG9w0BAQsFADA+MQwwCgYDVQQDDANnZWQx
   GTAXBgoJkiaJk/IsZAEZFglGYWVyaWVNVUQxEzARBgoJkiaJk/IsZAEZFgNvcmcw
-  HhcNMTUwNDAxMjEyNDEzWhcNMTYwMzMxMjEyNDEzWjA+MQwwCgYDVQQDDANnZWQx
+  HhcNMTYwODIwMTgxNzQyWhcNMTcwODIwMTgxNzQyWjA+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
+  YWVyaWVNVUQub3JnMA0GCSqGSIb3DQEBCwUAA4IBgQAPJzKiT0zBU7kpqe0aS2qb
+  FI0PJ4y5I8buU4IZGUD5NEt/N7pZNfOyBxkrZkXhS44Fp+xwBH5ebLbq/WY78Bqd
+  db0z6ZgW4LMYMpWFfbXsRbd9TU2f52L8oMAhxOvF7Of5qJMVWuFQ8FPagk2iHrdH
+  inYLQagqAF6goWTXgAJCdPd6SNeeSNqA6vlY7CV1Jh5kfNJJ6xu/CVij1GzCLu/5
+  DMOr26DBv+qLJRRC/2h34uX71q5QgeOyxvMg+7V3u/Q06DXyQ2VgeeqiwDFFpEH0
+  PFkdPO6ZqbTRcLfNH7mFgCBJjsfSjJrn0sPBlYyOXgCoByfZnZyrIMH/UY+lgQqS
+  6Von1VDsfQm0eJh5zYZD64ZF86phSR7mUX3mXItwH04HrZwkWpvgd871DZVR3i1n
+  w8aNA5re5+Rt/Vvjxj5AcEnZnZiz5x959NaddQocX32Z1unHw44pzRNUur1GInfW
+  p4vpx2kUSFSAGjtCbDGTNV2AH8w9OU4xEmNz8c5lyoA=
   -----END CERTIFICATE-----
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2017-06-12 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,93 @@ 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'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.6'
 - !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.1 and later}[http://www.postgresql.org/support/versioning/].
 
   A small example usage:
 
@@ -174,7 +179,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
@@ -264,29 +269,12 @@ files:
 - lib/pg/coder.rb
 - lib/pg/connection.rb
 - lib/pg/constants.rb
+- lib/pg/deprecated_constants.rb
 - lib/pg/exceptions.rb
 - lib/pg/result.rb
 - 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,9 +291,7 @@ 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:
@@ -317,7 +303,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:
   - - ">="
@@ -325,7 +311,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.12
 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
-

data/sample/async_copyto.rb

@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pg'
-require 'stringio'
-
-# Using COPY asynchronously
-
-$stderr.puts "Opening database connection ..."
-conn = PG.connect( :dbname => 'test' )
-conn.setnonblocking( true )
-
-socket = conn.socket_io
-
-$stderr.puts "Running COPY command ..."
-buf = ''
-conn.transaction do
-	conn.send_query( "COPY logs TO STDOUT WITH csv" )
-	buf = nil
-
-	# #get_copy_data returns a row if there's a whole one to return, false
-	# if there isn't one but the COPY is still running, or nil when it's
-	# finished.
-	begin
-		$stderr.puts "COPY loop"
-		conn.consume_input
-		while conn.is_busy
-			$stderr.puts "  ready loop"
-			select( [socket], nil, nil, 5.0 ) or
-				raise "Timeout (5s) waiting for query response."
-			conn.consume_input
-		end
-
-		buf = conn.get_copy_data
-		$stdout.puts( buf ) if buf
-	end until buf.nil?
-end
-
-conn.finish
-

data/sample/async_mixed.rb

@@ -1,56 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pg'
-
-$stdout.sync = true
-
-# This is a example of how to mix and match synchronous and async APIs. In this case,
-# the connection to the server is made syncrhonously, and then queries are
-# asynchronous.
-
-TIMEOUT = 5.0 # seconds to wait for an async operation to complete
-CONN_OPTS = {
-	:host     => 'localhost',
-	:dbname   => 'test',
-}
-
-# Output progress messages
-def output_progress( msg )
-	puts ">>> #{msg}\n"
-end
-
-# Start the (synchronous) connection
-output_progress "Starting connection..."
-conn = PG.connect( CONN_OPTS ) or abort "Unable to create a new connection!"
-
-abort "Connect failed: %s" % [ conn.error_message ] unless conn.status == PG::CONNECTION_OK
-
-# Now grab a reference to the underlying socket to select() on while the query is running
-socket = conn.socket_io
-
-# Send the (asynchronous) query
-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
-		output_progress "  waiting for data to be available on %p..." % [ socket ]
-		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
-
-	output_progress "Query result:\n%p\n" % [ result.values ]
-end
-
-output_progress "Done."
-conn.finish
-

data/sample/check_conn.rb

@@ -1,21 +0,0 @@
-#!/usr/bin/env ruby
-# vim: set nosta noet ts=4 sw=4:
-# encoding: utf-8
-
-require 'pg'
-
-# This is a minimal example of a function that can test an existing PG::Connection and
-# reset it if necessary.
-
-def check_connection( conn )
-	begin
-		conn.exec( "SELECT 1" )
-	rescue PG::Error => err
-		$stderr.puts "%p while testing connection: %s" % [ err.class, err.message ]
-		conn.reset
-	end
-end
-
-conn = PG.connect( dbname: 'test' )
-check_connection( conn )
-