diff options
Diffstat (limited to 'activerecord')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 2 | ||||
-rw-r--r-- | activerecord/lib/active_record/railties/subscriber.rb | 2 | ||||
-rw-r--r-- | activerecord/test/cases/subscriber_test.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb index 78b897add6..0a52f3a6a2 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb @@ -14,7 +14,7 @@ module ActiveRecord # Allow database path relative to Rails.root, but only if # the database path is not the special path that tells # Sqlite to build a database only in memory. - if Object.const_defined?(:Rails) && ':memory:' != config[:database] + if defined?(Rails.root) && ':memory:' != config[:database] config[:database] = File.expand_path(config[:database], Rails.root) end end diff --git a/activerecord/lib/active_record/railties/subscriber.rb b/activerecord/lib/active_record/railties/subscriber.rb index fd873dbff8..7c2a10cf0f 100644 --- a/activerecord/lib/active_record/railties/subscriber.rb +++ b/activerecord/lib/active_record/railties/subscriber.rb @@ -12,7 +12,7 @@ module ActiveRecord name = color(name, :magenta, true) end - debug " #{name} #{sql}" + debug "#{name} #{sql}" end def odd? diff --git a/activerecord/test/cases/subscriber_test.rb b/activerecord/test/cases/subscriber_test.rb index f569d64ee5..699edbeb76 100644 --- a/activerecord/test/cases/subscriber_test.rb +++ b/activerecord/test/cases/subscriber_test.rb @@ -6,7 +6,7 @@ require "active_record/railties/subscriber" module SubscriberTest Rails::Subscriber.add(:active_record, ActiveRecord::Railties::Subscriber.new) - def super + def setup @old_logger = ActiveRecord::Base.logger super end @@ -17,7 +17,7 @@ module SubscriberTest end def set_logger(logger) - ActiveRecord::Base.logger = @logger + ActiveRecord::Base.logger = logger end def test_basic_query_logging |