builds+jobs: Use new methods to access database objects

[pbs.git] / src / buildservice / builds.py

diff --git a/src/buildservice/builds.py b/src/buildservice/builds.py
index 0ab503c4499620d9ed20689f194190189deee64f..f58dc593b9da271706fbe71e7abe2c9a47e8005f 100644 (file)
--- a/src/buildservice/builds.py
+++ b/src/buildservice/builds.py
@@ -16,17 +16,11 @@ from .decorators import *
 log = logging.getLogger("pbs.builds")
 
 class Builds(base.Object):
-       def _get_build(self, query, *args):
-               res = self.db.get(query, *args)
-
-               if res:
-                       return Build(self.backend, res.id, data=res)
-
-       def _get_builds(self, query, *args):
-               res = self.db.query(query, *args)
+       def _get_build(self, query, *args, **kwargs):
+               return self.db.fetch_one(Build, query, *args, **kwargs)
 
-               for row in res:
-                       yield Build(self.backend, row.id, data=row)
+       def _get_builds(self, query, *args, **kwargs):
+               return self.db.fetch_many(Build, query, *args, **kwargs)
 
        def __len__(self):
                res = self.db.get("""
@@ -312,11 +306,13 @@ class Builds(base.Object):
                        group,
                        test,
                        disable_test_builds,
+
+                       # Populate cache
+                       package=package, group=group, owner=owner, repo=repo,
                )
 
-               # Populate cache
+               # Update group cache
                if group:
-                       build.group = group
                        group.builds.append(build)
 
                # Create all jobs