Skip to content

Add _finish_when_safe to work around DBD::Pg race condition #89

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

Merged
kraih merged 1 commit into from
Sep 29, 2025
Merged

Add _finish_when_safe to work around DBD::Pg race condition #89

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
8 changes: 8 additions & 0 deletions lib/Mojo/Pg/Database.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ sub query {

# Non-blocking
$self->{waiting} = {cb => $cb, sth => $sth};
$self->{finish} = [];
$self->_watch;
}

Expand Down Expand Up @@ -134,6 +135,12 @@ sub unlisten {
return $self;
}

sub _finish_when_safe {
my $self = shift;
if ($self->{finish}) { push @{$self->{finish}}, @_ }
else { $_->finish for @_ }
}

sub _notifications {
my $self = shift;

Expand Down Expand Up @@ -178,6 +185,7 @@ sub _watch {
my $err = defined $result ? undef : $dbh->errstr;

$self->$cb($err, $self->results_class->new(db => $self, sth => $sth));
$self->_finish_when_safe(@{delete $self->{finish}}) if $self->{finish};
$self->_unwatch unless $self->{waiting} || $self->is_listening;
}
)->watch($self->{handle}, 1, 0);
Expand Down
4 changes: 2 additions & 2 deletions lib/Mojo/Pg/Results.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ has [qw(db sth)];
sub DESTROY {
my $self = shift;
return unless my $sth = $self->{sth};
$sth->finish unless --$sth->{private_mojo_results};
$self->finish unless --$sth->{private_mojo_results};
}

sub array { ($_[0]->_expand($_[0]->sth->fetchrow_arrayref))[0] }
Expand All @@ -23,7 +23,7 @@ sub hash { ($_[0]->_expand($_[0]->sth->fetchrow_hashref))[0] }

sub expand { ++$_[0]{expand} and return $_[0] }

sub finish { shift->sth->finish }
sub finish { $_[0]->db->_finish_when_safe($_[0]->sth) }

sub hashes { _collect($_[0]->_expand(@{$_[0]->sth->fetchall_arrayref({})})) }

Expand Down