From b6c971e123e0c20ddf2c8e1f43feef8c9500d17b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Mon, 5 Aug 2013 20:41:27 -0300 Subject: config[:database] should be a string This change was breaking the Railties tests. See https://travis-ci.org/rails/rails/jobs/9865969 --- .../lib/active_record/connection_adapters/sqlite3_adapter.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb index 16306a78cf..e1475416eb 100644 --- a/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb +++ b/activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb @@ -18,9 +18,9 @@ module ActiveRecord # the database path is not the special path that tells # Sqlite to build a database only in memory. if ':memory:' != config[:database] - config[:database] = Pathname.new(config[:database]) - config[:database] = config[:database].expand_path(Rails.root) if defined?(Rails.root) - config[:database].dirname.mkdir unless config[:database].dirname.directory? + config[:database] = File.expand_path(config[:database], Rails.root) if defined?(Rails.root) + dirname = File.dirname(config[:database]) + Dir.mkdir(dirname) unless File.directory?(dirname) end db = SQLite3::Database.new( -- cgit v1.2.3