Postgres, fix schema dump tests

Author: JesseChavez

test/db/postgresql/schema_dump_test.rb

@@ -92,8 +92,9 @@ def test_dumps_array_with_default
   private
 
   def dump_with_data_types(io = StringIO.new)
+    pool = ActiveRecord::Base.connection_pool
     ActiveRecord::SchemaDumper.ignore_tables = [/^[^d]/] # keep data_types
-    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, io)
+    ActiveRecord::SchemaDumper.dump(pool, io)
     io.string
   end
 

test/schema_dump.rb

@@ -10,21 +10,13 @@ def test_dumping_schema_with_index
     connection = ActiveRecord::Base.connection
     connection.add_index :entries, :title
     StringIO.open do |io|
-      ActiveRecord::SchemaDumper.dump(connection, io)
+      ActiveRecord::SchemaDumper.dump(db_pool, io)
       assert_match(/"index_entries_on_title"/, io.string)
     end
   ensure
     connection.remove_index :entries, :title
   end
 
-  def standard_dump(io = StringIO.new, ignore_tables = [])
-    io = StringIO.new
-    ActiveRecord::SchemaDumper.ignore_tables = ignore_tables
-    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, io)
-    io.string
-  end
-  private :standard_dump
-
   def test_magic_comment
     standard_dump(strio = StringIO.new)
     assert_match "# encoding: #{strio.external_encoding.name}", standard_dump
@@ -60,7 +52,7 @@ def test_schema_dump_with_string_ignored_table
     stream = StringIO.new
 
     ActiveRecord::SchemaDumper.ignore_tables = ['users']
-    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
+    ActiveRecord::SchemaDumper.dump(db_pool, stream)
     output = stream.string
     assert_no_match %r{create_table "users"}, output
     assert_match %r{create_table "entries"}, output
@@ -135,4 +127,16 @@ def test_schema_dump_with_table_name_prefix_and_suffix
     ActiveRecord::Base.table_name_suffix = ActiveRecord::Base.table_name_prefix = ''
   end
 
+  private
+
+  def standard_dump(io = StringIO.new, ignore_tables = [])
+    pool = ActiveRecord::Base.connection_pool
+    ActiveRecord::SchemaDumper.ignore_tables = ignore_tables
+    ActiveRecord::SchemaDumper.dump(pool, io)
+    io.string
+  end
+
+  def db_pool
+    ActiveRecord::Base.connection_pool
+  end
 end