X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=113c38aa5fef3bf2d7a31015fa7622440ad73be4;hb=4258a4e33218d4b6c271bd19b0a0723dba1fbed5;hp=32fbdb5526376e9dcdd0ca2af74756871fd1fa38;hpb=d612affcdd3237f6906189dc0f27edc09850f4ed;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py index 32fbdb55..113c38aa 100755 --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -44,10 +44,11 @@ from sqlalchemy.orm import sessionmaker, mapper, relation from sqlalchemy.exc import * from singleton import Singleton +from textutils import fix_maintainer ################################################################################ -__all__ = [] +__all__ = ['IntegrityError', 'SQLAlchemyError'] ################################################################################ @@ -158,18 +159,18 @@ __all__.append('BinAssociation') ################################################################################ -class Binary(object): +class DBBinary(object): def __init__(self, *args, **kwargs): pass def __repr__(self): - return '' % (self.package, self.version, self.architecture) + return '' % (self.package, self.version, self.architecture) -__all__.append('Binary') +__all__.append('DBBinary') def get_binary_from_id(id, session=None): """ - Returns Binary object for given C{id} + Returns DBBinary object for given C{id} @type id: int @param id: Id of the required binary @@ -178,12 +179,12 @@ def get_binary_from_id(id, session=None): @param session: Optional SQLA session object (a temporary one will be generated if not supplied) - @rtype: Binary - @return: Binary object for the given binary (None if not present) + @rtype: DBBinary + @return: DBBinary object for the given binary (None if not present) """ if session is None: session = DBConn().session() - q = session.query(Binary).filter_by(binary_id=id) + q = session.query(DBBinary).filter_by(binary_id=id) if q.count() == 0: return None return q.one() @@ -192,24 +193,41 @@ __all__.append('get_binary_from_id') def get_binaries_from_name(package, session=None): """ - Returns list of Binary objects for given C{package} name + Returns list of DBBinary objects for given C{package} name @type package: str - @param package: Binary package name to search for + @param package: DBBinary package 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: list of Binary objects for the given name (may be empty) + @return: list of DBBinary objects for the given name (may be empty) """ if session is None: session = DBConn().session() - return session.query(Binary).filter_by(package=package).all() + return session.query(DBBinary).filter_by(package=package).all() __all__.append('get_binaries_from_name') +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 + WHERE b.package=:package AND s.suite_name=:suitename + AND (a.arch_string = :arch OR a.arch_string = 'all') + AND ba.bin = b.id AND ba.suite = s.id AND b.architecture = a.id + AND f.location = l.id + AND l.component = c.id + AND b.file = f.id""" + + vals = {'package': package, 'suitename': suitename, 'arch': arch} + + if session is None: + session = DBConn().session() + return session.execute(query, vals) + +__all__.append('get_binary_components') ################################################################################ class Component(object): @@ -532,6 +550,12 @@ class Maintainer(object): def __repr__(self): return '''''' % (self.name, self.maintainer_id) + def get_split_maintainer(self): + if not hasattr(self, 'name') or self.name is None: + return ('', '', '', '') + + return fix_maintainer(self.name.strip()) + __all__.append('Maintainer') ################################################################################ @@ -751,38 +775,47 @@ __all__.append('get_section') ################################################################################ -class Source(object): +class DBSource(object): def __init__(self, *args, **kwargs): pass def __repr__(self): - return '' % (self.source, self.version) + return '' % (self.source, self.version) -__all__.append('Source') +__all__.append('DBSource') -def get_sources_from_name(source, session=None): +def get_sources_from_name(source, dm_upload_allowed=None, session=None): """ - Returns list of Source objects for given C{source} name + Returns list of DBSource objects for given C{source} name @type source: str - @param source: Source package name to search for + @param source: DBSource package name to search for + + @type dm_upload_allowed: bool + @param dm_upload_allowed: If None, no effect. If True or False, only + return packages with that dm_upload_allowed setting @type session: Session @param session: Optional SQL session object (a temporary one will be generated if not supplied) @rtype: list - @return: list of Source objects for the given name (may be empty) + @return: list of DBSource objects for the given name (may be empty) """ if session is None: session = DBConn().session() - return session.query(Source).filter_by(source=source).all() + + q = session.query(DBSource).filter_by(source=source) + if dm_upload_allowed is not None: + q = q.filter_by(dm_upload_allowed=dm_upload_allowed) + + return q.all() __all__.append('get_sources_from_name') def get_source_in_suite(source, suite, session=None): """ - Returns list of Source objects for a combination of C{source} and C{suite}. + Returns list of DBSource objects for a combination of C{source} and C{suite}. - B{source} - source package name, eg. I{mailfilter}, I{bbdb}, I{glibc} - B{suite} - a suite name, eg. I{unstable} @@ -908,13 +941,21 @@ class SuiteArchitecture(object): __all__.append('SuiteArchitecture') -def get_suite_architectures(suite, session=None): +def get_suite_architectures(suite, skipsrc=False, skipall=False, session=None): """ Returns list of Architecture objects for given C{suite} name @type source: str @param source: Suite name to search for + @type skipsrc: boolean + @param skipsrc: Whether to skip returning the 'source' architecture entry + (Default False) + + @type skipall: boolean + @param skipall: Whether to skip returning the 'all' architecture entry + (Default False) + @type session: Session @param session: Optional SQL session object (a temporary one will be generated if not supplied) @@ -928,7 +969,12 @@ def get_suite_architectures(suite, session=None): q = session.query(Architecture) q = q.join(SuiteArchitecture) - q = q.join(Suite).filter_by(suite_name=suite).order_by('arch_string') + q = q.join(Suite).filter_by(suite_name=suite) + if skipsrc: + q = q.filter(Architecture.arch_string != 'source') + if skipall: + q = q.filter(Architecture.arch_string != 'all') + q = q.order_by('arch_string') return q.all() __all__.append('get_suite_architectures') @@ -944,6 +990,20 @@ class Uid(object): __all__.append('Uid') +def get_uid_from_fingerprint(fpr, session=None): + if session is None: + session = DBConn().session() + + q = session.query(Uid) + q = q.join(Fingerprint).filter_by(fingerprint=fpr) + + if q.count() != 1: + return None + else: + return q.one() + +__all__.append('get_uid_from_fingerprint') + ################################################################################ class DBConn(Singleton): @@ -1002,16 +1062,16 @@ class DBConn(Singleton): suite_id = self.tbl_bin_associations.c.suite, suite = relation(Suite), binary_id = self.tbl_bin_associations.c.bin, - binary = relation(Binary))) + binary = relation(DBBinary))) - mapper(Binary, self.tbl_binaries, + mapper(DBBinary, self.tbl_binaries, properties = dict(binary_id = self.tbl_binaries.c.id, package = self.tbl_binaries.c.package, version = self.tbl_binaries.c.version, maintainer_id = self.tbl_binaries.c.maintainer, maintainer = relation(Maintainer), source_id = self.tbl_binaries.c.source, - source = relation(Source), + source = relation(DBSource), arch_id = self.tbl_binaries.c.architecture, architecture = relation(Architecture), poolfile_id = self.tbl_binaries.c.file, @@ -1037,7 +1097,7 @@ class DBConn(Singleton): filepath_id = self.tbl_content_associations.c.filepath, filepath = relation(ContentFilepath), binary_id = self.tbl_content_associations.c.binary_pkg, - binary = relation(Binary))) + binary = relation(DBBinary))) mapper(ContentFilename, self.tbl_content_file_names, @@ -1051,7 +1111,7 @@ class DBConn(Singleton): mapper(DSCFile, self.tbl_dsc_files, properties = dict(dscfile_id = self.tbl_dsc_files.c.id, source_id = self.tbl_dsc_files.c.source, - source = relation(Source), + source = relation(DBSource), poolfile_id = self.tbl_dsc_files.c.file, poolfile = relation(PoolFile))) @@ -1120,7 +1180,7 @@ class DBConn(Singleton): mapper(Section, self.tbl_section, properties = dict(section_id = self.tbl_section.c.id)) - mapper(Source, self.tbl_source, + mapper(DBSource, self.tbl_source, properties = dict(source_id = self.tbl_source.c.id, version = self.tbl_source.c.version, maintainer_id = self.tbl_source.c.maintainer, @@ -1143,12 +1203,12 @@ class DBConn(Singleton): suite_id = self.tbl_src_associations.c.suite, suite = relation(Suite), source_id = self.tbl_src_associations.c.source, - source = relation(Source))) + source = relation(DBSource))) mapper(SrcUploader, self.tbl_src_uploaders, properties = dict(uploader_id = self.tbl_src_uploaders.c.id, source_id = self.tbl_src_uploaders.c.source, - source = relation(Source, + source = relation(DBSource, primaryjoin=(self.tbl_src_uploaders.c.source==self.tbl_source.c.id)), maintainer_id = self.tbl_src_uploaders.c.maintainer, maintainer = relation(Maintainer, @@ -1159,12 +1219,13 @@ class DBConn(Singleton): mapper(SuiteArchitecture, self.tbl_suite_architectures, properties = dict(suite_id = self.tbl_suite_architectures.c.suite, - suite = relation(Suite), + suite = relation(Suite, backref='suitearchitectures'), arch_id = self.tbl_suite_architectures.c.architecture, architecture = relation(Architecture))) mapper(Uid, self.tbl_uid, - properties = dict(uid_id = self.tbl_uid.c.id)) + properties = dict(uid_id = self.tbl_uid.c.id, + fingerprint = relation(Fingerprint))) ## Connection functions def __createconn(self):