5 files changed, 41 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/bytea_test.rb b/activerecord/test/cases/adapters/postgresql/bytea_test.rb
index b6bb1929e6..7adc070430 100644
--- a/activerecord/test/cases/adapters/postgresql/bytea_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/bytea_test.rb
@@ -1,6 +1,9 @@
 require "cases/helper"
+require 'support/schema_dumping_helper'
 
 class PostgresqlByteaTest < ActiveRecord::PostgreSQLTestCase
+  include SchemaDumpingHelper
+
   class ByteaDataType < ActiveRecord::Base
     self.table_name = 'bytea_data_type'
   end
@@ -122,4 +125,10 @@ class PostgresqlByteaTest < ActiveRecord::PostgreSQLTestCase
     obj.reload
     assert_equal "hello world", obj.serialized
   end
+
+  def test_schema_dumping
+    output = dump_table_schema("bytea_data_type")
+    assert_match %r{t\.binary\s+"payload"$}, output
+    assert_match %r{t\.binary\s+"serialized"$}, output
+  end
 end
diff --git a/activerecord/test/cases/adapters/postgresql/serial_test.rb b/activerecord/test/cases/adapters/postgresql/serial_test.rb
index 2247d3c774..76bcec9672 100644
--- a/activerecord/test/cases/adapters/postgresql/serial_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/serial_test.rb
@@ -34,7 +34,7 @@ class PostgresqlSerialTest < ActiveRecord::PostgreSQLTestCase
 
   def test_schema_dump_with_shorthand
     output = dump_table_schema "postgresql_serials"
-    assert_match %r{t\.serial\s+"seq"}, output
+    assert_match %r{t\.serial\s+"seq",\s+null: false$}, output
   end
 
   def test_schema_dump_with_not_serial
@@ -76,7 +76,7 @@ class PostgresqlBigSerialTest < ActiveRecord::PostgreSQLTestCase
 
   def test_schema_dump_with_shorthand
     output = dump_table_schema "postgresql_big_serials"
-    assert_match %r{t\.bigserial\s+"seq"}, output
+    assert_match %r{t\.bigserial\s+"seq",\s+null: false$}, output
   end
 
   def test_schema_dump_with_not_bigserial
diff --git a/activerecord/test/cases/scoping/default_scoping_test.rb b/activerecord/test/cases/scoping/default_scoping_test.rb
index c918cbdef5..dcd09b6973 100644
--- a/activerecord/test/cases/scoping/default_scoping_test.rb
+++ b/activerecord/test/cases/scoping/default_scoping_test.rb
@@ -4,6 +4,7 @@ require 'models/comment'
 require 'models/developer'
 require 'models/computer'
 require 'models/vehicle'
+require 'models/cat'
 
 class DefaultScopingTest < ActiveRecord::TestCase
   fixtures :developers, :posts, :comments
@@ -485,4 +486,15 @@ class DefaultScopingTest < ActiveRecord::TestCase
     assert_equal 1, SubConditionalStiPost.all.to_a.size
     assert_equal 2, SubConditionalStiPost.unscope(where: :title).to_a.size
   end
+
+  def test_with_abstract_class_scope_should_be_executed_in_correct_context
+    vegetarian_pattern, gender_pattern = if current_adapter?(:Mysql2Adapter)
+      [/`lions`.`is_vegetarian`/, /`lions`.`gender`/]
+    else
+      [/"lions"."is_vegetarian"/, /"lions"."gender"/]
+    end
+
+    assert_match vegetarian_pattern, Lion.all.to_sql
+    assert_match gender_pattern, Lion.female.to_sql
+  end
 end
diff --git a/activerecord/test/models/cat.rb b/activerecord/test/models/cat.rb
new file mode 100644
index 0000000000..e543d3aadb
--- /dev/null
+++ b/activerecord/test/models/cat.rb
@@ -0,0 +1,13 @@
+class Cat < ActiveRecord::Base
+  self.abstract_class = true
+
+  enum gender: [:female, :male]
+
+  scope :female, -> { where(gender: genders[:female]) }
+  scope :male, -> { where(gender: genders[:male]) }
+
+  default_scope -> { where(is_vegetarian: false) }
+end
+
+class Lion < Cat
+end
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index 2a8996f35c..01dbf2cee6 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -421,6 +421,11 @@ ActiveRecord::Schema.define do
     t.integer :amount
   end
 
+  create_table :lions, force: true do |t|
+    t.integer :gender
+    t.boolean :is_vegetarian, default: false
+  end
+
   create_table :lock_without_defaults, force: true do |t|
     t.column :lock_version, :integer
   end