Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test and fix for issue 4718 #4746

Merged
merged 2 commits into from
Jan 31, 2012
Merged

Test and fix for issue 4718 #4746

merged 2 commits into from
Jan 31, 2012

Conversation

jenslukowski
Copy link
Contributor

A test case and a fix for issue 4718 (#4718).
The problem lied in line 321 of activerecord/lib/relation/finder_methods.rb:
where_values are not blank in case of subclasses but contained the subclass restriction.
Checking for it should resolve the issue.

@arunagw
Copy link
Member

arunagw commented Jan 30, 2012

cc/ @jonleighton

tenderlove added a commit that referenced this pull request Jan 31, 2012
@tenderlove tenderlove merged commit 5cad7a0 into rails:master Jan 31, 2012
tenderlove added a commit that referenced this pull request Jan 31, 2012
This reverts commit 5cad7a0, reversing
changes made to bb842e8.
@tenderlove
Copy link
Member

This broke the build with identity map turned on. Can you please fix the tests and resend? Thanks.

@jenslukowski
Copy link
Contributor Author

Sorry about that, my bad.
I got a fix working, but one test still fails:

test_instantiation_doesnt_try_to_require_corresponding_file(InheritanceComputeTypeTest) [../inheritance_test.rb:267]:
ActiveRecord::RecordNotFound expected but nothing was raised.

I am looking into it.

@jenslukowski
Copy link
Contributor Author

I submitted #4833 as a fix for the failing tests in active_record

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants