diff options
author | lpsolit%gmail.com <> | 2005-07-08 04:15:20 +0000 |
---|---|---|
committer | lpsolit%gmail.com <> | 2005-07-08 04:15:20 +0000 |
commit | 230976efc0233c7157f6b6a3919e5eb885dbe4a7 (patch) | |
tree | 2cadf7119883a3d6293daba9c228791689e17186 /Bugzilla/DB/Pg.pm | |
parent | 6e29c7cd06afac55962dac20421bddbf17954906 (diff) | |
download | bugs-230976efc0233c7157f6b6a3919e5eb885dbe4a7.tar bugs-230976efc0233c7157f6b6a3919e5eb885dbe4a7.tar.gz bugs-230976efc0233c7157f6b6a3919e5eb885dbe4a7.tar.bz2 bugs-230976efc0233c7157f6b6a3919e5eb885dbe4a7.tar.xz bugs-230976efc0233c7157f6b6a3919e5eb885dbe4a7.zip |
Bug 299212: "already locked" errors should be more informative - Patch by Frédéric Buclin <LpSolit@gmail.com> r=glob a=justdave
Diffstat (limited to 'Bugzilla/DB/Pg.pm')
-rw-r--r-- | Bugzilla/DB/Pg.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Bugzilla/DB/Pg.pm b/Bugzilla/DB/Pg.pm index a83b75bd9..97473e564 100644 --- a/Bugzilla/DB/Pg.pm +++ b/Bugzilla/DB/Pg.pm @@ -70,7 +70,7 @@ sub new { # all class local variables stored in DBI derived class needs to have # a prefix 'private_'. See DBI documentation. - $self->{private_bz_tables_locked} = 0; + $self->{private_bz_tables_locked} = ""; bless ($self, $class); @@ -147,9 +147,11 @@ sub sql_string_concat { sub bz_lock_tables { my ($self, @tables) = @_; + my $list = join(', ', @tables); # Check first if there was no lock before if ($self->{private_bz_tables_locked}) { - ThrowCodeError("already_locked"); + ThrowCodeError("already_locked", { current => $self->{private_bz_tables_locked}, + new => $list }); } else { my %read_tables; my %write_tables; @@ -175,7 +177,7 @@ sub bz_lock_tables { ' IN ROW SHARE MODE') if keys %read_tables; Bugzilla->dbh->do('LOCK TABLE ' . join(', ', keys %write_tables) . ' IN ROW EXCLUSIVE MODE') if keys %write_tables; - $self->{private_bz_tables_locked} = 1; + $self->{private_bz_tables_locked} = $list; } } @@ -188,7 +190,7 @@ sub bz_unlock_tables { return if $abort; ThrowCodeError("no_matching_lock"); } else { - $self->{private_bz_tables_locked} = 0; + $self->{private_bz_tables_locked} = ""; # End transaction, tables will be unlocked automatically if ($abort) { $self->bz_rollback_transaction(); |