diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-13 00:41:04 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-13 01:19:23 +0100 |
| commit | da5978c22374b8a3b15a421ff4920e0940435253 (patch) | |
| tree | e9a94394f0ce7455cd0f955ede80e0b5f5f573b0 /activerecord/lib/active_record/connection_adapters | |
| parent | 8d78a82d797bf8809acb1d2ebb30cf81488ac99c (diff) | |
| download | rails-da5978c22374b8a3b15a421ff4920e0940435253.tar.gz rails-da5978c22374b8a3b15a421ff4920e0940435253.tar.bz2 rails-da5978c22374b8a3b15a421ff4920e0940435253.zip | |
Add subscriber for ActionPack and move all logging inside it.
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
| -rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb | 2 |
1 files changed, 1 insertions, 1 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 |