3 files changed, 20 insertions, 18 deletions
diff --git a/activerecord/test/support/config.rb b/activerecord/test/support/config.rb
index 6d123688a3..aaff408b41 100644
--- a/activerecord/test/support/config.rb
+++ b/activerecord/test/support/config.rb
@@ -1,7 +1,7 @@
-require 'yaml'
-require 'erubis'
-require 'fileutils'
-require 'pathname'
+require "yaml"
+require "erb"
+require "fileutils"
+require "pathname"
 
 module ARTest
   class << self
@@ -12,28 +12,29 @@ module ARTest
     private
 
     def config_file
-      Pathname.new(ENV['ARCONFIG'] || TEST_ROOT + '/config.yml')
+      Pathname.new(ENV["ARCONFIG"] || TEST_ROOT + "/config.yml")
     end
 
     def read_config
       unless config_file.exist?
-        FileUtils.cp TEST_ROOT + '/config.example.yml', config_file
+        FileUtils.cp TEST_ROOT + "/config.example.yml", config_file
       end
 
-      erb = Erubis::Eruby.new(config_file.read)
+      erb = ERB.new(config_file.read)
       expand_config(YAML.parse(erb.result(binding)).transform)
     end
 
     def expand_config(config)
-      config['connections'].each do |adapter, connection|
-        dbs = [['arunit', 'activerecord_unittest'], ['arunit2', 'activerecord_unittest2']]
+      config["connections"].each do |adapter, connection|
+        dbs = [["arunit", "activerecord_unittest"], ["arunit2", "activerecord_unittest2"],
+               ["arunit_without_prepared_statements", "activerecord_unittest"]]
         dbs.each do |name, dbname|
           unless connection[name].is_a?(Hash)
-            connection[name] = { 'database' => connection[name] }
+            connection[name] = { "database" => connection[name] }
           end
 
-          connection[name]['database'] ||= dbname
-          connection[name]['adapter']  ||= adapter
+          connection[name]["database"] ||= dbname
+          connection[name]["adapter"]  ||= adapter
         end
       end
 
diff --git a/activerecord/test/support/connection.rb b/activerecord/test/support/connection.rb
index d11fd9cfc1..c9260398e2 100644
--- a/activerecord/test/support/connection.rb
+++ b/activerecord/test/support/connection.rb
@@ -1,14 +1,15 @@
-require 'active_support/logger'
-require 'models/college'
-require 'models/course'
+require "active_support/logger"
+require "models/college"
+require "models/course"
+require "models/professor"
 
 module ARTest
   def self.connection_name
-    ENV['ARCONN'] || config['default_connection']
+    ENV["ARCONN"] || config["default_connection"]
   end
 
   def self.connection_config
-    config['connections'][connection_name]
+    config["connections"][connection_name]
   end
 
   def self.connect
diff --git a/activerecord/test/support/schema_dumping_helper.rb b/activerecord/test/support/schema_dumping_helper.rb
index 2d1651454d..666c1b6a14 100644
--- a/activerecord/test/support/schema_dumping_helper.rb
+++ b/activerecord/test/support/schema_dumping_helper.rb
@@ -1,7 +1,7 @@
 module SchemaDumpingHelper
   def dump_table_schema(table, connection = ActiveRecord::Base.connection)
     old_ignore_tables = ActiveRecord::SchemaDumper.ignore_tables
-    ActiveRecord::SchemaDumper.ignore_tables = connection.tables - [table]
+    ActiveRecord::SchemaDumper.ignore_tables = connection.data_sources - [table]
     stream = StringIO.new
     ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
     stream.string