X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=6d5497fc2d5f4b096d972631637e284eb2ce00aa;hb=852b95bdefa52aead80cad3a51381535774dc48a;hp=c0b7d0e841498097bf2fc6cc32522317f98f1717;hpb=2d4f734d1d24765254687338a386be1e742f713b;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py index c0b7d0e8..6d5497fc 100755 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -37,11 +37,14 @@ import os import psycopg2 import traceback -from sqlalchemy import create_engine, Table, MetaData, select +from inspect import getargspec + +from sqlalchemy import create_engine, Table, MetaData 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 @@ -55,6 +58,55 @@ __all__ = ['IntegrityError', 'SQLAlchemyError'] ################################################################################ +def session_wrapper(fn): + """ + Wrapper around common ".., session=None):" handling. If the wrapped + function is called without passing 'session', we create a local one + and destroy it when the function ends. + + Also attaches a commit_or_flush method to the session; if we created a + local session, this is a synonym for session.commit(), otherwise it is a + synonym for session.flush(). + """ + + def wrapped(*args, **kwargs): + private_transaction = False + + # Find the session object + session = kwargs.get('session') + + if session is None: + if len(args) <= len(getargspec(fn)[0]) - 1: + # No session specified as last argument or in kwargs + private_transaction = True + session = kwargs['session'] = DBConn().session() + else: + # Session is last argument in args + session = args[-1] + if session is None: + args = list(args) + session = args[-1] = DBConn().session() + private_transaction = True + + if private_transaction: + session.commit_or_flush = session.commit + else: + session.commit_or_flush = session.flush + + try: + return fn(*args, **kwargs) + finally: + if private_transaction: + # We created a session; close it. + session.close() + + wrapped.__doc__ = fn.__doc__ + wrapped.func_name = fn.func_name + + return wrapped + +################################################################################ + class Architecture(object): def __init__(self, *args, **kwargs): pass @@ -76,6 +128,7 @@ class Architecture(object): __all__.append('Architecture') +@session_wrapper def get_architecture(architecture, session=None): """ Returns database id for given C{architecture}. @@ -89,28 +142,18 @@ def get_architecture(architecture, session=None): @rtype: Architecture @return: Architecture object for the given arch (None if not present) - """ - privatetrans = False - - if session is None: - session = DBConn().session() - privatetrans = True q = session.query(Architecture).filter_by(arch_string=architecture) - if q.count() == 0: - ret = None - else: - ret = q.one() - - if privatetrans: - session.close() - - return ret + try: + return q.one() + except NoResultFound: + return None __all__.append('get_architecture') +@session_wrapper def get_architecture_suites(architecture, session=None): """ Returns list of Suite objects for given C{architecture} name @@ -125,11 +168,6 @@ def get_architecture_suites(architecture, session=None): @rtype: list @return: list of Suite objects for the given name (may be empty) """ - privatetrans = False - - if session is None: - session = DBConn().session() - privatetrans = True q = session.query(Suite) q = q.join(SuiteArchitecture) @@ -137,9 +175,6 @@ def get_architecture_suites(architecture, session=None): ret = q.all() - if privatetrans: - session.close() - return ret __all__.append('get_architecture_suites') @@ -151,13 +186,14 @@ class Archive(object): pass def __repr__(self): - return '' % self.name + return '' % self.archive_name __all__.append('Archive') +@session_wrapper def get_archive(archive, session=None): """ - returns database id for given c{archive}. + returns database id for given C{archive}. @type archive: string @param archive: the name of the arhive @@ -172,22 +208,12 @@ def get_archive(archive, session=None): """ archive = archive.lower() - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - q = session.query(Archive).filter_by(archive_name=archive) - if q.count() == 0: - ret = None - else: - ret = q.one() - - if privatetrans: - session.close() - - return ret + try: + return q.one() + except NoResultFound: + return None __all__.append('get_archive') @@ -213,6 +239,7 @@ class DBBinary(object): __all__.append('DBBinary') +@session_wrapper def get_suites_binary_in(package, session=None): """ Returns list of Suite objects which given C{package} name is in @@ -224,19 +251,11 @@ def get_suites_binary_in(package, session=None): @return: list of Suite objects for the given package """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - - ret = session.query(Suite).join(BinAssociation).join(DBBinary).filter_by(package=package).all() - - session.close() - - return ret + return session.query(Suite).join(BinAssociation).join(DBBinary).filter_by(package=package).all() __all__.append('get_suites_binary_in') +@session_wrapper def get_binary_from_id(id, session=None): """ Returns DBBinary object for given C{id} @@ -251,25 +270,17 @@ def get_binary_from_id(id, session=None): @rtype: DBBinary @return: DBBinary object for the given binary (None if not present) """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True q = session.query(DBBinary).filter_by(binary_id=id) - if q.count() == 0: - ret = None - else: - ret = q.one() - - if privatetrans: - session.close() - - return ret + try: + return q.one() + except NoResultFound: + return None __all__.append('get_binary_from_id') +@session_wrapper def get_binaries_from_name(package, version=None, architecture=None, session=None): """ Returns list of DBBinary objects for given C{package} name @@ -290,10 +301,6 @@ def get_binaries_from_name(package, version=None, architecture=None, session=Non @rtype: list @return: list of DBBinary objects for the given name (may be empty) """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True q = session.query(DBBinary).filter_by(package=package) @@ -307,13 +314,11 @@ def get_binaries_from_name(package, version=None, architecture=None, session=Non ret = q.all() - if privatetrans: - session.close() - return ret __all__.append('get_binaries_from_name') +@session_wrapper def get_binaries_from_source_id(source_id, session=None): """ Returns list of DBBinary objects for given C{source_id} @@ -328,29 +333,15 @@ def get_binaries_from_source_id(source_id, session=None): @rtype: list @return: list of DBBinary objects for the given name (may be empty) """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - - ret = session.query(DBBinary).filter_by(source_id=source_id).all() - - if privatetrans: - session.close() - - return ret + return session.query(DBBinary).filter_by(source_id=source_id).all() __all__.append('get_binaries_from_source_id') - +@session_wrapper def get_binary_from_name_suite(package, suitename, session=None): ### For dak examine-package ### XXX: Doesn't use object API yet - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True sql = """SELECT DISTINCT(b.package), b.version, c.name, su.suite_name FROM binaries b, files fi, location l, component c, bin_associations ba, suite su @@ -363,15 +354,11 @@ 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}) - - if privatetrans: - session.close() - - return ret + return session.execute(sql, {'package': package, 'suitename': suitename}) __all__.append('get_binary_from_name_suite') +@session_wrapper def get_binary_components(package, suitename, arch, session=None): # Check for packages that have moved from one component to another query = """SELECT c.name FROM binaries b, bin_associations ba, suite s, location l, component c, architecture a, files f @@ -384,17 +371,7 @@ def get_binary_components(package, suitename, arch, session=None): vals = {'package': package, 'suitename': suitename, 'arch': arch} - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - - ret = session.execute(query, vals) - - if privatetrans: - session.close() - - return ret + return session.execute(query, vals) __all__.append('get_binary_components') @@ -422,6 +399,7 @@ class Component(object): __all__.append('Component') +@session_wrapper def get_component(component, session=None): """ Returns database id for given C{component}. @@ -435,22 +413,12 @@ def get_component(component, session=None): """ component = component.lower() - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - q = session.query(Component).filter_by(component_name=component) - if q.count() == 0: - ret = None - else: - ret = q.one() - - if privatetrans: - session.close() - - return ret + try: + return q.one() + except NoResultFound: + return None __all__.append('get_component') @@ -476,6 +444,7 @@ class ContentFilename(object): __all__.append('ContentFilename') +@session_wrapper def get_or_set_contents_file_id(filename, session=None): """ Returns database id for given filename. @@ -492,31 +461,23 @@ def get_or_set_contents_file_id(filename, session=None): @rtype: int @return: the database id for the given component """ - privatetrans = False - if session is None: - session = DBConn().session() - 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) - if privatetrans: - session.commit() - else: - session.flush() + session.commit_or_flush() ret = cf.cafilename_id - else: - ret = q.one().cafilename_id - - if privatetrans: - session.close() return ret __all__.append('get_or_set_contents_file_id') +@session_wrapper def get_contents(suite, overridetype, section=None, session=None): """ Returns contents for a suite / overridetype combination, limiting @@ -540,11 +501,6 @@ def get_contents(suite, overridetype, section=None, session=None): package, arch_id) """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - # find me all of the contents for a given suite contents_q = """SELECT (p.path||'/'||n.file) AS fn, s.section, @@ -568,12 +524,7 @@ def get_contents(suite, overridetype, section=None, session=None): contents_q += " ORDER BY fn" - ret = session.execute(contents_q, vals) - - if privatetrans: - session.close() - - return ret + return session.execute(contents_q, vals) __all__.append('get_contents') @@ -588,6 +539,7 @@ class ContentFilepath(object): __all__.append('ContentFilepath') +@session_wrapper def get_or_set_contents_path_id(filepath, session=None): """ Returns database id for given path. @@ -604,26 +556,17 @@ def get_or_set_contents_path_id(filepath, session=None): @rtype: int @return: the database id for the given path """ - privatetrans = False - if session is None: - session = DBConn().session() - 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) - if privatetrans: - session.commit() - else: - session.flush() + session.commit_or_flush() ret = cf.cafilepath_id - else: - ret = q.one().cafilepath_id - - if privatetrans: - session.close() return ret @@ -714,6 +657,7 @@ class DSCFile(object): __all__.append('DSCFile') +@session_wrapper def get_dscfiles(dscfile_id=None, source_id=None, poolfile_id=None, session=None): """ Returns a list of DSCFiles which may be empty @@ -731,11 +675,6 @@ def get_dscfiles(dscfile_id=None, source_id=None, poolfile_id=None, session=None @return: Possibly empty list of DSCFiles """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - q = session.query(DSCFile) if dscfile_id is not None: @@ -747,12 +686,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() - - if privatetrans: - session.close() - - return ret + return q.all() __all__.append('get_dscfiles') @@ -767,6 +701,7 @@ class PoolFile(object): __all__.append('PoolFile') +@session_wrapper def check_poolfile(filename, filesize, md5sum, location_id, session=None): """ Returns a tuple: @@ -794,11 +729,6 @@ def check_poolfile(filename, filesize, md5sum, location_id, session=None): (False, PoolFile object) if file found with size/md5sum mismatch """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - q = session.query(PoolFile).filter_by(filename=filename) q = q.join(Location).filter_by(location_id=location_id) @@ -816,13 +746,11 @@ def check_poolfile(filename, filesize, md5sum, location_id, session=None): if ret is None: ret = (True, obj) - if privatetrans: - session.close() - return ret __all__.append('check_poolfile') +@session_wrapper def get_poolfile_by_id(file_id, session=None): """ Returns a PoolFile objects or None for the given id @@ -834,26 +762,17 @@ def get_poolfile_by_id(file_id, session=None): @return: either the PoolFile object or None """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - q = session.query(PoolFile).filter_by(file_id=file_id) - if q.count() > 0: - ret = q.one() - else: - ret = None - - if privatetrans: - session.close() - - return ret + try: + return q.one() + except NoResultFound: + return None __all__.append('get_poolfile_by_id') +@session_wrapper def get_poolfile_by_name(filename, location_id=None, session=None): """ Returns an array of PoolFile objects for the given filename and @@ -869,25 +788,16 @@ def get_poolfile_by_name(filename, location_id=None, session=None): @return: array of PoolFile objects """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - q = session.query(PoolFile).filter_by(filename=filename) if location_id is not None: q = q.join(Location).filter_by(location_id=location_id) - ret = q.all() - - if privatetrans: - session.close() - - return ret + return q.all() __all__.append('get_poolfile_by_name') +@session_wrapper def get_poolfile_like_name(filename, session=None): """ Returns an array of PoolFile objects which are like the given name @@ -899,20 +809,10 @@ def get_poolfile_like_name(filename, session=None): @return: array of PoolFile objects """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - # 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() - - if privatetrans: - session.close() - - return ret + return q.all() __all__.append('get_poolfile_like_name') @@ -927,6 +827,7 @@ class Fingerprint(object): __all__.append('Fingerprint') +@session_wrapper def get_or_set_fingerprint(fpr, session=None): """ Returns Fingerprint object for given fpr. @@ -945,26 +846,17 @@ def get_or_set_fingerprint(fpr, session=None): @rtype: Fingerprint @return: the Fingerprint object for the given fpr """ - privatetrans = False - if session is None: - session = DBConn().session() - 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) - if privatetrans: - session.commit() - else: - session.flush() + session.commit_or_flush() ret = fingerprint - else: - ret = q.one() - - if privatetrans: - session.close() return ret @@ -981,6 +873,7 @@ class Keyring(object): __all__.append('Keyring') +@session_wrapper def get_or_set_keyring(keyring, session=None): """ If C{keyring} does not have an entry in the C{keyrings} table yet, create one @@ -992,28 +885,17 @@ def get_or_set_keyring(keyring, session=None): @rtype: Keyring @return: the Keyring object for this keyring - """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - - try: - obj = session.query(Keyring).filter_by(keyring_name=keyring).first() - if obj is None: - obj = Keyring(keyring_name=keyring) - session.add(obj) - if privatetrans: - session.commit() - else: - session.flush() + q = session.query(Keyring).filter_by(keyring_name=keyring) + try: + return q.one() + except NoResultFound: + obj = Keyring(keyring_name=keyring) + session.add(obj) + session.commit_or_flush() return obj - finally: - if privatetrans: - session.close() __all__.append('get_or_set_keyring') @@ -1028,6 +910,7 @@ class Location(object): __all__.append('Location') +@session_wrapper def get_location(location, component=None, archive=None, session=None): """ Returns Location object for the given combination of location, component @@ -1046,11 +929,6 @@ def get_location(location, component=None, archive=None, session=None): @return: Either a Location object or None if one can't be found """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - q = session.query(Location).filter_by(path=location) if archive is not None: @@ -1059,15 +937,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() - - if privatetrans: - session.close() - - return ret + try: + return q.one() + except NoResultFound: + return None __all__.append('get_location') @@ -1088,6 +961,7 @@ class Maintainer(object): __all__.append('Maintainer') +@session_wrapper def get_or_set_maintainer(name, session=None): """ Returns Maintainer object for given maintainer name. @@ -1106,31 +980,22 @@ def get_or_set_maintainer(name, session=None): @rtype: Maintainer @return: the Maintainer object for the given maintainer """ - privatetrans = False - if session is None: - session = DBConn().session() - 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) - if privatetrans: - session.commit() - else: - session.flush() + session.commit_or_flush() ret = maintainer - else: - ret = q.one() - - if privatetrans: - session.close() return ret __all__.append('get_or_set_maintainer') +@session_wrapper def get_maintainer(maintainer_id, session=None): """ Return the name of the maintainer behind C{maintainer_id} or None if that @@ -1143,16 +1008,7 @@ def get_maintainer(maintainer_id, session=None): @return: the Maintainer with this C{maintainer_id} """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - - try: - return session.query(Maintainer).get(maintainer_id) - finally: - if privatetrans: - session.close() + return session.query(Maintainer).get(maintainer_id) __all__.append('get_maintainer') @@ -1167,6 +1023,7 @@ class NewComment(object): __all__.append('NewComment') +@session_wrapper def has_new_comment(package, version, session=None): """ Returns true if the given combination of C{package}, C{version} has a comment. @@ -1185,24 +1042,15 @@ def has_new_comment(package, version, session=None): @return: true/false """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - q = session.query(NewComment) q = q.filter_by(package=package) q = q.filter_by(version=version) - ret = q.count() > 0 - - if privatetrans: - session.close() - - return ret + return bool(q.count() > 0) __all__.append('has_new_comment') +@session_wrapper def get_new_comments(package=None, version=None, comment_id=None, session=None): """ Returns (possibly empty) list of NewComment objects for the given @@ -1223,25 +1071,14 @@ def get_new_comments(package=None, version=None, comment_id=None, session=None): @rtype: list @return: A (possibly empty) list of NewComment objects will be returned - """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - q = session.query(NewComment) if package is not None: q = q.filter_by(package=package) 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() - - if privatetrans: - session.close() - - return ret + return q.all() __all__.append('get_new_comments') @@ -1256,6 +1093,7 @@ class Override(object): __all__.append('Override') +@session_wrapper def get_override(package, suite=None, component=None, overridetype=None, session=None): """ Returns Override object for the given parameters @@ -1281,12 +1119,7 @@ def get_override(package, suite=None, component=None, overridetype=None, session @rtype: list @return: A (possibly empty) list of Override objects will be returned - """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True q = session.query(Override) q = q.filter_by(package=package) @@ -1303,12 +1136,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() - - if privatetrans: - session.close() - - return ret + return q.all() __all__.append('get_override') @@ -1324,6 +1152,7 @@ class OverrideType(object): __all__.append('OverrideType') +@session_wrapper def get_override_type(override_type, session=None): """ Returns OverrideType object for given C{override type}. @@ -1337,24 +1166,14 @@ def get_override_type(override_type, session=None): @rtype: int @return: the database id for the given override type - """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True q = session.query(OverrideType).filter_by(overridetype=override_type) - if q.count() == 0: - ret = None - else: - ret = q.one() - - if privatetrans: - session.close() - - return ret + try: + return q.one() + except NoResultFound: + return None __all__.append('get_override_type') @@ -1469,6 +1288,7 @@ class Priority(object): __all__.append('Priority') +@session_wrapper def get_priority(priority, session=None): """ Returns Priority object for given C{priority name}. @@ -1482,27 +1302,18 @@ def get_priority(priority, session=None): @rtype: Priority @return: Priority object for the given priority - """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True q = session.query(Priority).filter_by(priority=priority) - if q.count() == 0: - ret = None - else: - ret = q.one() - - if privatetrans: - session.close() - - return ret + try: + return q.one() + except NoResultFound: + return None __all__.append('get_priority') +@session_wrapper def get_priorities(session=None): """ Returns dictionary of priority names -> id mappings @@ -1514,19 +1325,12 @@ def get_priorities(session=None): @rtype: dictionary @return: dictionary of priority names -> id mappings """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True ret = {} q = session.query(Priority) for x in q.all(): ret[x.priority] = x.priority_id - if privatetrans: - session.close() - return ret __all__.append('get_priorities') @@ -1596,6 +1400,7 @@ class Queue(object): # TODO: Move into database as above if conf.FindB("Dinstall::SecurityQueueBuild"): # Copy it since the original won't be readable by www-data + import utils utils.copy(src, dest) else: # Create a symlink to it @@ -1609,23 +1414,27 @@ class Queue(object): session.add(qb) - # If the .orig.tar.gz is in the pool, create a symlink to - # it (if one doesn't already exist) - if changes.orig_tar_id: - # Determine the .orig.tar.gz file name - for dsc_file in changes.dsc_files.keys(): - if dsc_file.endswith(".orig.tar.gz"): - filename = dsc_file - - dest = os.path.join(dest_dir, filename) + # If the .orig tarballs are in the pool, create a symlink to + # them (if one doesn't already exist) + for dsc_file in changes.dsc_files.keys(): + # Skip all files except orig tarballs + from daklib.regexes import re_is_orig_source + if not re_is_orig_source.match(dsc_file): + continue + # Skip orig files not identified in the pool + if not (changes.orig_files.has_key(dsc_file) and + changes.orig_files[dsc_file].has_key("id")): + continue + orig_file_id = changes.orig_files[dsc_file]["id"] + dest = os.path.join(dest_dir, dsc_file) # If it doesn't exist, create a symlink if not os.path.exists(dest): q = session.execute("SELECT l.path, f.filename FROM location l, files f WHERE f.id = :id and f.location = l.id", - {'id': changes.orig_tar_id}) + {'id': orig_file_id}) res = q.fetchone() if not res: - return "[INTERNAL ERROR] Couldn't find id %s in files table." % (changes.orig_tar_id) + return "[INTERNAL ERROR] Couldn't find id %s in files table." % (orig_file_id) src = os.path.join(res[0], res[1]) os.symlink(src, dest) @@ -1654,9 +1463,11 @@ class Queue(object): __all__.append('Queue') -def get_queue(queuename, session=None): +@session_wrapper +def get_or_set_queue(queuename, session=None): """ - Returns Queue object for given C{queue name}. + Returns Queue object for given C{queue name}, creating it if it does not + exist. @type queuename: string @param queuename: The name of the queue @@ -1667,25 +1478,22 @@ def get_queue(queuename, session=None): @rtype: Queue @return: Queue object for the given queue - """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True q = session.query(Queue).filter_by(queue_name=queuename) - if q.count() == 0: - ret = None - else: - ret = q.one() - if privatetrans: - session.close() + try: + ret = q.one() + except NoResultFound: + queue = Queue() + queue.queue_name = queuename + session.add(queue) + session.commit_or_flush() + ret = queue return ret -__all__.append('get_queue') +__all__.append('get_or_set_queue') ################################################################################ @@ -1698,6 +1506,7 @@ class QueueBuild(object): __all__.append('QueueBuild') +@session_wrapper def get_queue_build(filename, suite, session=None): """ Returns QueueBuild object for given C{filename} and C{suite}. @@ -1714,12 +1523,7 @@ def get_queue_build(filename, suite, session=None): @rtype: Queue @return: Queue object for the given queue - """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True if isinstance(suite, int): q = session.query(QueueBuild).filter_by(filename=filename).filter_by(suite_id=suite) @@ -1727,15 +1531,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() - - if privatetrans: - session.close() - - return ret + try: + return q.one() + except NoResultFound: + return None __all__.append('get_queue_build') @@ -1762,6 +1561,7 @@ class Section(object): __all__.append('Section') +@session_wrapper def get_section(section, session=None): """ Returns Section object for given C{section name}. @@ -1775,26 +1575,18 @@ def get_section(section, session=None): @rtype: Section @return: Section object for the given section name - """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True q = session.query(Section).filter_by(section=section) - if q.count() == 0: - ret = None - else: - ret = q.one() - - if privatetrans: - session.close() - return ret + try: + return q.one() + except NoResultFound: + return None __all__.append('get_section') +@session_wrapper def get_sections(session=None): """ Returns dictionary of section names -> id mappings @@ -1806,19 +1598,12 @@ def get_sections(session=None): @rtype: dictionary @return: dictionary of section names -> id mappings """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True ret = {} q = session.query(Section) for x in q.all(): ret[x.section] = x.section_id - if privatetrans: - session.close() - return ret __all__.append('get_sections') @@ -1834,6 +1619,7 @@ class DBSource(object): __all__.append('DBSource') +@session_wrapper def source_exists(source, source_version, suites = ["any"], session=None): """ Ensure that source exists somewhere in the archive for the binary @@ -1859,11 +1645,6 @@ def source_exists(source, source_version, suites = ["any"], session=None): """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - cnf = Config() ret = 1 @@ -1902,13 +1683,11 @@ def source_exists(source, source_version, suites = ["any"], session=None): # No source found so return not ok ret = 0 - if privatetrans: - session.close() - return ret __all__.append('source_exists') +@session_wrapper def get_suites_source_in(source, session=None): """ Returns list of Suite objects which given C{source} name is in @@ -1920,20 +1699,11 @@ def get_suites_source_in(source, session=None): @return: list of Suite objects for the given source """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - - ret = session.query(Suite).join(SrcAssociation).join(DBSource).filter_by(source=source).all() - - if privatetrans: - session.close() - - return ret + return session.query(Suite).join(SrcAssociation).join(DBSource).filter_by(source=source).all() __all__.append('get_suites_source_in') +@session_wrapper def get_sources_from_name(source, version=None, dm_upload_allowed=None, session=None): """ Returns list of DBSource objects for given C{source} name and other parameters @@ -1955,10 +1725,6 @@ def get_sources_from_name(source, version=None, dm_upload_allowed=None, session= @rtype: list @return: list of DBSource objects for the given name (may be empty) """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True q = session.query(DBSource).filter_by(source=source) @@ -1968,15 +1734,11 @@ 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() - - if privatetrans: - session.close() - - return ret + return q.all() __all__.append('get_sources_from_name') +@session_wrapper def get_source_in_suite(source, suite, session=None): """ Returns list of DBSource objects for a combination of C{source} and C{suite}. @@ -1994,25 +1756,15 @@ def get_source_in_suite(source, suite, session=None): @return: the version for I{source} in I{suite} """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True q = session.query(SrcAssociation) 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 - - if privatetrans: - session.close() - - return ret + try: + return q.one().source + except NoResultFound: + return None __all__.append('get_source_in_suite') @@ -2029,6 +1781,17 @@ __all__.append('SrcAssociation') ################################################################################ +class SrcFormat(object): + def __init__(self, *args, **kwargs): + pass + + def __repr__(self): + return '' % (self.format_name) + +__all__.append('SrcFormat') + +################################################################################ + class SrcUploader(object): def __init__(self, *args, **kwargs): pass @@ -2090,6 +1853,7 @@ class Suite(object): __all__.append('Suite') +@session_wrapper def get_suite_architecture(suite, architecture, session=None): """ Returns a SuiteArchitecture object given C{suite} and ${arch} or None if it @@ -2109,27 +1873,18 @@ def get_suite_architecture(suite, architecture, session=None): @return: the SuiteArchitecture object or None """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - q = session.query(SuiteArchitecture) 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() - - if privatetrans: - session.close() - - return ret + try: + return q.one() + except NoResultFound: + return None __all__.append('get_suite_architecture') +@session_wrapper def get_suite(suite, session=None): """ Returns Suite object for given C{suite name}. @@ -2142,25 +1897,15 @@ def get_suite(suite, session=None): generated if not supplied) @rtype: Suite - @return: Suite object for the requested suite name (None if not presenT) - + @return: Suite object for the requested suite name (None if not present) """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True q = session.query(Suite).filter_by(suite_name=suite) - if q.count() == 0: - ret = None - else: - ret = q.one() - - if privatetrans: - session.close() - - return ret + try: + return q.one() + except NoResultFound: + return None __all__.append('get_suite') @@ -2175,6 +1920,7 @@ class SuiteArchitecture(object): __all__.append('SuiteArchitecture') +@session_wrapper def get_suite_architectures(suite, skipsrc=False, skipall=False, session=None): """ Returns list of Architecture objects for given C{suite} name @@ -2198,11 +1944,6 @@ def get_suite_architectures(suite, skipsrc=False, skipall=False, session=None): @return: list of Architecture objects for the given name (may be empty) """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - q = session.query(Architecture) q = q.join(SuiteArchitecture) q = q.join(Suite).filter_by(suite_name=suite) @@ -2215,14 +1956,45 @@ def get_suite_architectures(suite, skipsrc=False, skipall=False, session=None): q = q.order_by('arch_string') - ret = q.all() + return q.all() - if privatetrans: - session.close() +__all__.append('get_suite_architectures') - return ret +################################################################################ -__all__.append('get_suite_architectures') +class SuiteSrcFormat(object): + def __init__(self, *args, **kwargs): + pass + + def __repr__(self): + return '' % (self.suite_id, self.src_format_id) + +__all__.append('SuiteSrcFormat') + +@session_wrapper +def get_suite_src_formats(suite, session=None): + """ + Returns list of allowed SrcFormat for C{suite}. + + @type suite: str + @param suite: Suite name to search for + + @type session: Session + @param session: Optional SQL session object (a temporary one will be + generated if not supplied) + + @rtype: list + @return: the list of allowed source formats for I{suite} + """ + + q = session.query(SrcFormat) + q = q.join(SuiteSrcFormat) + q = q.join(Suite).filter_by(suite_name=suite) + q = q.order_by('format_name') + + return q.all() + +__all__.append('get_suite_src_formats') ################################################################################ @@ -2247,6 +2019,7 @@ class Uid(object): __all__.append('Uid') +@session_wrapper def add_database_user(uidname, session=None): """ Adds a database user @@ -2263,19 +2036,12 @@ def add_database_user(uidname, session=None): @return: the uid object for the given uidname """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - session.execute("CREATE USER :uid", {'uid': uidname}) - - if privatetrans: - session.commit() - session.close() + session.commit_or_flush() __all__.append('add_database_user') +@session_wrapper def get_or_set_uid(uidname, session=None): """ Returns uid object for given uidname. @@ -2294,51 +2060,30 @@ def get_or_set_uid(uidname, session=None): @return: the uid object for the given uidname """ - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - 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) - if privatetrans: - session.commit() - else: - session.flush() + session.commit_or_flush() ret = uid - else: - ret = q.one() - - if privatetrans: - session.close() return ret __all__.append('get_or_set_uid') - +@session_wrapper def get_uid_from_fingerprint(fpr, session=None): - privatetrans = False - if session is None: - session = DBConn().session() - privatetrans = True - q = session.query(Uid) q = q.join(Fingerprint).filter_by(fingerprint=fpr) - if q.count() != 1: - ret = None - else: - ret = q.one() - - if privatetrans: - session.close() - - return ret + try: + return q.one() + except NoResultFound: + return None __all__.append('get_uid_from_fingerprint') @@ -2383,9 +2128,11 @@ class DBConn(Singleton): self.tbl_section = Table('section', self.db_meta, autoload=True) self.tbl_source = Table('source', self.db_meta, autoload=True) self.tbl_src_associations = Table('src_associations', self.db_meta, autoload=True) + self.tbl_src_format = Table('src_format', self.db_meta, autoload=True) self.tbl_src_uploaders = Table('src_uploaders', self.db_meta, autoload=True) self.tbl_suite = Table('suite', self.db_meta, autoload=True) self.tbl_suite_architectures = Table('suite_architectures', self.db_meta, autoload=True) + self.tbl_suite_src_formats = Table('suite_src_formats', self.db_meta, autoload=True) self.tbl_uid = Table('uid', self.db_meta, autoload=True) def __setupmappers(self): @@ -2547,6 +2294,10 @@ class DBConn(Singleton): source_id = self.tbl_src_associations.c.source, source = relation(DBSource))) + mapper(SrcFormat, self.tbl_src_format, + properties = dict(src_format_id = self.tbl_src_format.c.id, + format_name = self.tbl_src_format.c.format_name)) + mapper(SrcUploader, self.tbl_src_uploaders, properties = dict(uploader_id = self.tbl_src_uploaders.c.id, source_id = self.tbl_src_uploaders.c.source, @@ -2565,6 +2316,12 @@ class DBConn(Singleton): arch_id = self.tbl_suite_architectures.c.architecture, architecture = relation(Architecture))) + mapper(SuiteSrcFormat, self.tbl_suite_src_formats, + properties = dict(suite_id = self.tbl_suite_src_formats.c.suite, + suite = relation(Suite, backref='suitesrcformats'), + src_format_id = self.tbl_suite_src_formats.c.src_format, + src_format = relation(SrcFormat))) + mapper(Uid, self.tbl_uid, properties = dict(uid_id = self.tbl_uid.c.id, fingerprint = relation(Fingerprint)))