diff --git a/activerecord/.gitignore b/activerecord/.gitignore index 884ee009eb..effb81c892 100644 --- a/activerecord/.gitignore +++ b/activerecord/.gitignore @@ -1,3 +1,4 @@ +/db/ /sqlnet.log /test/config.yml /test/fixtures/*.sqlite* diff --git a/activerecord/test/cases/adapters/sqlite3/transaction_test.rb b/activerecord/test/cases/adapters/sqlite3/transaction_test.rb index 570959acf4..7888bbbf49 100644 --- a/activerecord/test/cases/adapters/sqlite3/transaction_test.rb +++ b/activerecord/test/cases/adapters/sqlite3/transaction_test.rb @@ -108,7 +108,7 @@ class SQLite3TransactionTest < ActiveRecord::SQLite3TestCase def with_connection(options = {}) db_config = ActiveRecord::Base.configurations.configs_for(env_name: "arunit", name: "primary") conn_options = options.reverse_merge( - database: in_memory_db? ? "file::memory:" : db_config.database + database: in_memory_db? ? "db/file::memory:" : db_config.database ) conn = ActiveRecord::Base.sqlite3_connection(conn_options)