From 8fe56c3ce4a533b4dfd647e900a42ac8ccec025a Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Jan 04 2019 22:58:51 +0000 Subject: use QueryProcessor in get_archive_type --- diff --git a/hub/kojihub.py b/hub/kojihub.py index 903d6e7..30a9ca8 100644 --- a/hub/kojihub.py +++ b/hub/kojihub.py @@ -5964,13 +5964,15 @@ def get_archive_type(filename=None, type_name=None, type_id=None, strict=False): raise koji.GenericError('one of filename, type_name, or type_id must be specified') parts = filename.split('.') - + query = QueryProcessor( + tables=['archivetypes'], + columns=['id', 'name', 'description', 'extensions'], + clauses=['extensions ~* %(pattern)s'], + ) for start in range(len(parts)-1, -1, -1): ext = '.'.join(parts[start:]) - - select = r"""SELECT id, name, description, extensions FROM archivetypes - WHERE extensions ~* E'(\\s|^)%s(\\s|$)'""" % ext - results = _multiRow(select, locals(), ('id', 'name', 'description', 'extensions')) + query.values['pattern'] = r'(\s|^)%s(\s|$)' % ext + results = query.execute() if len(results) == 1: return results[0]