From b06d40f619cfee2c2bd386898f577c34b9a3bf2b Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Dec 05 2014 14:10:21 +0000 Subject: Use task_id instead of id when comparing/ordering --- diff --git a/koschei/models.py b/koschei/models.py index 0b5b5d1..94373f6 100644 --- a/koschei/models.py +++ b/koschei/models.py @@ -353,7 +353,7 @@ Package.resolution_problems = \ foreign_keys=[Package.last_resolution_id], uselist=True) -Package.all_builds = relationship(Build, order_by=Build.id.desc(), +Package.all_builds = relationship(Build, order_by=Build.task_id.desc(), primaryjoin=(Build.package_id == Package.id), backref='package') Package.unapplied_changes = \ diff --git a/koschei/resolver.py b/koschei/resolver.py index 5e65b25..ad030cb 100644 --- a/koschei/resolver.py +++ b/koschei/resolver.py @@ -260,9 +260,9 @@ class Resolver(KojiService): def get_prev_build(self, build): return self.db.query(Build)\ .filter_by(package_id=build.package_id)\ - .filter(Build.id < build.id)\ + .filter(Build.task_id < build.task_id)\ .filter(Build.repo_id != None)\ - .order_by(Build.id.desc()).first() + .order_by(Build.task_id.desc()).first() def synchronize_resolution_state(self): self.db.flush()