Restore compatibility with PostgreSQL down to 8.3

larskanis · larskanis · commit 7cf7a617f68f · 2012-12-19T12:59:48.000+01:00
diff --git a/lib/pg/connection.rb b/lib/pg/connection.rb
@@ -24,8 +24,14 @@ def self::parse_connect_args( *args )
 		# PQconnectdbParams()/PQconnectStartParams(). For now, stick to an options string for
 		# PQconnectdb()/PQconnectStart().
 
-		appname = PG::Connection.quote_connstr( $0 )
-		connopts = ["fallback_application_name=#{appname}"]
+		# 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 }
+			appname = PG::Connection.quote_connstr( $0 )
+			connopts = ["fallback_application_name=#{appname}"]
+		else
+			connopts = []
+		end
 
 		# Handle an options hash first
 		if args.last.is_a?( Hash )
diff --git a/spec/lib/helpers.rb b/spec/lib/helpers.rb
@@ -48,15 +48,15 @@ def ansi_code( *attributes )
 		attributes = ANSI_ATTRIBUTES.values_at( *attributes ).compact.join(';')
 
 		# $stderr.puts "  attr is: %p" % [attributes]
-		if attributes.empty? 
+		if attributes.empty?
 			return ''
 		else
 			return "\e[%sm" % attributes
 		end
 	end
 
 
-	### Colorize the given +string+ with the specified +attributes+ and return it, handling 
+	### Colorize the given +string+ with the specified +attributes+ and return it, handling
 	### line-endings, color reset, etc.
 	def colorize( *args )
 		string = ''
@@ -112,7 +112,7 @@ def run( *cmd )
 
 	NOFORK_PLATFORMS = %w{java}
 
-	### Run the specified command +cmd+ after redirecting stdout and stderr to the specified 
+	### Run the specified command +cmd+ after redirecting stdout and stderr to the specified
 	### +logpath+, failing if the execution fails.
 	def log_and_run( logpath, *cmd )
 		cmd.flatten!
@@ -244,9 +244,10 @@ def teardown_testing_db( conn )
 	config.filter_run_excluding :postgresql_90 unless
 		PG::Connection.instance_methods.map( &:to_sym ).include?( :escape_literal )
 
-	unless PG.respond_to?( :library_version )
-		config.filter_run_excluding( :postgresql_91 )
-		config.filter_run_excluding( :postgresql_92 ) unless PG.library_version >= '90200'
+	if !PG.respond_to?( :library_version )
+		config.filter_run_excluding( :postgresql_91, :postgresql_92 )
+	elsif PG.library_version < 90200
+		config.filter_run_excluding( :postgresql_92 )
 	end
 end
 
