veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-07-03 02:55:49 +00:00
Code Issues Projects Releases Wiki Activity

Make id lookup util.get use query.get, avoiding queries for dupe lookups

Browse source
This commit is contained in:
Petr Viktorin 2011-05-06 12:40:28 +03:00
parent 332647c362
commit dd668febe7
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pokedex/db/util.py
View file

@ -7,6 +7,7 @@ of pokemon, and filtering/ordering by name.
from sqlalchemy.orm import aliased from sqlalchemy.orm import aliased
from sqlalchemy.sql.expression import func from sqlalchemy.sql.expression import func
from sqlalchemy.sql.functions import coalesce from sqlalchemy.sql.functions import coalesce
from sqlalchemy.orm.exc import NoResultFound
from pokedex.db import tables from pokedex.db import tables
@ -40,7 +41,13 @@ def get(session, table, identifier=None, name=None, id=None, language=None):
query = filter_name(query, table, name, language) query = filter_name(query, table, name, language)
if id is not None: if id is not None:
query = query.filter_by(id=id) # ASSUMPTION: id is the primary key of the table.
result = query.get(id)
if result is None:
# Keep the API
raise NoResultFound
else:
return result
return query.one() return query.one()