pg 0.18.3 → 1.4.3

data/sample/async_api.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 
 require 'pg'
 
@@ -27,10 +27,6 @@ conn = PG::Connection.connect_start( :dbname => 'test' ) or
 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
@@ -41,13 +37,13 @@ until poll_status == PG::PGRES_POLLING_OK ||
 	case poll_status
 	when PG::PGRES_POLLING_READING
 		output_progress "  waiting for socket to become readable"
-		select( [socket], nil, nil, TIMEOUT ) or
+		select( [conn.socket_io], 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
+		select( nil, [conn.socket_io], nil, TIMEOUT ) or
 			raise "Asynchronous connection timed out!"
 	end
 
@@ -85,7 +81,7 @@ loop do
 	# 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
+		select( [conn.socket_io], nil, nil, TIMEOUT ) or
 			raise "Timeout waiting for query response."
 		conn.consume_input
 	end

data/sample/async_copyto.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 
 require 'pg'
 require 'stringio'

data/sample/async_mixed.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 
 require 'pg'
 

data/sample/check_conn.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
 # encoding: utf-8
 

data/sample/copydata.rb

@@ -0,0 +1,71 @@
+# -*- ruby -*-
+
+require 'pg'
+require 'stringio'
+
+$stderr.puts "Opening database connection ..."
+conn = PG.connect( dbname: 'test' )
+
+conn.exec( <<END_SQL )
+DROP TABLE IF EXISTS logs;
+CREATE TABLE logs (
+	client_ip inet,
+	username text,
+	ts timestamp,
+	request text,
+	status smallint,
+	bytes int
+);
+END_SQL
+
+csv_io = StringIO.new( <<"END_DATA" )
+"127.0.0.1","","30/Aug/2010:08:21:24 -0700","GET /manual/ HTTP/1.1",404,205
+"127.0.0.1","","30/Aug/2010:08:21:24 -0700","GET /favicon.ico HTTP/1.1",404,209
+"127.0.0.1","","30/Aug/2010:08:21:24 -0700","GET /favicon.ico HTTP/1.1",404,209
+"127.0.0.1","","30/Aug/2010:08:22:29 -0700","GET /manual/ HTTP/1.1",200,11094
+"127.0.0.1","","30/Aug/2010:08:22:38 -0700","GET /manual/index.html HTTP/1.1",200,725
+"127.0.0.1","","30/Aug/2010:08:27:56 -0700","GET /manual/ HTTP/1.1",200,11094
+"127.0.0.1","","30/Aug/2010:08:27:57 -0700","GET /manual/ HTTP/1.1",200,11094
+"127.0.0.1","","30/Aug/2010:08:28:06 -0700","GET /manual/index.html HTTP/1.1",200,7709
+"127.0.0.1","","30/Aug/2010:08:28:06 -0700","GET /manual/images/feather.gif HTTP/1.1",200,6471
+"127.0.0.1","","30/Aug/2010:08:28:06 -0700","GET /manual/images/left.gif HTTP/1.1",200,60
+"127.0.0.1","","30/Aug/2010:08:28:06 -0700","GET /manual/style/css/manual.css HTTP/1.1",200,18674
+"127.0.0.1","","30/Aug/2010:08:28:06 -0700","GET /manual/style/css/manual-print.css HTTP/1.1",200,13200
+"127.0.0.1","","30/Aug/2010:08:28:06 -0700","GET /manual/images/favicon.ico HTTP/1.1",200,1078
+"127.0.0.1","","30/Aug/2010:08:28:06 -0700","GET /manual/style/css/manual-loose-100pc.css HTTP/1.1",200,3065
+"127.0.0.1","","30/Aug/2010:08:28:14 -0700","OPTIONS * HTTP/1.0",200,0
+"127.0.0.1","","30/Aug/2010:08:28:15 -0700","OPTIONS * HTTP/1.0",200,0
+"127.0.0.1","","30/Aug/2010:08:28:47 -0700","GET /manual/mod/directives.html HTTP/1.1",200,33561
+"127.0.0.1","","30/Aug/2010:08:28:53 -0700","GET /manual/mod/mpm_common.html HTTP/1.1",200,67683
+"127.0.0.1","","30/Aug/2010:08:28:53 -0700","GET /manual/images/down.gif HTTP/1.1",200,56
+"127.0.0.1","","30/Aug/2010:08:28:53 -0700","GET /manual/images/up.gif HTTP/1.1",200,57
+"127.0.0.1","","30/Aug/2010:09:19:58 -0700","GET /manual/mod/mod_log_config.html HTTP/1.1",200,28307
+"127.0.0.1","","30/Aug/2010:09:20:19 -0700","GET /manual/mod/core.html HTTP/1.1",200,194144
+"127.0.0.1","","30/Aug/2010:16:02:56 -0700","GET /manual/ HTTP/1.1",200,11094
+"127.0.0.1","","30/Aug/2010:16:03:00 -0700","GET /manual/ HTTP/1.1",200,11094
+"127.0.0.1","","30/Aug/2010:16:06:16 -0700","GET /manual/mod/mod_dir.html HTTP/1.1",200,10583
+"127.0.0.1","","30/Aug/2010:16:06:44 -0700","GET /manual/ HTTP/1.1",200,7709
+END_DATA
+
+### You can test the error case from the database side easily by
+### changing one of the numbers at the end of one of the above rows to
+### something non-numeric like "-".
+
+$stderr.puts "Running COPY command with data ..."
+buf = ''
+conn.transaction do
+	res = conn.copy_data( "COPY logs FROM STDIN WITH csv" ) do
+		$stderr.print "Sending lines... "
+		csv_io.each_line.with_index do |buf, i|
+			$stderr.print "#{i + 1} "
+			conn.put_copy_data( buf )
+		end
+		$stderr.puts "done."
+	end
+	$stderr.puts "Result of COPY is: %s" % [ res.res_status(res.result_status) ]
+	$stderr.puts "  tuples copied: %p" % [ res.cmd_tuples ]
+end
+
+
+conn.finish
+

data/sample/copyfrom.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 
 require 'pg'
 require 'stringio'

data/sample/copyto.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 
 require 'pg'
 require 'stringio'

data/sample/cursor.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 
 require 'pg'
 

data/sample/disk_usage_report.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 # vim: set noet nosta sw=4 ts=4 :
 #
 # Quickly dump size information for a given database.
@@ -10,21 +10,12 @@
 #
 
 
-begin
-	require 'ostruct'
-	require 'optparse'
-	require 'etc'
-	require 'pg'
+require 'ostruct'
+require 'optparse'
+require 'etc'
+require 'pg'
 
-rescue LoadError # 1.8 support
-	unless Object.const_defined?( :Gem )
-		require 'rubygems'
-		retry
-	end
-	raise
-end
-
-SCRIPT_VERSION = %q$Id: disk_usage_report.rb,v 76ebae01c937 2013/03/26 17:50:02 ged $
+SCRIPT_VERSION = %q$Id$
 
 
 ### Gather data and output it to $stdout.

data/sample/issue-119.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 
 require 'pg'
 
@@ -66,7 +66,7 @@ END_DATA
 			end
 		rescue Errno => err
 			errmsg = "%s while reading copy data: %s" % [err.class.name, err.message]
-			puts "an error occured"
+			puts "an error occurred"
 		end
 
 		if errmsg

data/sample/losample.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 
 require 'pg'
 

data/sample/minimal-testcase.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 
 require 'pg'
 
@@ -7,7 +7,7 @@ $stderr.puts '---',
 	RUBY_DESCRIPTION,
 	PG.version_string( true ),
 	"Server version: #{conn.server_version}",
-	"Client version: #{PG.respond_to?( :library_version ) ? PG.library_version : 'unknown'}",
+	"Client version: #{PG.library_version}",
 	'---'
 
 result = conn.exec( "SELECT * from pg_stat_activity" )

data/sample/notify_wait.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 #
 # Test script, demonstrating a non-poll notification for a table event.
 #

data/sample/pg_statistics.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 # vim: set noet nosta sw=4 ts=4 :
 #
 # PostgreSQL statistic gatherer.
@@ -13,26 +13,17 @@
 # some nice performance charts.
 #
 
-begin
-	require 'ostruct'
-	require 'optparse'
-	require 'etc'
-	require 'pg'
-
-rescue LoadError # 1.8 support
-	unless Object.const_defined?( :Gem )
-		require 'rubygems'
-		retry
-	end
-	raise
-end
+require 'ostruct'
+require 'optparse'
+require 'etc'
+require 'pg'
 
 
 ### PostgreSQL Stats.  Fetch information from pg_stat_* tables.
 ### Optionally run in a continuous loop, displaying deltas.
 ###
 class Stats
-	VERSION = %q$Id: pg_statistics.rb,v 36ca5b412583 2012/04/17 23:32:25 mahlon $
+	VERSION = %q$Id$
 
 	def initialize( opts )
 		@opts = opts

data/sample/replication_monitor.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 # vim: set noet nosta sw=4 ts=4 :
 #
 # Get the current WAL segment and offset from a master postgresql
@@ -15,28 +15,19 @@
 #	db_replication.monitor db-master.example.com ...
 #
 
-begin
-	require 'ostruct'
-	require 'optparse'
-	require 'pathname'
-	require 'etc'
-	require 'pg'
-	require 'pp'
-
-rescue LoadError # 1.8 support
-	unless Object.const_defined?( :Gem )
-		require 'rubygems'
-		retry
-	end
-	raise
-end
+require 'ostruct'
+require 'optparse'
+require 'pathname'
+require 'etc'
+require 'pg'
+require 'pp'
 
 
 ### A class to encapsulate the PG handles.
 ###
 class PGMonitor
 
-	VERSION = %q$Id: replication_monitor.rb,v 36ca5b412583 2012/04/17 23:32:25 mahlon $
+	VERSION = %q$Id$
 
 	# When to consider a slave as 'behind', measured in WAL segments.
 	# The default WAL segment size is 16, so we'll alert after
@@ -96,7 +87,7 @@ class PGMonitor
 	#########
 
 	### Ask the master for the current xlog information, to compare
-	### to slaves.  Returns true on succcess.  On failure, populates
+	### to slaves.  Returns true on success.  On failure, populates
 	### the failures array and returns false.
 	###
 	def get_current_wal

data/sample/test_binary_values.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby1.9.1
+# -*- ruby -*-1.9.1
 
 require 'pg'
 

data/sample/wal_shipper.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 #
 # A script to wrap ssh and rsync for PostgreSQL WAL files shipping.
 # Mahlon E. Smith <mahlon@martini.nu>
@@ -350,7 +350,7 @@ module WalShipper
 		###
 		def dispatch_dest( dest )
 			if ! dest.enabled.nil? && ! dest.enabled
-				self.log "Skipping explicity disabled destination %p, WAL is queued." % [ dest.label ]
+				self.log "Skipping explicitly disabled destination %p, WAL is queued." % [ dest.label ]
 				return
 			end
 

data/sample/warehouse_partitions.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby
+# -*- ruby -*-
 # vim: set nosta noet ts=4 sw=4:
 #
 # Script to automatically move partitioned tables and their indexes
@@ -36,21 +36,12 @@
 #
 
 
-begin
-	require 'date'
-	require 'ostruct'
-	require 'optparse'
-	require 'pathname'
-	require 'etc'
-	require 'pg'
-
-rescue LoadError # 1.8 support
-	unless Object.const_defined?( :Gem )
-		require 'rubygems'
-		retry
-	end
-	raise
-end
+require 'date'
+require 'ostruct'
+require 'optparse'
+require 'pathname'
+require 'etc'
+require 'pg'
 
 
 ### A tablespace migration class.
@@ -159,7 +150,7 @@ class PGWarehouse
 			end
 		end
 
-		# Add table inheritence information.
+		# Add table inheritance information.
 		#
 		db.exec 'SELECT inhrelid AS oid, inhparent AS parent FROM pg_inherits' do |res|
 			res.each do |row|