4 files changed, 19 insertions, 16 deletions
diff --git a/activerecord/test/cases/migration/foreign_key_test.rb b/activerecord/test/cases/migration/foreign_key_test.rb
index 49a8fa241f..4237e89731 100644
--- a/activerecord/test/cases/migration/foreign_key_test.rb
+++ b/activerecord/test/cases/migration/foreign_key_test.rb
@@ -233,7 +233,7 @@ module ActiveRecord
           end
           add_foreign_key :houses, :cities, column: "city_id"
 
-          # remove and re-add to test that schema is updated and not accidently cached
+          # remove and re-add to test that schema is updated and not accidentally cached
           remove_foreign_key :houses, :cities
           add_foreign_key :houses, :cities, column: "city_id", on_delete: :cascade
         end
diff --git a/activerecord/test/cases/migration_test.rb b/activerecord/test/cases/migration_test.rb
index 36b6662820..d499aadbae 100644
--- a/activerecord/test/cases/migration_test.rb
+++ b/activerecord/test/cases/migration_test.rb
@@ -445,21 +445,6 @@ class MigrationTest < ActiveRecord::TestCase
     ActiveRecord::Migrator.migrations_paths = old_path
   end
 
-  def test_rename_internal_metadata_table
-    original_internal_metadata_table_name = ActiveRecord::Base.internal_metadata_table_name
-
-    ActiveRecord::Base.internal_metadata_table_name = "active_record_internal_metadatas"
-    Reminder.reset_table_name
-
-    ActiveRecord::Base.internal_metadata_table_name = original_internal_metadata_table_name
-    Reminder.reset_table_name
-
-    assert_equal "ar_internal_metadata", ActiveRecord::InternalMetadata.table_name
-  ensure
-    ActiveRecord::Base.internal_metadata_table_name = original_internal_metadata_table_name
-    Reminder.reset_table_name
-  end
-
   def test_proper_table_name_on_migration
     reminder_class = new_isolated_reminder_class
     migration = ActiveRecord::Migration.new
diff --git a/activerecord/test/cases/primary_keys_test.rb b/activerecord/test/cases/primary_keys_test.rb
index 6c8532cf00..4267ad4a24 100644
--- a/activerecord/test/cases/primary_keys_test.rb
+++ b/activerecord/test/cases/primary_keys_test.rb
@@ -174,6 +174,14 @@ class PrimaryKeysTest < ActiveRecord::TestCase
     assert_equal '2', dashboard.id
   end
 
+  def test_create_without_primary_key_no_extra_query
+    klass = Class.new(ActiveRecord::Base) do
+      self.table_name = 'dashboards'
+    end
+    klass.create! # warmup schema cache
+    assert_queries(3, ignore_none: true) { klass.create! }
+  end
+
   if current_adapter?(:PostgreSQLAdapter)
     def test_serial_with_quoted_sequence_name
       column = MixedCaseMonkey.columns_hash[MixedCaseMonkey.primary_key]
diff --git a/activerecord/test/cases/result_test.rb b/activerecord/test/cases/result_test.rb
index dec01dfa76..83dc5347e0 100644
--- a/activerecord/test/cases/result_test.rb
+++ b/activerecord/test/cases/result_test.rb
@@ -22,6 +22,16 @@ module ActiveRecord
       ], result.to_hash
     end
 
+    test "first returns first row as a hash" do
+      assert_equal(
+        {'col_1' => 'row 1 col 1', 'col_2' => 'row 1 col 2'}, result.first)
+    end
+
+    test "last returns last row as a hash" do
+      assert_equal(
+        {'col_1' => 'row 3 col 1', 'col_2' => 'row 3 col 2'}, result.last)
+    end
+
     test "each with block returns row hashes" do
       result.each do |row|
         assert_equal ['col_1', 'col_2'], row.keys