# HG changeset patch # User bsw # Date 1348494053 -7200 # Node ID 17d1856de31e7b1d59a921006160f5a65178700a # Parent e5340599fc79b85aa26202b19284c1fb57692303 Lock member row when locking member privilege rows to avoid deadlocks diff -r e5340599fc79 -r 17d1856de31e model/member.lua --- a/model/member.lua Sun Sep 23 17:14:32 2012 +0200 +++ b/model/member.lua Mon Sep 24 15:40:53 2012 +0200 @@ -560,6 +560,7 @@ function Member.object:has_voting_right_for_unit_id(unit_id) if not self.__units_with_voting_right_hash then local privileges = Privilege:new_selector() + :join("member", nil, "member.id = privilege.member_id") :add_where{ "member_id = ?", self.id } :add_where("voting_right") :for_share()