diff options
author | José Valim <jose.valim@plataformatec.com.br> | 2013-08-14 23:55:33 -0700 |
---|---|---|
committer | José Valim <jose.valim@plataformatec.com.br> | 2013-08-14 23:55:33 -0700 |
commit | e90f0e0eb68825b7a07e2f468272a138107154c3 (patch) | |
tree | 167b7ecc14900b0ec78414e2e5bc53cc42acd874 /activerecord/test/models | |
parent | e6b9f130a658977e3f9ddce106d321b55af916b7 (diff) | |
parent | c9e2fa22cbf74f8184e502e7726fcfbe33bdb3e6 (diff) | |
download | rails-e90f0e0eb68825b7a07e2f468272a138107154c3.tar.gz rails-e90f0e0eb68825b7a07e2f468272a138107154c3.tar.bz2 rails-e90f0e0eb68825b7a07e2f468272a138107154c3.zip |
Merge pull request #11897 from wangjohn/fixing_multiple_word_inverse_detection
Fixing multi-word automatic inverse detection.
Diffstat (limited to 'activerecord/test/models')
-rw-r--r-- | activerecord/test/models/man.rb | 1 | ||||
-rw-r--r-- | activerecord/test/models/mixed_case_monkey.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/activerecord/test/models/man.rb b/activerecord/test/models/man.rb index 4bff92dc98..f4d127730c 100644 --- a/activerecord/test/models/man.rb +++ b/activerecord/test/models/man.rb @@ -6,4 +6,5 @@ class Man < ActiveRecord::Base # These are "broken" inverse_of associations for the purposes of testing has_one :dirty_face, :class_name => 'Face', :inverse_of => :dirty_man has_many :secret_interests, :class_name => 'Interest', :inverse_of => :secret_man + has_one :mixed_case_monkey end diff --git a/activerecord/test/models/mixed_case_monkey.rb b/activerecord/test/models/mixed_case_monkey.rb index 763baefd91..4d37371777 100644 --- a/activerecord/test/models/mixed_case_monkey.rb +++ b/activerecord/test/models/mixed_case_monkey.rb @@ -1,3 +1,5 @@ class MixedCaseMonkey < ActiveRecord::Base self.primary_key = 'monkeyID' + + belongs_to :man end |