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

Already on GitHub? Sign in to your account

Ignore binds payload with nil column in AR log subscriber #8838

Merged
merged 1 commit into from Jan 9, 2013

Conversation

Projects
None yet
3 participants
Contributor

yahonda commented Jan 9, 2013

This pull request backports commit 77516a7 to 3-2-stable branch.

Conflict resolution:

  • Revert ruby 1.9 style hash to support ruby 1.8
  • Do not include 8f59ffc into 3-2-stable

This commit works with ruby-1.9.3-p362 without any regressions.
But it causes two RuntimeError: ActiveRecord::Associations::Association errors at test_sqlite3 when tested with ruby-1.8.7-p371.

It's strange for me, Tested 3-2-stable branch without my fix, a minimum testcase causes the same RuntimeError: ActiveRecord::Associations::Association.

Ignore binds payload with nil column in AR log subscriber
Some tests were raising the following error:

    Could not log "sql.active_record" event. NoMethodError: undefined method
    `type' for nil:NilClass`

Due to the way binds were being logged, the column info was considered
always present, but that is not true for some of the tests listed in the
issue.

Closes #8806.

Conflicts:

	activerecord/lib/active_record/log_subscriber.rb
	activerecord/test/cases/log_subscriber_test.rb

Conflict resolution:
- Revert ruby 1.9 style hash to support ruby 1.8
- Do not include 8f59ffc into 3-2-stable
Owner

rafaelfranca commented Jan 9, 2013

@yahonda all green in my machine for the sqlite3 tests. I'll check the full Active Record suite. If all green I'll merge and see how the CI behaves.

rafaelfranca added a commit that referenced this pull request Jan 9, 2013

Merge pull request #8838 from yahonda/8806_3-2-stable
Ignore binds payload with nil column in AR log subscriber

@rafaelfranca rafaelfranca merged commit 3d1a879 into rails:3-2-stable Jan 9, 2013

❤️

Contributor

yahonda commented Jan 9, 2013

CI https://travis-ci.org/rails/rails/jobs/4043106 are all green. Thanks for testing and merging!

@yahonda yahonda deleted the yahonda:8806_3-2-stable branch Jan 9, 2013

@parameme parameme referenced this pull request in dejan/rails_panel Mar 20, 2013

Closed

SystemStackError (stack level too deep) #34

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