Skip to content

Commit

Permalink
Move 'dsn' function to only place used'
Browse files Browse the repository at this point in the history
Tests did not cover the 'dsn' function anyway.
  • Loading branch information
okurz committed Dec 19, 2022
1 parent 972ff1f commit 966b11c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 9 deletions.
5 changes: 0 additions & 5 deletions lib/OpenQA/Schema.pm
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,6 @@ sub disconnect_db () {
$SINGLETON = undef;
}

sub dsn {
my $self = shift;
return $self->storage->connect_info->[0]->{dsn};
}

sub deploy ($self, $force_overwrite = 0) {
# lock config file to ensure only one thing will deploy/upgrade DB at once
# we use a file in prjdir/db as the lock file as the install process and
Expand Down
9 changes: 5 additions & 4 deletions lib/OpenQA/Shared/Plugin/Gru.pm
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,14 @@ sub register ($self, $app, $config) {
my $schema = $app->schema;

my $conn = Mojo::Pg->new;
if (ref $schema->storage->connect_info->[0] eq 'HASH') {
my $connect_info = $schema->storage->connect_info->[0];
if (ref $connect_info eq 'HASH') {
$self->dsn($schema->dsn);
$conn->username($schema->storage->connect_info->[0]->{user});
$conn->password($schema->storage->connect_info->[0]->{password});
$conn->username($connect_info->{user});
$conn->password($connect_info->{password});

Check warning on line 49 in lib/OpenQA/Shared/Plugin/Gru.pm

View check run for this annotation

Codecov / codecov/patch

lib/OpenQA/Shared/Plugin/Gru.pm#L48-L49

Added lines #L48 - L49 were not covered by tests
}
else {
$self->dsn($schema->storage->connect_info->[0]);
$self->dsn($connect_info);
}
$conn->dsn($self->dsn());

Expand Down

0 comments on commit 966b11c

Please sign in to comment.