[dak/master] Create, test, and refactor get_source_by_package_and_suite().

[Torsten Werner <twerner@debian.org>]

Signed-off-by: Torsten Werner <twerner@debian.org>
---
 daklib/queue.py          |   15 ++++++++++-----
 tests/dbtest_packages.py |   15 ++++++++++++++-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/daklib/queue.py b/daklib/queue.py
index 08ac23f..fa09254 100755
--- a/daklib/queue.py
+++ b/daklib/queue.py
@@ -389,6 +389,15 @@ def get_suite_version(source, session):
         join(Suite.sources).filter_by(source = source)
     return q.all()
 
+def get_source_by_package_and_suite(package, suite_name, session):
+    '''
+    returns a DBSource query filtered by DBBinary.package and this package's
+    suite_name
+    '''
+    return session.query(DBSource). \
+        join(DBSource.binaries).filter_by(package = package). \
+        join(DBBinary.suites).filter_by(suite_name = suite_name)
+
 class Upload(object):
     """
     Everything that has to do with an upload processed.
@@ -1738,11 +1747,7 @@ class Upload(object):
         ## none of the packages are being taken over from other source packages
         for b in self.pkg.changes["binary"].keys():
             for suite in self.pkg.changes["distribution"].keys():
-                q = session.query(DBSource)
-                q = q.join(DBBinary).filter_by(package=b)
-                q = q.join(BinAssociation).join(Suite).filter_by(suite_name=suite)
-
-                for s in q.all():
+                for s in get_source_by_package_and_suite(b, suite, session):
                     if s.source != self.pkg.changes["source"]:
                         self.rejects.append("%s may not hijack %s from source package %s in suite %s" % (fpr.uid.uid, b, s, suite))
 
diff --git a/tests/dbtest_packages.py b/tests/dbtest_packages.py
index 7150866..91e4839 100755
--- a/tests/dbtest_packages.py
+++ b/tests/dbtest_packages.py
@@ -8,7 +8,8 @@ from daklib.dbconn import Architecture, Suite, get_suite_architectures, \
     get_suites_source_in, add_dsc_to_db, source_exists, DBBinary, \
     get_suites_binary_in, add_deb_to_db
 from daklib.queue_install import package_to_suite
-from daklib.queue import get_newest_source, get_suite_version
+from daklib.queue import get_newest_source, get_suite_version, \
+    get_source_by_package_and_suite
 
 from sqlalchemy.orm.exc import MultipleResultsFound
 import unittest
@@ -469,5 +470,17 @@ class PackageTestCase(DBDakTestCase):
         self.assertEqual('deadbeef', poolfile.sha1sum)
         self.assertEqual('deadbeef', poolfile.sha256sum)
 
+    def test_get_source_by_package_and_suite(self):
+        'test get_source_by_package_and_suite()'
+
+        query = get_source_by_package_and_suite('hello', 'sid', self.session)
+        self.assertEqual(self.source['hello_2.2-1'], query.one())
+        query = get_source_by_package_and_suite('gnome-hello', 'squeeze', self.session)
+        self.assertEqual(self.source['hello_2.2-1'], query.one())
+        query = get_source_by_package_and_suite('hello', 'hamm', self.session)
+        self.assertEqual(0, query.count())
+        query = get_source_by_package_and_suite('foobar', 'squeeze', self.session)
+        self.assertEqual(0, query.count())
+
 if __name__ == '__main__':
     unittest.main()
-- 
1.5.6.5