Postgres, fix rake tasks tests

Author: JesseChavez

test/db/postgresql/rake_test.rb

@@ -56,7 +56,7 @@ def do_teardown
     ActiveRecord.schema_format = :sql
     # Rake::Task["db:create"].invoke
     create_rake_test_database do |connection|
-      create_schema_migrations_table(connection)
+      create_schema_migrations_table
       connection.create_table('users') { |t| t.string :name; t.timestamps }
     end
 
@@ -113,6 +113,9 @@ def psql(args)
     if username = ENV['PSQL_USERNAME']
       args = "--username=#{username} #{args}"
     end
+
+    puts "psql args: #{args}"
+
     `#{PSQL_EXE} #{args}`
   end
 

test/rake_test_support.rb

@@ -121,8 +121,9 @@ def new_application
 
   # (Test) Helpers :
 
-  def create_schema_migrations_table(connection = ActiveRecord::Base.connection)
-    schema_migration = connection.schema_migration
+  def create_schema_migrations_table
+    pool = ActiveRecord::Base.connection_pool
+    schema_migration = pool.schema_migration
 
     return if schema_migration.table_exists?
 
@@ -133,26 +134,26 @@ def create_schema_migrations_table(connection = ActiveRecord::Base.connection)
 
   def create_rake_test_database
     ActiveRecord::Base.establish_connection db_config
-    connection = ActiveRecord::Base.connection
+    connection = ActiveRecord::Base.lease_connection
     connection.create_database(db_name, db_config) if connection.respond_to?(:create_database)
     if block_given?
       if db_name
         config = db_config.merge :database => db_name
         ActiveRecord::Base.establish_connection config
       end
-      yield ActiveRecord::Base.connection
+      yield ActiveRecord::Base.lease_connection
     end
-    ActiveRecord::Base.connection.disconnect!
+    ActiveRecord::Base.lease_connection.disconnect!
   end
 
   def drop_rake_test_database(silence = false)
     ActiveRecord::Base.establish_connection db_config
     begin
-      ActiveRecord::Base.connection.drop_database(db_name)
+      ActiveRecord::Base.lease_connection.drop_database(db_name)
     rescue => e
       raise e unless silence
     end
-    ActiveRecord::Base.connection.disconnect!
+    ActiveRecord::Base.lease_connection.disconnect!
   end
 
   def structure_sql_filename