Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-16 21:06:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix race condition bug in search discovered by comparing with postgres result

Browse source
This commit is contained in:
Griatch 2019-03-23 21:33:41 +01:00
parent fa3588be20
commit 64d99aaf11
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
evennia/commands/default/tests.py
View file

@ -444,13 +444,11 @@ class TestBuilding(CommandTest):
building.CmdDestroy.confirm = False
self.call(building.CmdDestroy(), "", "Usage: ")
self.call(building.CmdDestroy(), "Obj", "Obj was destroyed.")
settings.DEFAULT_HOME = self.room1.dbref
self.call(building.CmdDestroy(), "Obj", "Obj2 was destroyed.")
self.call(building.CmdDestroy(), "Obj", "Could not find 'Obj'.| (Objects to destroy "
"must either be local or specified with a unique #dbref.)")
default_home_dbref = settings.DEFAULT_HOME
self.call(building.CmdDestroy(), default_home_dbref,
"You are trying to delete") # DEFAULT_HOME
self.call(building.CmdDestroy(), settings.DEFAULT_HOME,
"You are trying to delete") # DEFAULT_HOME should not be deleted
self.char2.location = self.room2
charid = self.char2.id
room1id = self.room1.id

4
evennia/objects/manager.py
View file

@ -268,11 +268,11 @@ class ObjectDBManager(TypedObjectManager):
Q(db_tags__db_key__iexact=ostring) & Q(db_tags__db_tagtype__iexact="alias"))).distinct()
elif candidates:
# fuzzy with candidates
search_candidates = self.filter(cand_restriction & type_restriction)
search_candidates = self.filter(cand_restriction & type_restriction).order_by('id')
else:
# fuzzy without supplied candidates - we select our own candidates
search_candidates = self.filter(type_restriction & (Q(db_key__istartswith=ostring) |
Q(db_tags__db_key__istartswith=ostring))).distinct()
Q(db_tags__db_key__istartswith=ostring))).distinct().order_by('id')
# fuzzy matching
key_strings = search_candidates.values_list("db_key", flat=True).order_by("id")