Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions lib/solid_cache/configuration.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,8 @@ def set_connects_to(database:, databases:, connects_to:)

@connects_to =
case
when database
{ shards: { database.to_sym => { writing: database.to_sym } } }
when databases
{ shards: Array(databases).map(&:to_sym).index_with { |database| { writing: database } } }
when (dbs = database || databases)
{ shards: Array(dbs).map(&:to_sym).index_with { |db| { writing: db } } }
when connects_to
connects_to
else
Expand Down
21 changes: 21 additions & 0 deletions test/unit/configuration_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,27 @@ class SolidCache::ConfigurationTest < ActiveSupport::TestCase
assert_equal({ shards: { cache: { writing: :cache } } }, config.connects_to)
end

test "database option also accepts an array of database names" do
config = SolidCache::Configuration.new(database: [:cache1, :cache2])
assert_equal({
shards: {
cache1: { writing: :cache1 },
cache2: { writing: :cache2 }
}
}, config.connects_to)
end

test "should respect connects_to option" do
connects_to = {
shards: {
cache1: { writing: :cache1 },
cache2: { writing: :cache2 }
}
}
config = SolidCache::Configuration.new(connects_to: connects_to)
assert_equal(connects_to, config.connects_to)
end

test "raises ArgumentError when multiple connection options are provided" do
error = assert_raises(ArgumentError) do
SolidCache::Configuration.new(database: :cache, databases: [:cache1])
Expand Down