diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-05 20:41:27 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-08-05 20:41:27 -0300 |
commit | b6c971e123e0c20ddf2c8e1f43feef8c9500d17b (patch) | |
tree | 5d8ab1e8f4eeb7ba356a93a7707358aaddd25e0f /activerecord/lib/active_record/connection_adapters | |
parent | 9281adc64acc5071c1d0d699158c97eae8430810 (diff) | |
download | rails-b6c971e123e0c20ddf2c8e1f43feef8c9500d17b.tar.gz rails-b6c971e123e0c20ddf2c8e1f43feef8c9500d17b.tar.bz2 rails-b6c971e123e0c20ddf2c8e1f43feef8c9500d17b.zip |
config[:database] should be a string
This change was breaking the Railties tests. See
https://travis-ci.org/rails/rails/jobs/9865969
Diffstat (limited to 'activerecord/lib/active_record/connection_adapters')
-rw-r--r-- | activerecord/lib/active_record/connection_adapters/sqlite3_adapter.rb | 6 |
1 files changed, 3 insertions, 3 deletions
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( |