diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-09 09:35:15 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-09 09:35:15 -0200 |
| commit | 8313f3c5771bfaa3325446d2bbe29c405f8b22c4 (patch) | |
| tree | be9d17979b3d92fc03ce7a428cb852e7401df4f0 /activerecord/test | |
| parent | 45b17cee59ed856294c29e5127027a1d5afae7db (diff) | |
| parent | 3d1a879f4cf9931a81477b63f9f999d52bac771c (diff) | |
| download | rails-8313f3c5771bfaa3325446d2bbe29c405f8b22c4.tar.gz rails-8313f3c5771bfaa3325446d2bbe29c405f8b22c4.tar.bz2 rails-8313f3c5771bfaa3325446d2bbe29c405f8b22c4.zip | |
Merge pull request #8838 from yahonda/8806_3-2-stable
Ignore binds payload with nil column in AR log subscriber
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/log_subscriber_test.rb | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/activerecord/test/cases/log_subscriber_test.rb b/activerecord/test/cases/log_subscriber_test.rb index e24a5ca5aa..10ee86de4a 100644 --- a/activerecord/test/cases/log_subscriber_test.rb +++ b/activerecord/test/cases/log_subscriber_test.rb @@ -7,6 +7,19 @@ class LogSubscriberTest < ActiveRecord::TestCase include ActiveSupport::LogSubscriber::TestHelper include ActiveSupport::BufferedLogger::Severity + class TestDebugLogSubscriber < ActiveRecord::LogSubscriber + attr_reader :debugs + + def initialize + @debugs = [] + super + end + + def debug message + @debugs << message + end + end + fixtures :posts def setup @@ -32,18 +45,7 @@ class LogSubscriberTest < ActiveRecord::TestCase def test_schema_statements_are_ignored event = Struct.new(:duration, :payload) - logger = Class.new(ActiveRecord::LogSubscriber) { - attr_accessor :debugs - - def initialize - @debugs = [] - super - end - - def debug message - @debugs << message - end - }.new + logger = TestDebugLogSubscriber.new assert_equal 0, logger.debugs.length logger.sql(event.new(0, { :sql => 'hi mom!' })) @@ -56,6 +58,14 @@ class LogSubscriberTest < ActiveRecord::TestCase assert_equal 2, logger.debugs.length end + def test_ignore_binds_payload_with_nil_column + event = Struct.new(:duration, :payload) + + logger = TestDebugLogSubscriber.new + logger.sql(event.new(0, :sql => 'hi mom!', :binds => [[nil, 1]])) + assert_equal 1, logger.debugs.length + end + def test_basic_query_logging Developer.all wait |