Skip to content

[WIP]Add arg group to ServerSettings.databases.find method #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
w1mvy wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP]Add arg group to ServerSettings.databases.find method #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions lib/server_settings/role_db.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ def build_db(name, config, group = nil)
return db
end

def find(db_name)
select { |s| s.name == db_name }.first
def find(db_name, db_group = nil)
select { |s| s.name == db_name && s.group == db_group }.first
end

def each
Expand Down
22 changes: 18 additions & 4 deletions spec/lib/servers_config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,23 @@
db3:
:master: 192.168.30.86
:backup: 192.168.30.85
db4:
:database: db4
:master: 192.168.30.86
:backup: 192.168.30.85
db4:
:database: another_db4
:master: 192.168.30.86
:backup: 192.168.30.85
EOS

describe ServerSettings::Database do

context "db in group" do
it 'describe database with group' do
ServerSettings.load_from_yaml(db_config)
db = ServerSettings.databases.find("user_shard_1")
db = ServerSettings.databases.find("user_shard_1", "shards")

expect(db.group).to eq("shards")
expect(db.config(:master)).to eq({
:adapter => "mysql2",
Expand All @@ -214,6 +223,11 @@
expect(db.has_slave?).to be_falsey

end
context "when yaml has another same db setting" do
it "" do
ServerSettings.load_from_yaml(db_config)
end
end
end

context "db not in group" do
Expand Down Expand Up @@ -289,10 +303,10 @@


describe "each" do
it 'loop 6 times yield with db argument' do
it 'loop 8 times yield with db argument' do
ServerSettings.load_from_yaml(db_config)
args = 6.times.map {ServerSettings::Database}
expect { |b| ServerSettings.databases.each(&b)}.to yield_control.exactly(6).times
args = 8.times.map {ServerSettings::Database}
expect { |b| ServerSettings.databases.each(&b)}.to yield_control.exactly(8).times
expect { |b| ServerSettings.databases.each(&b)}.to yield_successive_args(*args)
end
end
Expand Down