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

Clear attribute changes after handling locking #26497

Merged
merged 1 commit into from Sep 17, 2016

Conversation

Projects
None yet
5 participants
@koppen
Contributor

koppen commented Sep 14, 2016

Calling touch on a model using optimistic locking will now leave the model in a non-dirty state with no attribute changes. Without this the changes to the lock version column would stick around even after touch returns.

Fixes #26496.

Before:

model.touch
model.changes
# => {"lock_version"=>[0, "1"]}

With this pull request:

model.touch
model.changes
# => {}

I suspect the previous was accidentally introduced in commit 5e8d96c.

Clear attribute changes after handling locking
Without this the changes to the lock version column will stick around
even after `touch` returns.

Before:

    model.touch
    model.changes
    # => {"lock_version"=>[0, "1"]}

After:

    model.touch
    model.changes
    # {}
@rails-bot

This comment has been minimized.

rails-bot commented Sep 14, 2016

Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @eileencodes (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review.

Please see the contribution instructions for more information.

@eileencodes eileencodes merged commit 2159a93 into rails:master Sep 17, 2016

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
codeclimate Code Climate didn't find any new or fixed issues.
Details
@eileencodes

This comment has been minimized.

Member

eileencodes commented Sep 17, 2016

Thanks for the PR @koppen!

@bdewater

This comment has been minimized.

Contributor

bdewater commented Sep 21, 2016

@eileencodes shouldn't this be backported to 5-0-stable?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment