# Don't remove this, we re-export the exceptions to scripts which import us
from sqlalchemy.exc import *
+from sqlalchemy.orm.exc import NoResultFound
# Only import Config until Queue stuff is changed to store its config
# in the database
+import utils
from config import Config
from singleton import Singleton
from textutils import fix_maintainer
session = kwargs.get('session')
# No session specified as last argument or in kwargs, create one.
- if session is None and len(args) == len(getargspec(fn)[0]) - 1:
+ if session is None or len(args) == len(getargspec(fn)[0]) - 1:
private_transaction = True
kwargs['session'] = DBConn().session()
q = session.query(Architecture).filter_by(arch_string=architecture)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_architecture')
pass
def __repr__(self):
- return '<Archive %s>' % self.name
+ return '<Archive %s>' % self.archive_name
__all__.append('Archive')
q = session.query(Archive).filter_by(archive_name=archive)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_archive')
@return: list of Suite objects for the given package
"""
- ret = session.query(Suite).join(BinAssociation).join(DBBinary).filter_by(package=package).all()
-
- return ret
+ return session.query(Suite).join(BinAssociation).join(DBBinary).filter_by(package=package).all()
__all__.append('get_suites_binary_in')
q = session.query(DBBinary).filter_by(binary_id=id)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_binary_from_id')
@return: list of DBBinary objects for the given name (may be empty)
"""
- ret = session.query(DBBinary).filter_by(source_id=source_id).all()
-
- return ret
+ return session.query(DBBinary).filter_by(source_id=source_id).all()
__all__.append('get_binaries_from_source_id')
AND su.suite_name=:suitename
ORDER BY b.version DESC"""
- ret = session.execute(sql, {'package': package, 'suitename': suitename})
-
- return ret
+ return session.execute(sql, {'package': package, 'suitename': suitename})
__all__.append('get_binary_from_name_suite')
vals = {'package': package, 'suitename': suitename, 'arch': arch}
- ret = session.execute(query, vals)
-
- return ret
+ return session.execute(query, vals)
__all__.append('get_binary_components')
q = session.query(Component).filter_by(component_name=component)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_component')
privatetrans = True
q = session.query(ContentFilename).filter_by(filename=filename)
- if q.count() < 1:
+
+ try:
+ ret = q.one().cafilename_id
+ except NoResultFound:
cf = ContentFilename()
cf.filename = filename
session.add(cf)
else:
session.flush()
ret = cf.cafilename_id
- else:
- ret = q.one().cafilename_id
if privatetrans:
session.close()
contents_q += " ORDER BY fn"
- ret = session.execute(contents_q, vals)
-
- return ret
+ return session.execute(contents_q, vals)
__all__.append('get_contents')
privatetrans = True
q = session.query(ContentFilepath).filter_by(filepath=filepath)
- if q.count() < 1:
+
+ try:
+ ret = q.one().cafilepath_id
+ except NoResultFound:
cf = ContentFilepath()
cf.filepath = filepath
session.add(cf)
else:
session.flush()
ret = cf.cafilepath_id
- else:
- ret = q.one().cafilepath_id
if privatetrans:
session.close()
if poolfile_id is not None:
q = q.filter_by(poolfile_id=poolfile_id)
- ret = q.all()
-
- return ret
+ return q.all()
__all__.append('get_dscfiles')
q = session.query(PoolFile).filter_by(file_id=file_id)
- if q.count() > 0:
- ret = q.one()
- else:
- ret = None
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_poolfile_by_id')
if location_id is not None:
q = q.join(Location).filter_by(location_id=location_id)
- ret = q.all()
-
- return ret
+ return q.all()
__all__.append('get_poolfile_by_name')
# TODO: There must be a way of properly using bind parameters with %FOO%
q = session.query(PoolFile).filter(PoolFile.filename.like('%%%s%%' % filename))
- ret = q.all()
-
- return ret
+ return q.all()
__all__.append('get_poolfile_like_name')
privatetrans = True
q = session.query(Fingerprint).filter_by(fingerprint=fpr)
- if q.count() < 1:
+
+ try:
+ ret = q.one()
+ except NoResultFound:
fingerprint = Fingerprint()
fingerprint.fingerprint = fpr
session.add(fingerprint)
else:
session.flush()
ret = fingerprint
- else:
- ret = q.one()
if privatetrans:
session.close()
if component is not None:
q = q.join(Component).filter_by(component_name=component)
- if q.count() < 1:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_location')
privatetrans = True
q = session.query(Maintainer).filter_by(name=name)
- if q.count() < 1:
+ try:
+ ret = q.one()
+ except NoResultFound:
maintainer = Maintainer()
maintainer.name = name
session.add(maintainer)
else:
session.flush()
ret = maintainer
- else:
- ret = q.one()
if privatetrans:
session.close()
q = q.filter_by(package=package)
q = q.filter_by(version=version)
- ret = q.count() > 0
-
- return ret
+ return bool(q.count() > 0)
__all__.append('has_new_comment')
if version is not None: q = q.filter_by(version=version)
if comment_id is not None: q = q.filter_by(comment_id=comment_id)
- ret = q.all()
-
- return ret
+ return q.all()
__all__.append('get_new_comments')
if not isinstance(overridetype, list): overridetype = [overridetype]
q = q.join(OverrideType).filter(OverrideType.overridetype.in_(overridetype))
- ret = q.all()
-
- return ret
+ return q.all()
__all__.append('get_override')
q = session.query(OverrideType).filter_by(overridetype=override_type)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_override_type')
q = session.query(Priority).filter_by(priority=priority)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_priority')
"""
q = session.query(Queue).filter_by(queue_name=queuename)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_queue')
q = session.query(QueueBuild).filter_by(filename=filename)
q = q.join(Suite).filter_by(suite_name=suite)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_queue_build')
"""
q = session.query(Section).filter_by(section=section)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_section')
@return: list of Suite objects for the given source
"""
- ret = session.query(Suite).join(SrcAssociation).join(DBSource).filter_by(source=source).all()
-
- return ret
+ return session.query(Suite).join(SrcAssociation).join(DBSource).filter_by(source=source).all()
__all__.append('get_suites_source_in')
if dm_upload_allowed is not None:
q = q.filter_by(dm_upload_allowed=dm_upload_allowed)
- ret = q.all()
-
- return ret
+ return q.all()
__all__.append('get_sources_from_name')
q = q.join('source').filter_by(source=source)
q = q.join('suite').filter_by(suite_name=suite)
- if q.count() == 0:
- ret = None
- else:
- # ???: Maybe we should just return the SrcAssociation object instead
- ret = q.one().source
-
- return ret
+ try:
+ return q.one().source
+ except NoResultFound:
+ return None
__all__.append('get_source_in_suite')
q = q.join(Architecture).filter_by(arch_string=architecture)
q = q.join(Suite).filter_by(suite_name=suite)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_suite_architecture')
q = session.query(Suite).filter_by(suite_name=suite)
- if q.count() == 0:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_suite')
q = q.order_by('arch_string')
- ret = q.all()
-
- return ret
+ return q.all()
__all__.append('get_suite_architectures')
q = session.query(Uid).filter_by(uid=uidname)
- if q.count() < 1:
+ try:
+ ret = q.one()
+ except NoResultFound:
uid = Uid()
uid.uid = uidname
session.add(uid)
else:
session.flush()
ret = uid
- else:
- ret = q.one()
if privatetrans:
session.close()
q = session.query(Uid)
q = q.join(Fingerprint).filter_by(fingerprint=fpr)
- if q.count() != 1:
- ret = None
- else:
- ret = q.one()
-
- return ret
+ try:
+ return q.one()
+ except NoResultFound:
+ return None
__all__.append('get_uid_from_fingerprint')
projects / dak.git / blobdiff