Merge branch 'master' into adequaterecord

* master: (96 commits)
  clarify CHANGELOG [ci skip].
  Fix Generation of proper migration when   ActiveRecord::Base.pluralize_table_names = false.
  update comments to reflect that options support is not available
  synchronize changelogs and 4.1 release notes. [ci skip]
  do not rely on method_missing hitting arel
  use ARel factory methods for building AST nodes
  Fix date_select option overwriting html classes
  - Rename `increment_or_decrement` to an apt `set_cache_value` since it actually doesn't increment/decrement in localstore.
  Check if any sqlite files are not included in the gitignore
  Remove sqlite3 lines from .gitignore if the application is not using sqlite3.
  Adding active_model in Rails::Info
  Clean up tables after each test.
  Swapped parameters of assert_equal in assert_select
  Update test helper to use latest Digestor API
  Digestor should just rely on the finder to know about the format and the variant -- trying to pass it back in makes a mess of things (oh, and doesnt work)
  Log the full path, including variant, that the digestor is trying to find
  Fix for digestor to consider variants for partials -- this still needs more testing!!
  fix log_tags request object grammar
  Extract with_example_table into helper method.
  test for structure:dump without schema information table. refs eafec46
  ...

Conflicts:
	activerecord/test/cases/relation/where_chain_test.rb

23 files changed, 196 insertions, 117 deletions

diff --git a/activerecord/test/cases/adapters/mysql/active_schema_test.rb b/activerecord/test/cases/adapters/mysql/active_schema_test.rb
index 0878925a6c..e77138eb1d 100644
--- a/activerecord/test/cases/adapters/mysql/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql/active_schema_test.rb
@@ -11,7 +11,7 @@ class ActiveSchemaTest < ActiveRecord::TestCase
     end
   end
 
-  def teardown
+  teardown do
     ActiveRecord::Base.remove_connection
     ActiveRecord::Base.establish_connection(@connection)
   end
diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb
index 5cd5d8ac5f..42ffb91095 100644
--- a/activerecord/test/cases/adapters/mysql/connection_test.rb
+++ b/activerecord/test/cases/adapters/mysql/connection_test.rb
@@ -1,6 +1,9 @@
 require "cases/helper"
+require 'support/ddl_helper'
 
 class MysqlConnectionTest < ActiveRecord::TestCase
+  include DdlHelper
+
   class Klass < ActiveRecord::Base
   end
 
@@ -69,59 +72,50 @@ class MysqlConnectionTest < ActiveRecord::TestCase
   end
 
   def test_exec_no_binds
-    @connection.exec_query('drop table if exists ex')
-    @connection.exec_query(<<-eosql)
-      CREATE TABLE `ex` (`id` int(11) auto_increment PRIMARY KEY,
-        `data` varchar(255))
-    eosql
-    result = @connection.exec_query('SELECT id, data FROM ex')
-    assert_equal 0, result.rows.length
-    assert_equal 2, result.columns.length
-    assert_equal %w{ id data }, result.columns
+    with_example_table do
+      result = @connection.exec_query('SELECT id, data FROM ex')
+      assert_equal 0, result.rows.length
+      assert_equal 2, result.columns.length
+      assert_equal %w{ id data }, result.columns
 
-    @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
+      @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
 
-    # if there are no bind parameters, it will return a string (due to
-    # the libmysql api)
-    result = @connection.exec_query('SELECT id, data FROM ex')
-    assert_equal 1, result.rows.length
-    assert_equal 2, result.columns.length
+      # if there are no bind parameters, it will return a string (due to
+      # the libmysql api)
+      result = @connection.exec_query('SELECT id, data FROM ex')
+      assert_equal 1, result.rows.length
+      assert_equal 2, result.columns.length
 
-    assert_equal [['1', 'foo']], result.rows
+      assert_equal [['1', 'foo']], result.rows
+    end
   end
 
   def test_exec_with_binds
-    @connection.exec_query('drop table if exists ex')
-    @connection.exec_query(<<-eosql)
-      CREATE TABLE `ex` (`id` int(11) auto_increment PRIMARY KEY,
-        `data` varchar(255))
-    eosql
-    @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
-    result = @connection.exec_query(
-      'SELECT id, data FROM ex WHERE id = ?', nil, [[nil, 1]])
+    with_example_table do
+      @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
+      result = @connection.exec_query(
+        'SELECT id, data FROM ex WHERE id = ?', nil, [[nil, 1]])
 
-    assert_equal 1, result.rows.length
-    assert_equal 2, result.columns.length
+      assert_equal 1, result.rows.length
+      assert_equal 2, result.columns.length
 
-    assert_equal [[1, 'foo']], result.rows
+      assert_equal [[1, 'foo']], result.rows
+    end
   end
 
   def test_exec_typecasts_bind_vals
-    @connection.exec_query('drop table if exists ex')
-    @connection.exec_query(<<-eosql)
-      CREATE TABLE `ex` (`id` int(11) auto_increment PRIMARY KEY,
-        `data` varchar(255))
-    eosql
-    @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
-    column = @connection.columns('ex').find { |col| col.name == 'id' }
+    with_example_table do
+      @connection.exec_query('INSERT INTO ex (id, data) VALUES (1, "foo")')
+      column = @connection.columns('ex').find { |col| col.name == 'id' }
 
-    result = @connection.exec_query(
-      'SELECT id, data FROM ex WHERE id = ?', nil, [[column, '1-fuu']])
+      result = @connection.exec_query(
+        'SELECT id, data FROM ex WHERE id = ?', nil, [[column, '1-fuu']])
 
-    assert_equal 1, result.rows.length
-    assert_equal 2, result.columns.length
+      assert_equal 1, result.rows.length
+      assert_equal 2, result.columns.length
 
-    assert_equal [[1, 'foo']], result.rows
+      assert_equal [[1, 'foo']], result.rows
+    end
   end
 
   # Test that MySQL allows multiple results for stored procedures
@@ -174,4 +168,12 @@ class MysqlConnectionTest < ActiveRecord::TestCase
       ActiveRecord::Base.establish_connection(original_connection)
     end
   end
+
+  def with_example_table(&block)
+    definition ||= <<-SQL
+      `id` int(11) auto_increment PRIMARY KEY,
+      `data` varchar(255)
+    SQL
+    super(@connection, 'ex', definition, &block)
+  end
 end
diff --git a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
index 578f6301bd..1699380eb3 100644
--- a/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
@@ -1,19 +1,15 @@
 # encoding: utf-8
 
 require "cases/helper"
+require 'support/ddl_helper'
 
 module ActiveRecord
   module ConnectionAdapters
     class MysqlAdapterTest < ActiveRecord::TestCase
+      include DdlHelper
+
       def setup
         @conn = ActiveRecord::Base.connection
-        @conn.exec_query('drop table if exists ex')
-        @conn.exec_query(<<-eosql)
-          CREATE TABLE `ex` (
-            `id` int(11) auto_increment PRIMARY KEY,
-            `number` integer,
-            `data` varchar(255))
-        eosql
       end
 
       def test_bad_connection_mysql
@@ -25,8 +21,10 @@ module ActiveRecord
       end
 
       def test_valid_column
-        column = @conn.columns('ex').find { |col| col.name == 'id' }
-        assert @conn.valid_type?(column.type)
+        with_example_table do
+          column = @conn.columns('ex').find { |col| col.name == 'id' }
+          assert @conn.valid_type?(column.type)
+        end
       end
 
       def test_invalid_column
@@ -38,31 +36,35 @@ module ActiveRecord
       end
 
       def test_exec_insert_number
-        insert(@conn, 'number' => 10)
+        with_example_table do
+          insert(@conn, 'number' => 10)
 
-        result = @conn.exec_query('SELECT number FROM ex WHERE number = 10')
+          result = @conn.exec_query('SELECT number FROM ex WHERE number = 10')
 
-        assert_equal 1, result.rows.length
-        # if there are no bind parameters, it will return a string (due to
-        # the libmysql api)
-        assert_equal '10', result.rows.last.last
+          assert_equal 1, result.rows.length
+          # if there are no bind parameters, it will return a string (due to
+          # the libmysql api)
+          assert_equal '10', result.rows.last.last
+        end
       end
 
       def test_exec_insert_string
-        str = 'いただきます！'
-        insert(@conn, 'number' => 10, 'data' => str)
+        with_example_table do
+          str = 'いただきます！'
+          insert(@conn, 'number' => 10, 'data' => str)
 
-        result = @conn.exec_query('SELECT number, data FROM ex WHERE number = 10')
+          result = @conn.exec_query('SELECT number, data FROM ex WHERE number = 10')
 
-        value = result.rows.last.last
+          value = result.rows.last.last
 
-        # FIXME: this should probably be inside the mysql AR adapter?
-        value.force_encoding(@conn.client_encoding)
+          # FIXME: this should probably be inside the mysql AR adapter?
+          value.force_encoding(@conn.client_encoding)
 
-        # The strings in this file are utf-8, so transcode to utf-8
-        value.encode!(Encoding::UTF_8)
+          # The strings in this file are utf-8, so transcode to utf-8
+          value.encode!(Encoding::UTF_8)
 
-        assert_equal str, value
+          assert_equal str, value
+        end
       end
 
       def test_tables_quoting
@@ -74,46 +76,37 @@ module ActiveRecord
       end
 
       def test_pk_and_sequence_for
-        pk, seq = @conn.pk_and_sequence_for('ex')
-        assert_equal 'id', pk
-        assert_equal @conn.default_sequence_name('ex', 'id'), seq
+        with_example_table do
+          pk, seq = @conn.pk_and_sequence_for('ex')
+          assert_equal 'id', pk
+          assert_equal @conn.default_sequence_name('ex', 'id'), seq
+        end
       end
 
       def test_pk_and_sequence_for_with_non_standard_primary_key
-        @conn.exec_query('drop table if exists ex_with_non_standard_pk')
-        @conn.exec_query(<<-eosql)
-          CREATE TABLE `ex_with_non_standard_pk` (
-            `code` INT(11) auto_increment,
-             PRIMARY KEY  (`code`))
-        eosql
-        pk, seq = @conn.pk_and_sequence_for('ex_with_non_standard_pk')
-        assert_equal 'code', pk
-        assert_equal @conn.default_sequence_name('ex_with_non_standard_pk', 'code'), seq
+        with_example_table '`code` INT(11) auto_increment, PRIMARY KEY (`code`)' do
+          pk, seq = @conn.pk_and_sequence_for('ex')
+          assert_equal 'code', pk
+          assert_equal @conn.default_sequence_name('ex', 'code'), seq
+        end
       end
 
       def test_pk_and_sequence_for_with_custom_index_type_pk
-        @conn.exec_query('drop table if exists ex_with_custom_index_type_pk')
-        @conn.exec_query(<<-eosql)
-          CREATE TABLE `ex_with_custom_index_type_pk` (
-            `id` INT(11) auto_increment,
-             PRIMARY KEY  USING BTREE (`id`))
-        eosql
-        pk, seq = @conn.pk_and_sequence_for('ex_with_custom_index_type_pk')
-        assert_equal 'id', pk
-        assert_equal @conn.default_sequence_name('ex_with_custom_index_type_pk', 'id'), seq
+        with_example_table '`id` INT(11) auto_increment, PRIMARY KEY USING BTREE (`id`)' do
+          pk, seq = @conn.pk_and_sequence_for('ex')
+          assert_equal 'id', pk
+          assert_equal @conn.default_sequence_name('ex', 'id'), seq
+        end
       end
 
       def test_tinyint_integer_typecasting
-        @conn.exec_query('drop table if exists ex_with_non_boolean_tinyint_column')
-        @conn.exec_query(<<-eosql)
-          CREATE TABLE `ex_with_non_boolean_tinyint_column` (
-            `status` TINYINT(4))
-        eosql
-        insert(@conn, { 'status' => 2 }, 'ex_with_non_boolean_tinyint_column')
+        with_example_table '`status` TINYINT(4)' do
+          insert(@conn, { 'status' => 2 }, 'ex')
 
-        result = @conn.exec_query('SELECT status FROM ex_with_non_boolean_tinyint_column')
+          result = @conn.exec_query('SELECT status FROM ex')
 
-        assert_equal 2, result.column_types['status'].type_cast(result.last['status'])
+          assert_equal 2, result.column_types['status'].type_cast(result.last['status'])
+        end
       end
 
       def test_supports_extensions
@@ -140,6 +133,15 @@ module ActiveRecord
 
         ctx.exec_insert(sql, 'SQL', binds)
       end
+
+      def with_example_table(definition = nil, &block)
+        definition ||= <<-SQL
+          `id` int(11) auto_increment PRIMARY KEY,
+          `number` integer,
+          `data` varchar(255)
+        SQL
+        super(@conn, 'ex', definition, &block)
+      end
     end
   end
 end
diff --git a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
index 8eb9565963..61ae0abfd1 100644
--- a/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql/reserved_word_test.rb
@@ -37,7 +37,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
       'distinct_select'=>'distinct_id int, select_id int'
   end
 
-  def teardown
+  teardown do
     drop_tables_directly ['group', 'select', 'values', 'distinct', 'distinct_select', 'order']
   end
 
diff --git a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb
index 4ccf568406..7905edaf83 100644
--- a/activerecord/test/cases/adapters/mysql2/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/active_schema_test.rb
@@ -11,7 +11,7 @@ class ActiveSchemaTest < ActiveRecord::TestCase
     end
   end
 
-  def teardown
+  teardown do
     ActiveRecord::Base.remove_connection
     ActiveRecord::Base.establish_connection(@connection)
   end
diff --git a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
index 1a82308176..799d927ee4 100644
--- a/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/reserved_word_test.rb
@@ -37,7 +37,7 @@ class MysqlReservedWordTest < ActiveRecord::TestCase
       'distinct_select'=>'distinct_id int, select_id int'
   end
 
-  def teardown
+  teardown do
     drop_tables_directly ['group', 'select', 'values', 'distinct', 'distinct_select', 'order']
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/active_schema_test.rb b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
index 22dd48e113..3808db5141 100644
--- a/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/active_schema_test.rb
@@ -7,7 +7,7 @@ class PostgresqlActiveSchemaTest < ActiveRecord::TestCase
     end
   end
 
-  def teardown
+  teardown do
     ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
       remove_method :execute
     end
diff --git a/activerecord/test/cases/adapters/postgresql/array_test.rb b/activerecord/test/cases/adapters/postgresql/array_test.rb
index 3090f4478f..f5f1c791e1 100644
--- a/activerecord/test/cases/adapters/postgresql/array_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/array_test.rb
@@ -19,7 +19,7 @@ class PostgresqlArrayTest < ActiveRecord::TestCase
     @column = PgArray.columns.find { |c| c.name == 'tags' }
   end
 
-  def teardown
+  teardown do
     @connection.execute 'drop table if exists pg_arrays'
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/bytea_test.rb b/activerecord/test/cases/adapters/postgresql/bytea_test.rb
index b8dd35c4c5..c3394d7712 100644
--- a/activerecord/test/cases/adapters/postgresql/bytea_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/bytea_test.rb
@@ -23,7 +23,7 @@ class PostgresqlByteaTest < ActiveRecord::TestCase
     assert(@column.is_a?(ActiveRecord::ConnectionAdapters::PostgreSQLColumn))
   end
 
-  def teardown
+  teardown do
     @connection.execute 'drop table if exists bytea_data_type'
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/citext_test.rb b/activerecord/test/cases/adapters/postgresql/citext_test.rb
index ebb9ff98b1..148dc9d07c 100644
--- a/activerecord/test/cases/adapters/postgresql/citext_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/citext_test.rb
@@ -25,7 +25,7 @@ class PostgresqlCitextTest < ActiveRecord::TestCase
     @column = Citext.columns_hash['cival']
   end
 
-  def teardown
+  teardown do
     @connection.execute 'DROP TABLE IF EXISTS citexts;'
     @connection.execute 'DROP EXTENSION IF EXISTS citext CASCADE;'
   end
diff --git a/activerecord/test/cases/adapters/postgresql/composite_test.rb b/activerecord/test/cases/adapters/postgresql/composite_test.rb
index 7202cce390..ed39204145 100644
--- a/activerecord/test/cases/adapters/postgresql/composite_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/composite_test.rb
@@ -8,7 +8,7 @@ class PostgresqlCompositeTest < ActiveRecord::TestCase
     self.table_name = "postgresql_composites"
   end
 
-  def teardown
+  teardown do
     @connection.execute 'DROP TABLE IF EXISTS postgresql_composites'
     @connection.execute 'DROP TYPE IF EXISTS full_address'
   end
diff --git a/activerecord/test/cases/adapters/postgresql/connection_test.rb b/activerecord/test/cases/adapters/postgresql/connection_test.rb
index 4715fa002d..aa4996133f 100644
--- a/activerecord/test/cases/adapters/postgresql/connection_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/connection_test.rb
@@ -45,6 +45,37 @@ module ActiveRecord
       assert_equal 'off', expect
     end
 
+    def test_reset
+      @connection.query('ROLLBACK')
+      @connection.query('SET geqo TO off')
+
+      # Verify the setting has been applied.
+      expect = @connection.query('show geqo').first.first
+      assert_equal 'off', expect
+
+      @connection.reset!
+
+      # Verify the setting has been cleared.
+      expect = @connection.query('show geqo').first.first
+      assert_equal 'on', expect
+    end
+
+    def test_reset_with_transaction
+      @connection.query('ROLLBACK')
+      @connection.query('SET geqo TO off')
+
+      # Verify the setting has been applied.
+      expect = @connection.query('show geqo').first.first
+      assert_equal 'off', expect
+
+      @connection.query('BEGIN')
+      @connection.reset!
+
+      # Verify the setting has been cleared.
+      expect = @connection.query('show geqo').first.first
+      assert_equal 'on', expect
+    end
+
     def test_tables_logs_name
       @connection.tables('hello')
       assert_equal 'SCHEMA', @subscriber.logged[0][1]
diff --git a/activerecord/test/cases/adapters/postgresql/datatype_test.rb b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
index 158bc6ee89..e7dda1a1af 100644
--- a/activerecord/test/cases/adapters/postgresql/datatype_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/datatype_test.rb
@@ -67,7 +67,7 @@ class PostgresqlDataTypeTest < ActiveRecord::TestCase
     @connection.execute("INSERT INTO postgresql_timestamp_with_zones (id, time) VALUES (1, '2010-01-01 10:00:00-1')")
   end
 
-  def teardown
+  teardown do
     [PostgresqlArray, PostgresqlTsvector, PostgresqlMoney, PostgresqlNumber, PostgresqlTime, PostgresqlNetworkAddress,
      PostgresqlBitString, PostgresqlOid, PostgresqlTimestampWithZone].each(&:delete_all)
   end
diff --git a/activerecord/test/cases/adapters/postgresql/enum_test.rb b/activerecord/test/cases/adapters/postgresql/enum_test.rb
index 62f84caf91..7208edef5f 100644
--- a/activerecord/test/cases/adapters/postgresql/enum_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/enum_test.rb
@@ -8,7 +8,7 @@ class PostgresqlEnumTest < ActiveRecord::TestCase
     self.table_name = "postgresql_enums"
   end
 
-  def teardown
+  teardown do
     @connection.execute 'DROP TABLE IF EXISTS postgresql_enums'
     @connection.execute 'DROP TYPE IF EXISTS mood'
   end
diff --git a/activerecord/test/cases/adapters/postgresql/hstore_test.rb b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
index f2502430de..90ec1524b5 100644
--- a/activerecord/test/cases/adapters/postgresql/hstore_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/hstore_test.rb
@@ -31,7 +31,7 @@ class PostgresqlHstoreTest < ActiveRecord::TestCase
     @column = Hstore.columns.find { |c| c.name == 'tags' }
   end
 
-  def teardown
+  teardown do
     @connection.execute 'drop table if exists hstores'
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/json_test.rb b/activerecord/test/cases/adapters/postgresql/json_test.rb
index 3daef399d8..10c0a6c395 100644
--- a/activerecord/test/cases/adapters/postgresql/json_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/json_test.rb
@@ -26,7 +26,7 @@ class PostgresqlJSONTest < ActiveRecord::TestCase
     @column = JsonDataType.columns.find { |c| c.name == 'payload' }
   end
 
-  def teardown
+  teardown do
     @connection.execute 'drop table if exists json_data_type'
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/ltree_test.rb b/activerecord/test/cases/adapters/postgresql/ltree_test.rb
index 5d12ca75ca..e72fd4360d 100644
--- a/activerecord/test/cases/adapters/postgresql/ltree_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/ltree_test.rb
@@ -19,7 +19,7 @@ class PostgresqlLtreeTest < ActiveRecord::TestCase
     skip "do not test on PG without ltree"
   end
 
-  def teardown
+  teardown do
     @connection.execute 'drop table if exists ltrees'
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index 019406dd84..49d8ec238d 100644
--- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -1,9 +1,12 @@
 # encoding: utf-8
 require "cases/helper"
+require 'support/ddl_helper'
 
 module ActiveRecord
   module ConnectionAdapters
     class PostgreSQLAdapterTest < ActiveRecord::TestCase
+      include DdlHelper
+
       def setup
         @connection = ActiveRecord::Base.connection
       end
@@ -176,6 +179,51 @@ module ActiveRecord
         assert_nil @connection.pk_and_sequence_for('unobtainium')
       end
 
+      def test_pk_and_sequence_for_with_collision_pg_class_oid
+        @connection.exec_query('create table ex(id serial primary key)')
+        @connection.exec_query('create table ex2(id serial primary key)')
+
+        correct_depend_record = [
+          "'pg_class'::regclass",
+          "'ex_id_seq'::regclass",
+          '0',
+          "'pg_class'::regclass",
+          "'ex'::regclass",
+          '1',
+          "'a'"
+        ]
+
+        collision_depend_record = [
+          "'pg_attrdef'::regclass",
+          "'ex2_id_seq'::regclass",
+          '0',
+          "'pg_class'::regclass",
+          "'ex'::regclass",
+          '1',
+          "'a'"
+        ]
+
+        @connection.exec_query(
+          "DELETE FROM pg_depend WHERE objid = 'ex_id_seq'::regclass AND refobjid = 'ex'::regclass AND deptype = 'a'"
+        )
+        @connection.exec_query(
+          "INSERT INTO pg_depend VALUES(#{collision_depend_record.join(',')})"
+        )
+        @connection.exec_query(
+          "INSERT INTO pg_depend VALUES(#{correct_depend_record.join(',')})"
+        )
+
+        seq = @connection.pk_and_sequence_for('ex').last
+        assert_equal 'ex_id_seq', seq
+
+        @connection.exec_query(
+          "DELETE FROM pg_depend WHERE objid = 'ex2_id_seq'::regclass AND refobjid = 'ex'::regclass AND deptype = 'a'"
+        )
+      ensure
+        @connection.exec_query('DROP TABLE IF EXISTS ex')
+        @connection.exec_query('DROP TABLE IF EXISTS ex2')
+      end
+
       def test_exec_insert_number
         with_example_table do
           insert(@connection, 'number' => 10)
@@ -324,12 +372,8 @@ module ActiveRecord
         ctx.exec_insert(sql, 'SQL', binds)
       end
 
-      def with_example_table(definition = nil)
-        definition ||= 'id serial primary key, number integer, data character varying(255)'
-        @connection.exec_query("create table ex(#{definition})")
-        yield
-      ensure
-        @connection.exec_query('drop table if exists ex')
+      def with_example_table(definition = 'id serial primary key, number integer, data character varying(255)', &block)
+        super(@connection, 'ex', definition, &block)
       end
 
       def connection_without_insert_returning
diff --git a/activerecord/test/cases/adapters/postgresql/range_test.rb b/activerecord/test/cases/adapters/postgresql/range_test.rb
index 4e84335e9b..a9d4312fb3 100644
--- a/activerecord/test/cases/adapters/postgresql/range_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/range_test.rb
@@ -8,7 +8,7 @@ if ActiveRecord::Base.connection.supports_ranges?
   end
 
   class PostgresqlRangeTest < ActiveRecord::TestCase
-    def teardown
+    teardown do
       @connection.execute 'DROP TABLE IF EXISTS postgresql_ranges'
       @connection.execute 'DROP TYPE IF EXISTS floatrange'
     end
diff --git a/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
index d5e1838543..99c26c4bf7 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_authorization_test.rb
@@ -27,7 +27,7 @@ class SchemaAuthorizationTest < ActiveRecord::TestCase
     end
   end
 
-  def teardown
+  teardown do
     set_session_auth
     @connection.execute "RESET search_path"
     USERS.each do |u|
diff --git a/activerecord/test/cases/adapters/postgresql/schema_test.rb b/activerecord/test/cases/adapters/postgresql/schema_test.rb
index 3f7009c1d1..5e5f653d17 100644
--- a/activerecord/test/cases/adapters/postgresql/schema_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/schema_test.rb
@@ -71,7 +71,7 @@ class SchemaTest < ActiveRecord::TestCase
     @connection.execute "CREATE TABLE #{SCHEMA_NAME}.#{UNMATCHED_PK_TABLE_NAME} (id integer NOT NULL DEFAULT nextval('#{SCHEMA_NAME}.#{UNMATCHED_SEQUENCE_NAME}'::regclass), CONSTRAINT unmatched_pkey PRIMARY KEY (id))"
   end
 
-  def teardown
+  teardown do
     @connection.execute "DROP SCHEMA #{SCHEMA2_NAME} CASCADE"
     @connection.execute "DROP SCHEMA #{SCHEMA_NAME} CASCADE"
   end
diff --git a/activerecord/test/cases/adapters/postgresql/view_test.rb b/activerecord/test/cases/adapters/postgresql/view_test.rb
index 66e07b71a0..08071894c4 100644
--- a/activerecord/test/cases/adapters/postgresql/view_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/view_test.rb
@@ -24,7 +24,7 @@ class ViewTest < ActiveRecord::TestCase
     @connection.execute "CREATE VIEW #{SCHEMA_NAME}.#{VIEW_NAME} AS SELECT id,name,email,moment FROM #{SCHEMA_NAME}.#{TABLE_NAME}"
   end
 
-  def teardown
+  teardown do
     @connection.execute "DROP SCHEMA #{SCHEMA_NAME} CASCADE"
   end
 
diff --git a/activerecord/test/cases/adapters/postgresql/xml_test.rb b/activerecord/test/cases/adapters/postgresql/xml_test.rb
index dd2a727afe..ae299697b1 100644
--- a/activerecord/test/cases/adapters/postgresql/xml_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/xml_test.rb
@@ -23,7 +23,7 @@ class PostgresqlXMLTest < ActiveRecord::TestCase
     @column = XmlDataType.columns.find { |c| c.name == 'payload' }
   end
 
-  def teardown
+  teardown do
     @connection.execute 'drop table if exists xml_data_type'
   end