pg 1.2.1-x86-mingw32 → 1.3.0.rc2-x86-mingw32

data/lib/pg/connection.rb

@@ -3,6 +3,8 @@
 
 require 'pg' unless defined?( PG )
 require 'uri'
+require 'io/wait'
+require 'socket'
 
 # The PostgreSQL connection class. The interface for this class is based on
 # {libpq}[http://www.postgresql.org/docs/9.2/interactive/libpq.html], the C
@@ -25,62 +27,140 @@ class PG::Connection
 	CONNECT_ARGUMENT_ORDER = %w[host port options tty dbname user password]
 
 
-	### Quote the given +value+ for use in a connection-parameter string.
-	def self::quote_connstr( value )
+	### Quote a single +value+ for use in a connection-parameter string.
+	def self.quote_connstr( value )
 		return "'" + value.to_s.gsub( /[\\']/ ) {|m| '\\' + m } + "'"
 	end
 
+	# Convert Hash options to connection String
+	#
+	# Values are properly quoted and escaped.
+	def self.connect_hash_to_string( hash )
+		hash.map { |k,v| "#{k}=#{quote_connstr(v)}" }.join( ' ' )
+	end
 
-	### Parse the connection +args+ into a connection-parameter string. See PG::Connection.new
-	### for valid arguments.
-	def self::parse_connect_args( *args )
-		return '' if args.empty?
-
-		hash_arg = args.last.is_a?( Hash ) ? args.pop : {}
-		option_string = ''
+	# Decode a connection string to Hash options
+	#
+	# Value are properly unquoted and unescaped.
+	def self.connect_string_to_hash( str )
 		options = {}
-
-		# Parameter 'fallback_application_name' was introduced in PostgreSQL 9.0
-		# together with PQescapeLiteral().
-		if PG::Connection.instance_methods.find {|m| m.to_sym == :escape_literal }
-			options[:fallback_application_name] = $0.sub( /^(.{30}).{4,}(.{30})$/ ){ $1+"..."+$2 }
+		key = nil
+		value = String.new
+		str.scan(/\G\s*(?>([^\s\\\']+)\s*=\s*|([^\s\\\']+)|'((?:[^\'\\]|\\.)*)'|(\\.?)|(\S))(\s|\z)?/m) do
+					|k, word, sq, esc, garbage, sep|
+			raise ArgumentError, "unterminated quoted string in connection info string: #{str.inspect}" if garbage
+			if k
+				key = k
+			else
+				value << (word || (sq || esc).gsub(/\\(.)/, '\\1'))
+			end
+			if sep
+				raise ArgumentError, "missing = after #{value.inspect}" unless key
+				options[key.to_sym] = value
+				key = nil
+				value = String.new
+			end
 		end
+		options
+	end
+
+	# URI defined in RFC3986
+	# This regexp is modified to allow host to specify multiple comma separated components captured as <hostports> and to disallow comma in hostnames.
+	# Taken from: https://github.com/ruby/ruby/blob/be04006c7d2f9aeb7e9d8d09d945b3a9c7850202/lib/uri/rfc3986_parser.rb#L6
+	HOST_AND_PORT = /(?<hostport>(?<host>(?<IP-literal>\[(?:(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:)?\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h+\.[!$&-.0-;=A-Z_a-z~]+))\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[-\.!$&-+0-9;=A-Z_a-z~])+))?(?::(?<port>\d*))?)/
+	POSTGRESQL_URI = /\A(?<URI>(?<scheme>[A-Za-z][+\-.0-9A-Za-z]*):(?<hier-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*)@)?(?<hostports>#{HOST_AND_PORT}(?:,\g<hostport>)*))(?<path-abempty>(?:\/(?<segment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*))*)|(?<path-absolute>\/(?:(?<segment-nz>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])+)(?:\/\g<segment>)*)?)|(?<path-rootless>\g<segment-nz>(?:\/\g<segment>)*)|(?<path-empty>))(?:\?(?<query>[^#]*))?(?:\#(?<fragment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*))?)\z/
+
+	# Parse the connection +args+ into a connection-parameter string.
+	# See PG::Connection.new for valid arguments.
+	#
+	# It accepts:
+	# * an option String kind of "host=name port=5432"
+	# * an option Hash kind of {host: "name", port: 5432}
+	# * URI string
+	# * URI object
+	# * positional arguments
+	#
+	# The method adds the option "hostaddr" and "fallback_application_name" if they aren't already set.
+	# The URI and the options string is passed through and "hostaddr" as well as "fallback_application_name"
+	# are added to the end.
+	def self::parse_connect_args( *args )
+		hash_arg = args.last.is_a?( Hash ) ? args.pop.transform_keys(&:to_sym) : {}
+		option_string = ""
+		iopts = {}
 
 		if args.length == 1
 			case args.first
-			when URI, /\A#{URI::ABS_URI_REF}\z/
-				uri = URI(args.first)
-				options.merge!( Hash[URI.decode_www_form( uri.query )] ) if uri.query
+			when URI, POSTGRESQL_URI
+				uri = args.first.to_s
+				uri_match = POSTGRESQL_URI.match(uri)
+				if uri_match['query']
+					iopts = URI.decode_www_form(uri_match['query']).to_h.transform_keys(&:to_sym)
+				end
+				# extract "host1,host2" from "host1:5432,host2:5432"
+				iopts[:host] = uri_match['hostports'].split(',', -1).map do |hostport|
+					hostmatch = HOST_AND_PORT.match(hostport)
+					hostmatch['IPv6address'] || hostmatch['IPv4address'] || hostmatch['reg-name']&.gsub(/%(\h\h)/){ $1.hex.chr }
+				end.join(',')
+				oopts = {}
 			when /=/
 				# Option string style
 				option_string = args.first.to_s
+				iopts = connect_string_to_hash(option_string)
+				oopts = {}
 			else
-				# Positional parameters
-				options[CONNECT_ARGUMENT_ORDER.first.to_sym] = args.first
+				# Positional parameters (only host given)
+				iopts[CONNECT_ARGUMENT_ORDER.first.to_sym] = args.first
+				oopts = iopts.dup
 			end
 		else
+			# Positional parameters
 			max = CONNECT_ARGUMENT_ORDER.length
 			raise ArgumentError,
 				"Extra positional parameter %d: %p" % [ max + 1, args[max] ] if args.length > max
 
 			CONNECT_ARGUMENT_ORDER.zip( args ) do |(k,v)|
-				options[ k.to_sym ] = v if v
+				iopts[ k.to_sym ] = v if v
+			end
+			iopts.delete(:tty) # ignore obsolete tty parameter
+			oopts = iopts.dup
+		end
+
+		iopts.merge!( hash_arg )
+		oopts.merge!( hash_arg )
+
+		# Resolve DNS in Ruby to avoid blocking state while connecting, when it ...
+		if (host=iopts[:host]) && !iopts[:hostaddr]
+			hostaddrs = host.split(",", -1).map do |mhost|
+				if !mhost.empty? && !mhost.start_with?("/") &&  # isn't UnixSocket
+						# isn't a path on Windows
+						(RUBY_PLATFORM !~ /mingw|mswin/ || mhost !~ /\A\w:[\/\\]/)
+
+					if Fiber.respond_to?(:scheduler) &&
+							Fiber.scheduler &&
+							RUBY_VERSION < '3.1.'
+
+						# Use a second thread to avoid blocking of the scheduler.
+						# `IPSocket.getaddress` isn't fiber aware before ruby-3.1.
+						Thread.new{ IPSocket.getaddress(mhost) rescue '' }.value
+					else
+						IPSocket.getaddress(mhost) rescue ''
+					end
+				end
 			end
+			oopts[:hostaddr] = hostaddrs.join(",") if hostaddrs.any?
 		end
 
-		options.merge!( hash_arg )
+		if !iopts[:fallback_application_name]
+			oopts[:fallback_application_name] = $0.sub( /^(.{30}).{4,}(.{30})$/ ){ $1+"..."+$2 }
+		end
 
 		if uri
-			uri.host     = nil if options[:host]
-			uri.port     = nil if options[:port]
-			uri.user     = nil if options[:user]
-			uri.password = nil if options[:password]
-			uri.path     = '' if options[:dbname]
-			uri.query    = URI.encode_www_form( options )
-			return uri.to_s.sub( /^#{uri.scheme}:(?!\/\/)/, "#{uri.scheme}://" )
+			uri += uri_match['query'] ? "&" : "?"
+			uri += URI.encode_www_form( oopts )
+			return uri
 		else
-			option_string += ' ' unless option_string.empty? && options.empty?
-			return option_string + options.map { |k,v| "#{k}=#{quote_connstr(v)}" }.join( ' ' )
+			option_string += ' ' unless option_string.empty? && oopts.empty?
+			return option_string + connect_hash_to_string(oopts)
 		end
 	end
 
@@ -88,7 +168,7 @@ class PG::Connection
 	#  call-seq:
 	#     conn.copy_data( sql [, coder] ) {|sql_result| ... } -> PG::Result
 	#
-	# Execute a copy process for transfering data to or from the server.
+	# Execute a copy process for transferring data to or from the server.
 	#
 	# This issues the SQL COPY command via #exec. The response to this
 	# (if there is no error in the command) is a PG::Result object that
@@ -214,6 +294,25 @@ class PG::Connection
 		define_method( :isthreadsafe, &PG.method(:isthreadsafe) )
 	end
 
+	#
+	# call-seq:
+	#    conn.transaction { |conn| ... } -> result of the block
+	#
+	# Executes a +BEGIN+ at the start of the block,
+	# and a +COMMIT+ at the end of the block, or
+	# +ROLLBACK+ if any exception occurs.
+	def transaction
+		exec "BEGIN"
+		res = yield(self)
+	rescue Exception
+		cancel if transaction_status != PG::PQTRANS_IDLE
+		block
+		exec "ROLLBACK"
+		raise
+	else
+		exec "COMMIT"
+		res
+	end
 
 	### Returns an array of Hashes with connection defaults. See ::conndefaults
 	### for details.
@@ -237,17 +336,13 @@ class PG::Connection
 		return self.class.conndefaults_hash
 	end
 
-	# Method 'conninfo' was introduced in PostgreSQL 9.3.
-	if self.instance_methods.find{|m| m.to_sym == :conninfo }
-
-		### Return the Postgres connection info structure as a Hash keyed by option
-		### keyword (as a Symbol).
-		###
-		### See also #conninfo
-		def conninfo_hash
-			return self.conninfo.each_with_object({}) do |info, hash|
-				hash[ info[:keyword].to_sym ] = info[:val]
-			end
+	### Return the Postgres connection info structure as a Hash keyed by option
+	### keyword (as a Symbol).
+	###
+	### See also #conninfo
+	def conninfo_hash
+		return self.conninfo.each_with_object({}) do |info, hash|
+			hash[ info[:keyword].to_sym ] = info[:val]
 		end
 	end
 
@@ -269,23 +364,450 @@ class PG::Connection
 		end
 	end
 
-	REDIRECT_METHODS = {
-		:exec => [:async_exec, :sync_exec],
-		:query => [:async_exec, :sync_exec],
-		:exec_params => [:async_exec_params, :sync_exec_params],
-		:prepare => [:async_prepare, :sync_prepare],
-		:exec_prepared => [:async_exec_prepared, :sync_exec_prepared],
-		:describe_portal => [:async_describe_portal, :sync_describe_portal],
-		:describe_prepared => [:async_describe_prepared, :sync_describe_prepared],
-	}
-
-	def self.async_api=(enable)
-		REDIRECT_METHODS.each do |ali, (async, sync)|
-			remove_method(ali) if method_defined?(ali)
-			alias_method( ali, enable ? async : sync )
+	# call-seq:
+	#    conn.get_result() -> PG::Result
+	#    conn.get_result() {|pg_result| block }
+	#
+	# Blocks waiting for the next result from a call to
+	# #send_query (or another asynchronous command), and returns
+	# it. Returns +nil+ if no more results are available.
+	#
+	# Note: call this function repeatedly until it returns +nil+, or else
+	# you will not be able to issue further commands.
+	#
+	# If the optional code block is given, it will be passed <i>result</i> as an argument,
+	# and the PG::Result object will  automatically be cleared when the block terminates.
+	# In this instance, <code>conn.exec</code> returns the value of the block.
+	def get_result(*args)
+		block
+		sync_get_result
+	end
+	alias async_get_result get_result
+
+	# call-seq:
+	#    conn.get_copy_data( [ nonblock = false [, decoder = nil ]] ) -> Object
+	#
+	# Return one row of data, +nil+
+	# if the copy is done, or +false+ if the call would
+	# block (only possible if _nonblock_ is true).
+	#
+	# If _decoder_ is not set or +nil+, data is returned as binary string.
+	#
+	# If _decoder_ is set to a PG::Coder derivation, the return type depends on this decoder.
+	# PG::TextDecoder::CopyRow decodes the received data fields from one row of PostgreSQL's
+	# COPY text format to an Array of Strings.
+	# Optionally the decoder can type cast the single fields to various Ruby types in one step,
+	# if PG::TextDecoder::CopyRow#type_map is set accordingly.
+	#
+	# See also #copy_data.
+	#
+	def get_copy_data(async=false, decoder=nil)
+		if async
+			return sync_get_copy_data(async, decoder)
+		else
+			while (res=sync_get_copy_data(true, decoder)) == false
+				socket_io.wait_readable
+				consume_input
+			end
+			return res
+		end
+	end
+	alias async_get_copy_data get_copy_data
+
+
+	# In async_api=true mode (default) all send calls run nonblocking.
+	# The difference is that setnonblocking(true) disables automatic handling of would-block cases.
+	# In async_api=false mode all send calls run directly on libpq.
+	# Blocking vs. nonblocking state can be changed in libpq.
+
+	# call-seq:
+	#    conn.setnonblocking(Boolean) -> nil
+	#
+	# Sets the nonblocking status of the connection.
+	# In the blocking state, calls to #send_query
+	# will block until the message is sent to the server,
+	# but will not wait for the query results.
+	# In the nonblocking state, calls to #send_query
+	# will return an error if the socket is not ready for
+	# writing.
+	# Note: This function does not affect #exec, because
+	# that function doesn't return until the server has
+	# processed the query and returned the results.
+	#
+	# Returns +nil+.
+	def setnonblocking(enabled)
+		singleton_class.async_send_api = !enabled
+		self.flush_data = !enabled
+		sync_setnonblocking(true)
+	end
+	alias async_setnonblocking setnonblocking
+
+	# sync/async isnonblocking methods are switched by async_setnonblocking()
+
+	# call-seq:
+	#    conn.isnonblocking() -> Boolean
+	#
+	# Returns the blocking status of the database connection.
+	# Returns +true+ if the connection is set to nonblocking mode and +false+ if blocking.
+	def isnonblocking
+		false
+	end
+	alias async_isnonblocking isnonblocking
+	alias nonblocking? isnonblocking
+
+	# call-seq:
+	#    conn.put_copy_data( buffer [, encoder] ) -> Boolean
+	#
+	# Transmits _buffer_ as copy data to the server.
+	# Returns true if the data was sent, false if it was
+	# not sent (false is only possible if the connection
+	# is in nonblocking mode, and this command would block).
+	#
+	# _encoder_ can be a PG::Coder derivation (typically PG::TextEncoder::CopyRow).
+	# This encodes the data fields given as _buffer_ from an Array of Strings to
+	# PostgreSQL's COPY text format inclusive proper escaping. Optionally
+	# the encoder can type cast the fields from various Ruby types in one step,
+	# if PG::TextEncoder::CopyRow#type_map is set accordingly.
+	#
+	# Raises an exception if an error occurs.
+	#
+	# See also #copy_data.
+	#
+	def put_copy_data(buffer, encoder=nil)
+		until sync_put_copy_data(buffer, encoder)
+			flush
+		end
+		flush
+	end
+	alias async_put_copy_data put_copy_data
+
+	# call-seq:
+	#    conn.put_copy_end( [ error_message ] ) -> Boolean
+	#
+	# Sends end-of-data indication to the server.
+	#
+	# _error_message_ is an optional parameter, and if set,
+	# forces the COPY command to fail with the string
+	# _error_message_.
+	#
+	# Returns true if the end-of-data was sent, #false* if it was
+	# not sent (*false* is only possible if the connection
+	# is in nonblocking mode, and this command would block).
+	def put_copy_end(*args)
+		until sync_put_copy_end(*args)
+			flush
+		end
+		flush
+	end
+	alias async_put_copy_end put_copy_end
+
+	if method_defined? :sync_encrypt_password
+		# call-seq:
+		#    conn.encrypt_password( password, username, algorithm=nil ) -> String
+		#
+		# This function is intended to be used by client applications that wish to send commands like <tt>ALTER USER joe PASSWORD 'pwd'</tt>.
+		# It is good practice not to send the original cleartext password in such a command, because it might be exposed in command logs, activity displays, and so on.
+		# Instead, use this function to convert the password to encrypted form before it is sent.
+		#
+		# The +password+ and +username+ arguments are the cleartext password, and the SQL name of the user it is for.
+		# +algorithm+ specifies the encryption algorithm to use to encrypt the password.
+		# Currently supported algorithms are +md5+ and +scram-sha-256+ (+on+ and +off+ are also accepted as aliases for +md5+, for compatibility with older server versions).
+		# Note that support for +scram-sha-256+ was introduced in PostgreSQL version 10, and will not work correctly with older server versions.
+		# If algorithm is omitted or +nil+, this function will query the server for the current value of the +password_encryption+ setting.
+		# That can block, and will fail if the current transaction is aborted, or if the connection is busy executing another query.
+		# If you wish to use the default algorithm for the server but want to avoid blocking, query +password_encryption+ yourself before calling #encrypt_password, and pass that value as the algorithm.
+		#
+		# Return value is the encrypted password.
+		# The caller can assume the string doesn't contain any special characters that would require escaping.
+		#
+		# Available since PostgreSQL-10.
+		# See also corresponding {libpq function}[https://www.postgresql.org/docs/current/libpq-misc.html#LIBPQ-PQENCRYPTPASSWORDCONN].
+		def encrypt_password( password, username, algorithm=nil )
+			algorithm ||= exec("SHOW password_encryption").getvalue(0,0)
+			sync_encrypt_password(password, username, algorithm)
+		end
+		alias async_encrypt_password encrypt_password
+	end
+
+	# call-seq:
+	#   conn.reset()
+	#
+	# Resets the backend connection. This method closes the
+	# backend connection and tries to re-connect.
+	def reset
+		reset_start
+		async_connect_or_reset(:reset_poll)
+	end
+	alias async_reset reset
+
+	# call-seq:
+	#    conn.cancel() -> String
+	#
+	# Requests cancellation of the command currently being
+	# processed.
+	#
+	# Returns +nil+ on success, or a string containing the
+	# error message if a failure occurs.
+	def cancel
+		be_pid = backend_pid
+		be_key = backend_key
+		cancel_request = [0x10, 1234, 5678, be_pid, be_key].pack("NnnNN")
+
+		if Fiber.respond_to?(:scheduler) && Fiber.scheduler && RUBY_PLATFORM =~ /mingw|mswin/
+			# Ruby's nonblocking IO is not really supported on Windows.
+			# We work around by using threads and explicit calls to wait_readable/wait_writable.
+			cl = Thread.new(socket_io.remote_address) { |ra| ra.connect }.value
+			begin
+				cl.write_nonblock(cancel_request)
+			rescue IO::WaitReadable, Errno::EINTR
+				cl.wait_writable
+				retry
+			end
+			begin
+				cl.read_nonblock(1)
+			rescue IO::WaitReadable, Errno::EINTR
+				cl.wait_readable
+				retry
+			rescue EOFError
+			end
+		elsif RUBY_ENGINE == 'truffleruby'
+			begin
+				cl = socket_io.remote_address.connect
+			rescue NotImplementedError
+				# Workaround for truffleruby < 21.3.0
+				cl2 = Socket.for_fd(socket_io.fileno)
+				cl2.autoclose = false
+				adr = cl2.remote_address
+				if adr.ip?
+					cl = TCPSocket.new(adr.ip_address, adr.ip_port)
+					cl.autoclose = false
+				else
+					cl = UNIXSocket.new(adr.unix_path)
+					cl.autoclose = false
+				end
+			end
+			cl.write(cancel_request)
+			cl.read(1)
+		else
+			cl = socket_io.remote_address.connect
+			# Send CANCEL_REQUEST_CODE and parameters
+			cl.write(cancel_request)
+			# Wait for the postmaster to close the connection, which indicates that it's processed the request.
+			cl.read(1)
+		end
+
+		cl.close
+		nil
+	rescue SystemCallError => err
+		err.to_s
+	end
+	alias async_cancel cancel
+
+	private def async_connect_or_reset(poll_meth)
+		# Now grab a reference to the underlying socket so we know when the connection is established
+		socket = 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
+				socket.wait_readable
+
+			# ...and the same for when the socket needs to write
+			when PG::PGRES_POLLING_WRITING
+				socket.wait_writable
+			end
+
+			# Check to see if it's finished or failed yet
+			poll_status = send( poll_meth )
+		end
+
+		raise(PG::ConnectionBad, error_message) unless status == PG::CONNECTION_OK
+
+		# Set connection to nonblocking to handle all blocking states in ruby.
+		# That way a fiber scheduler is able to handle IO requests.
+		sync_setnonblocking(true)
+		self.flush_data = true
+		set_default_encoding
+
+		self
+	end
+
+	class << self
+		# call-seq:
+		#    PG::Connection.new -> conn
+		#    PG::Connection.new(connection_hash) -> conn
+		#    PG::Connection.new(connection_string) -> conn
+		#    PG::Connection.new(host, port, options, tty, dbname, user, password) ->  conn
+		#
+		# Create a connection to the specified server.
+		#
+		# +connection_hash+ must be a ruby Hash with connection parameters.
+		# See the {list of valid parameters}[https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-PARAMKEYWORDS] in the PostgreSQL documentation.
+		#
+		# There are two accepted formats for +connection_string+: plain <code>keyword = value</code> strings and URIs.
+		# See the documentation of {connection strings}[https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING].
+		#
+		# The positional parameter form has the same functionality except that the missing parameters will always take on default values. The parameters are:
+		# [+host+]
+		#   server hostname
+		# [+port+]
+		#   server port number
+		# [+options+]
+		#   backend options
+		# [+tty+]
+		#   (ignored in all versions of PostgreSQL)
+		# [+dbname+]
+		#   connecting database name
+		# [+user+]
+		#   login user name
+		# [+password+]
+		#   login password
+		#
+		# Examples:
+		#
+		#   # Connect using all defaults
+		#   PG::Connection.new
+		#
+		#   # As a Hash
+		#   PG::Connection.new( dbname: 'test', port: 5432 )
+		#
+		#   # As a String
+		#   PG::Connection.new( "dbname=test port=5432" )
+		#
+		#   # As an Array
+		#   PG::Connection.new( nil, 5432, nil, nil, 'test', nil, nil )
+		#
+		#   # As an URI
+		#   PG::Connection.new( "postgresql://user:pass@pgsql.example.com:5432/testdb?sslmode=require" )
+		#
+		# If the Ruby default internal encoding is set (i.e., <code>Encoding.default_internal != nil</code>), the
+		# connection will have its +client_encoding+ set accordingly.
+		#
+		# Raises a PG::Error if the connection fails.
+		def new(*args, **kwargs)
+			conn = PG::Connection.connect_start(*args, **kwargs ) or
+				raise(PG::Error, "Unable to create a new connection")
+
+			raise(PG::ConnectionBad, conn.error_message) if conn.status == PG::CONNECTION_BAD
+
+			conn.send(:async_connect_or_reset, :connect_poll)
+		end
+		alias async_connect new
+		alias connect new
+		alias open new
+		alias setdb new
+		alias setdblogin new
+
+		# call-seq:
+		#    PG::Connection.ping(connection_hash)       -> Integer
+		#    PG::Connection.ping(connection_string)     -> Integer
+		#    PG::Connection.ping(host, port, options, tty, dbname, login, password) ->  Integer
+		#
+		# Check server status.
+		#
+		# See PG::Connection.new for a description of the parameters.
+		#
+		# Returns one of:
+		# [+PQPING_OK+]
+		#   server is accepting connections
+		# [+PQPING_REJECT+]
+		#   server is alive but rejecting connections
+		# [+PQPING_NO_RESPONSE+]
+		#   could not establish connection
+		# [+PQPING_NO_ATTEMPT+]
+		#   connection not attempted (bad params)
+		def ping(*args)
+			if Fiber.respond_to?(:scheduler) && Fiber.scheduler
+				# Run PQping in a second thread to avoid blocking of the scheduler.
+				# Unfortunately there's no nonblocking way to run ping.
+				Thread.new { sync_ping(*args) }.value
+			else
+				sync_ping(*args)
+			end
+		end
+		alias async_ping ping
+
+		REDIRECT_CLASS_METHODS = {
+			:new => [:async_connect, :sync_connect],
+			:connect => [:async_connect, :sync_connect],
+			:open => [:async_connect, :sync_connect],
+			:setdb => [:async_connect, :sync_connect],
+			:setdblogin => [:async_connect, :sync_connect],
+			:ping => [:async_ping, :sync_ping],
+		}
+
+		# These methods are affected by PQsetnonblocking
+		REDIRECT_SEND_METHODS = {
+			:isnonblocking => [:async_isnonblocking, :sync_isnonblocking],
+			:nonblocking? => [:async_isnonblocking, :sync_isnonblocking],
+			:put_copy_data => [:async_put_copy_data, :sync_put_copy_data],
+			:put_copy_end => [:async_put_copy_end, :sync_put_copy_end],
+			:flush => [:async_flush, :sync_flush],
+		}
+		REDIRECT_METHODS = {
+			:exec => [:async_exec, :sync_exec],
+			:query => [:async_exec, :sync_exec],
+			:exec_params => [:async_exec_params, :sync_exec_params],
+			:prepare => [:async_prepare, :sync_prepare],
+			:exec_prepared => [:async_exec_prepared, :sync_exec_prepared],
+			:describe_portal => [:async_describe_portal, :sync_describe_portal],
+			:describe_prepared => [:async_describe_prepared, :sync_describe_prepared],
+			:setnonblocking => [:async_setnonblocking, :sync_setnonblocking],
+			:get_result => [:async_get_result, :sync_get_result],
+			:get_last_result => [:async_get_last_result, :sync_get_last_result],
+			:get_copy_data => [:async_get_copy_data, :sync_get_copy_data],
+			:reset => [:async_reset, :sync_reset],
+			:set_client_encoding => [:async_set_client_encoding, :sync_set_client_encoding],
+			:client_encoding= => [:async_set_client_encoding, :sync_set_client_encoding],
+			:cancel => [:async_cancel, :sync_cancel],
+		}
+
+		if PG::Connection.instance_methods.include? :async_encrypt_password
+			REDIRECT_METHODS.merge!({
+				:encrypt_password => [:async_encrypt_password, :sync_encrypt_password],
+			})
+		end
+
+		def async_send_api=(enable)
+			REDIRECT_SEND_METHODS.each do |ali, (async, sync)|
+				undef_method(ali) if method_defined?(ali)
+				alias_method( ali, enable ? async : sync )
+			end
+		end
+
+		# Switch between sync and async libpq API.
+		#
+		#   PG::Connection.async_api = true
+		# this is the default.
+		# It sets an alias from #exec to #async_exec, #reset to #async_reset and so on.
+		#
+		#   PG::Connection.async_api = false
+		# sets an alias from #exec to #sync_exec, #reset to #sync_reset and so on.
+		#
+		# pg-1.1.0+ defaults to libpq's async API for query related blocking methods.
+		# pg-1.3.0+ defaults to libpq's async API for all possibly blocking methods.
+		#
+		# _PLEASE_ _NOTE_: This method is not part of the public API and is for debug and development use only.
+		# Do not use this method in production code.
+		# Any issues with the default setting of <tt>async_api=true</tt> should be reported to the maintainers instead.
+		#
+		def async_api=(enable)
+			self.async_send_api = enable
+			REDIRECT_METHODS.each do |ali, (async, sync)|
+				remove_method(ali) if method_defined?(ali)
+				alias_method( ali, enable ? async : sync )
+			end
+			REDIRECT_CLASS_METHODS.each do |ali, (async, sync)|
+				singleton_class.remove_method(ali) if method_defined?(ali)
+				singleton_class.alias_method(ali, enable ? async : sync )
+			end
 		end
 	end
 
-	# pg-1.1.0+ defaults to libpq's async API for query related blocking methods
 	self.async_api = true
 end # class PG::Connection