diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 16:59:00 -0600 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-10-20 16:59:00 -0600 |
| commit | 0ebe8e580520b41a5957099868973bcdec5ab7e5 (patch) | |
| tree | be9d7d97069165f2f9a3a72e56195599efd03a09 /activerecord/test/schema | |
| parent | d94ae72a5259c31ea510e6341bbbf4e920312ebe (diff) | |
| parent | 5c32f41d5258743500345db34839a21139676f8e (diff) | |
| download | rails-0ebe8e580520b41a5957099868973bcdec5ab7e5.tar.gz rails-0ebe8e580520b41a5957099868973bcdec5ab7e5.tar.bz2 rails-0ebe8e580520b41a5957099868973bcdec5ab7e5.zip | |
Merge pull request #19938 from vngrs/join_dependency_instantiate_bug
Fix for activerecord join dependency instantiate bug
Diffstat (limited to 'activerecord/test/schema')
| -rw-r--r-- | activerecord/test/schema/schema.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/activerecord/test/schema/schema.rb b/activerecord/test/schema/schema.rb index d334a2740e..690ab1af4b 100644 --- a/activerecord/test/schema/schema.rb +++ b/activerecord/test/schema/schema.rb @@ -253,6 +253,7 @@ ActiveRecord::Schema.define do t.string :first_name t.integer :salary, default: 70000 t.integer :firm_id + t.integer :mentor_id if subsecond_precision_supported? t.datetime :created_at, precision: 6 t.datetime :updated_at, precision: 6 @@ -452,6 +453,10 @@ ActiveRecord::Schema.define do t.string :name end + create_table :mentors, force: true do |t| + t.string :name + end + create_table :minivans, force: true, id: false do |t| t.string :minivan_id t.string :name @@ -660,6 +665,7 @@ ActiveRecord::Schema.define do t.string :name t.string :type t.integer :firm_id + t.integer :mentor_id end create_table :randomly_named_table1, force: true do |t| |