migrate last reference to postgres

Author: seuros

rakelib/db.rake

@@ -39,7 +39,7 @@ GRANT ALL PRIVILEGES ON `test\_%`.* TO #{MYSQL_CONFIG[:username]}@localhost;
   task :postgresql do
     require File.expand_path('../../test/shared_helper', __FILE__)
     fail 'could not create test database: psql executable not found' unless psql = which('psql')
-    fail 'could not create test database: missing "postgres" role' unless PostgresHelper.postgres_role?
+    fail 'could not create test database: missing "jruby" role' unless PostgresHelper.postgres_role?
 
     load 'test/db/postgres_config.rb' # rescue nil
     puts POSTGRES_CONFIG.inspect if $VERBOSE

test/shared_helper.rb

@@ -25,7 +25,8 @@ module PostgresHelper
   class << self
     def postgres_role?(warn = nil)
       if psql = which('psql')
-        if `#{psql} -c '\\l' -U jruby #{psql_params}2>&1` && $?.exitstatus == 0
+        cmd = "PGPASSWORD=#{ENV['PGPASSWORD'] || 'jruby'} #{psql} -c '\\l' -U jruby #{psql_params}2>&1"
+        if `#{cmd}` && $?.exitstatus == 0
           true
         else
           if warn.nil?