fix merge conflict with actionpack changelog

1 files changed, 10 insertions, 9 deletions

diff --git a/activerecord/test/cases/adapter_test.rb b/activerecord/test/cases/adapter_test.rb
index 8a74b6d6f5..91504af901 100644
--- a/activerecord/test/cases/adapter_test.rb
+++ b/activerecord/test/cases/adapter_test.rb
@@ -6,15 +6,16 @@ class AdapterTest < ActiveRecord::TestCase
   end
 
   def test_tables
-    if @connection.respond_to?(:tables)
-      tables = @connection.tables
-      assert tables.include?("accounts")
-      assert tables.include?("authors")
-      assert tables.include?("tasks")
-      assert tables.include?("topics")
-    else
-      warn "#{@connection.class} does not respond to #tables"
-    end
+    tables = @connection.tables
+    assert tables.include?("accounts")
+    assert tables.include?("authors")
+    assert tables.include?("tasks")
+    assert tables.include?("topics")
+  end
+
+  def test_table_exists?
+    assert @connection.table_exists?("accounts")
+    assert !@connection.table_exists?("nonexistingtable")
   end
 
   def test_indexes