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

Resolve further unit test issue with postgres

Browse source
This commit is contained in:
Griatch 2019-03-23 23:34:34 +01:00
parent 64d99aaf11
commit 814bb2e8f8
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
evennia/prototypes/prototypes.py
View file

@ -319,10 +319,11 @@ def search_prototype(key=None, tags=None, require_single=False):
tag_categories = ["db_prototype" for _ in tags]
db_matches = DbPrototype.objects.get_by_tag(tags, tag_categories)
else:
db_matches = DbPrototype.objects.all()
db_matches = DbPrototype.objects.all().order_by("id")
if key:
# exact or partial match on key
db_matches = db_matches.filter(db_key=key) or db_matches.filter(db_key__icontains=key)
db_matches = (db_matches.filter(db_key=key) or
db_matches.filter(db_key__icontains=key)).order_by("id")
# return prototype
db_prototypes = [dbprot.prototype for dbprot in db_matches]

2
evennia/typeclasses/managers.py
View file

@ -260,7 +260,7 @@ class TypedObjectManager(idmapper.manager.SharedMemoryManager):
dbmodel = self.model.__dbclass__.__name__.lower()
query = self.filter(db_tags__db_tagtype__iexact=tagtype,
db_tags__db_model__iexact=dbmodel).distinct()
db_tags__db_model__iexact=dbmodel).distinct().order_by('id')
if n_keys > 0:
# keys and/or categories given