X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=cb578bd7874214576a7217b745771112cf805a2e;hb=4a867e40c345441e6c12b283bd0aef0fd3f7ba12;hp=651b790b194111ae2bd659fee74ce52a82140d1a;hpb=c02076be73a969f103f12c91ef67250d6e4c08d2;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py index 651b790b..cb578bd7 100755 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -44,9 +44,11 @@ from sqlalchemy.orm import sessionmaker, mapper, relation # 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 @@ -63,7 +65,7 @@ def session_wrapper(fn): 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() @@ -117,12 +119,10 @@ def get_architecture(architecture, session=None): 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') @@ -159,7 +159,7 @@ class Archive(object): pass def __repr__(self): - return '' % self.name + return '' % self.archive_name __all__.append('Archive') @@ -183,12 +183,10 @@ def get_archive(archive, session=None): 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') @@ -226,9 +224,7 @@ def get_suites_binary_in(package, session=None): @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') @@ -250,12 +246,10 @@ def get_binary_from_id(id, session=None): 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') @@ -313,9 +307,7 @@ def get_binaries_from_source_id(source_id, session=None): @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') @@ -335,9 +327,7 @@ def get_binary_from_name_suite(package, suitename, session=None): 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') @@ -354,9 +344,7 @@ def get_binary_components(package, suitename, arch, session=None): vals = {'package': package, 'suitename': suitename, 'arch': arch} - ret = session.execute(query, vals) - - return ret + return session.execute(query, vals) __all__.append('get_binary_components') @@ -400,12 +388,10 @@ def get_component(component, session=None): 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') @@ -453,7 +439,10 @@ def get_or_set_contents_file_id(filename, session=None): 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) @@ -462,8 +451,6 @@ def get_or_set_contents_file_id(filename, session=None): else: session.flush() ret = cf.cafilename_id - else: - ret = q.one().cafilename_id if privatetrans: session.close() @@ -519,9 +506,7 @@ def get_contents(suite, overridetype, section=None, session=None): contents_q += " ORDER BY fn" - ret = session.execute(contents_q, vals) - - return ret + return session.execute(contents_q, vals) __all__.append('get_contents') @@ -558,7 +543,10 @@ def get_or_set_contents_path_id(filepath, session=None): 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) @@ -567,8 +555,6 @@ def get_or_set_contents_path_id(filepath, session=None): else: session.flush() ret = cf.cafilepath_id - else: - ret = q.one().cafilepath_id if privatetrans: session.close() @@ -691,9 +677,7 @@ def get_dscfiles(dscfile_id=None, source_id=None, poolfile_id=None, session=None 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') @@ -771,12 +755,10 @@ def get_poolfile_by_id(file_id, session=None): 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') @@ -802,9 +784,7 @@ def get_poolfile_by_name(filename, location_id=None, session=None): 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') @@ -823,9 +803,7 @@ def get_poolfile_like_name(filename, session=None): # 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') @@ -864,7 +842,10 @@ def get_or_set_fingerprint(fpr, session=None): 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) @@ -873,8 +854,6 @@ def get_or_set_fingerprint(fpr, session=None): else: session.flush() ret = fingerprint - else: - ret = q.one() if privatetrans: session.close() @@ -968,12 +947,10 @@ def get_location(location, component=None, archive=None, session=None): 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') @@ -1018,7 +995,9 @@ def get_or_set_maintainer(name, session=None): 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) @@ -1027,8 +1006,6 @@ def get_or_set_maintainer(name, session=None): else: session.flush() ret = maintainer - else: - ret = q.one() if privatetrans: session.close() @@ -1096,9 +1073,7 @@ def has_new_comment(package, version, session=None): 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') @@ -1130,9 +1105,7 @@ def get_new_comments(package=None, version=None, comment_id=None, session=None): 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') @@ -1190,9 +1163,7 @@ def get_override(package, suite=None, component=None, overridetype=None, session 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') @@ -1226,12 +1197,10 @@ def get_override_type(override_type, session=None): 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') @@ -1364,12 +1333,10 @@ def get_priority(priority, session=None): 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') @@ -1535,12 +1502,11 @@ def get_queue(queuename, session=None): """ 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') @@ -1580,12 +1546,10 @@ def get_queue_build(filename, suite, session=None): 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') @@ -1629,12 +1593,11 @@ def get_section(section, session=None): """ 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') @@ -1751,9 +1714,7 @@ def get_suites_source_in(source, session=None): @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') @@ -1788,9 +1749,7 @@ def get_sources_from_name(source, version=None, dm_upload_allowed=None, session= 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') @@ -1817,13 +1776,10 @@ def get_source_in_suite(source, suite, session=None): 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') @@ -1925,12 +1881,10 @@ def get_suite_architecture(suite, architecture, session=None): 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') @@ -1952,12 +1906,10 @@ def get_suite(suite, session=None): 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') @@ -2008,9 +1960,7 @@ def get_suite_architectures(suite, skipsrc=False, skipall=False, session=None): q = q.order_by('arch_string') - ret = q.all() - - return ret + return q.all() __all__.append('get_suite_architectures') @@ -2091,7 +2041,9 @@ def get_or_set_uid(uidname, session=None): 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) @@ -2100,8 +2052,6 @@ def get_or_set_uid(uidname, session=None): else: session.flush() ret = uid - else: - ret = q.one() if privatetrans: session.close() @@ -2115,12 +2065,10 @@ def get_uid_from_fingerprint(fpr, session=None): 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')