diff options
Diffstat (limited to 'buildbot_gentoo_ci/db')
| -rw-r--r-- | buildbot_gentoo_ci/db/model.py | 2 | ||||
| -rw-r--r-- | buildbot_gentoo_ci/db/projects.py | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/buildbot_gentoo_ci/db/model.py b/buildbot_gentoo_ci/db/model.py index ede5cb7..ca9932a 100644 --- a/buildbot_gentoo_ci/db/model.py +++ b/buildbot_gentoo_ci/db/model.py @@ -225,11 +225,11 @@ class Model(base.DBConnectorComponent): sa.ForeignKey('projects.uuid', ondelete='CASCADE'), nullable=False), sa.Column('search', sa.String(50), nullable=False), - sa.Column('search_end', sa.String(50), nullable=True), sa.Column('start', sa.Integer, default=0), sa.Column('end', sa.Integer, default=0), sa.Column('status', sa.Enum('info', 'warning', 'ignore', 'error'), default='info'), sa.Column('type', sa.Enum('info', 'qa', 'compile', 'configure', 'install', 'postinst', 'prepare', 'setup', 'test', 'unpack', 'ignore'), default='info'), + sa.Column('search_type', sa.Enum('in', 'startswith', 'endswith', 'search'), default='in'), ) keywords = sautils.Table( diff --git a/buildbot_gentoo_ci/db/projects.py b/buildbot_gentoo_ci/db/projects.py index 2393011..176be92 100644 --- a/buildbot_gentoo_ci/db/projects.py +++ b/buildbot_gentoo_ci/db/projects.py @@ -266,15 +266,11 @@ class ProjectsConnectorComponent(base.DBConnectorComponent): ) def _row2dict_projects_pattern(self, conn, row): - if row.search_end == '': - search_end = None - else: - search_end = row.search_end return dict( id=row.id, project_uuid=row.project_uuid, search=row.search, - search_end=search_end, + search_type=row.search_type, start=row.start, end=row.end, status=row.status, |