Merge branch 'master' into set_binds

* master:
  don't establish a new connection when testing with `sqlite3_mem`.
  sqlite >= 3.8.0 supports partial indexes
  Don't try to get the subclass if the inheritance column doesn't exist
  Enum mappings are now exposed via class methods instead of constants.
  Fix fields_for documentation with index option [ci skip]
  quick pass through Active Record CHANGELOG. [ci skip]
  [ci skip] Grammar correction
  single quotes for controller generated routes
  [ci skip] Added alias to CSRF
  Set NameError#name

1 files changed, 5 insertions, 0 deletions

diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb
index ddfc1ac0d6..9a7d918a25 100644
--- a/activerecord/test/schema/schema.rb
+++ b/activerecord/test/schema/schema.rb
@@ -557,9 +557,14 @@ ActiveRecord::Schema.define do
 
   create_table :products, force: true do |t|
     t.references :collection
+    t.references :type
     t.string     :name
   end
 
+  create_table :product_types, force: true do |t|
+    t.string :name
+  end
+
   create_table :projects, force: true do |t|
     t.string :name
     t.string :type