aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb')
-rw-r--r--activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
index fe48d1f807..5c7a93e9d0 100644
--- a/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sqlite_adapter.rb
@@ -50,8 +50,10 @@ module ActiveRecord
raise ArgumentError, "No database file specified. Missing argument: dbfile"
end
- # Allow database path relative to RAILS_ROOT.
- if Object.const_defined?(:RAILS_ROOT)
+ # Allow database path relative to RAILS_ROOT, but only if
+ # the database path is not the special path that tells
+ # Sqlite build a database only in memory.
+ if Object.const_defined?(:RAILS_ROOT) && ':memory:' != config[:dbfile]
config[:dbfile] = File.expand_path(config[:dbfile], RAILS_ROOT)
end
end