Skip to content

Commit

Permalink
Merge pull request #51628 from maniSHarma7575/51623-sqlite3-should-cr…
Browse files Browse the repository at this point in the history
…eate-db-for-missing-parent-directories

[FIX] Sqlite3 Should create db for missing parent directories as well
  • Loading branch information
byroot committed May 6, 2024
2 parents 0a3a578 + fd94a12 commit 9ad3685
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
Expand Up @@ -112,13 +112,9 @@ def initialize(...)
dirname = File.dirname(@config[:database])
unless File.directory?(dirname)
begin
Dir.mkdir(dirname)
rescue Errno::ENOENT => error
if error.message.include?("No such file or directory")
raise ActiveRecord::NoDatabaseError.new(connection_pool: @pool)
else
raise
end
FileUtils.mkdir_p(dirname)
rescue SystemCallError
raise ActiveRecord::NoDatabaseError.new(connection_pool: @pool)
end
end
end
Expand Down
10 changes: 6 additions & 4 deletions activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
Expand Up @@ -23,12 +23,14 @@ def setup
)
end

def test_bad_connection
error = assert_raise ActiveRecord::NoDatabaseError do
connection = SQLite3Adapter.new(adapter: "sqlite3", database: "/tmp/should/_not/_exist/-cinco-dog.db")
def test_database_should_get_created_when_missing_parent_directories_for_database_path
dir = Dir.mktmpdir
db_path = File.join(dir, "_not_exist/-cinco-dog.sqlite3")
assert_nothing_raised do
connection = SQLite3Adapter.new(adapter: "sqlite3", database: db_path)
connection.drop_table "ex", if_exists: true
end
assert_kind_of ActiveRecord::ConnectionAdapters::NullPool, error.connection_pool
assert SQLite3Adapter.database_exists?(adapter: "sqlite3", database: db_path)
end

def test_database_exists_returns_false_when_the_database_does_not_exist
Expand Down

0 comments on commit 9ad3685

Please sign in to comment.