[Collab-qa-commits] r954 - udd/src

[neronus-guest at alioth.debian.org]

Author: neronus-guest
Date: 2008-07-28 14:23:49 +0000 (Mon, 28 Jul 2008)
New Revision: 954

Modified:
   udd/src/setup-db.sql
Log:
fixed bug in modified popcon_src_* queries


Modified: udd/src/setup-db.sql
===================================================================
--- udd/src/setup-db.sql	2008-07-28 14:06:53 UTC (rev 953)
+++ udd/src/setup-db.sql	2008-07-28 14:23:49 UTC (rev 954)
@@ -48,9 +48,10 @@
 CREATE VIEW popcon_src_average AS
   SELECT sources.package, avg(vote) AS vote, avg(olde) AS old, avg(recent) AS recent, avg(nofiles) as nofiles, sources.distribution
     FROM sources, popcon,
-          (SELECT DISTINCT packages.package, packages.source FROM packages) as packages
+          (SELECT DISTINCT packages.package, packages.source, packages.distribution FROM packages) as packages
     WHERE 
           packages.source = sources.package AND
+	  packages.distribution = sources.distribution AND
 	  popcon.name = packages.package AND
 	  popcon.distribution = sources.distribution
     GROUP BY sources.package, sources.distribution;
@@ -58,9 +59,10 @@
 CREATE VIEW popcon_src_max AS
   SELECT sources.package, max(vote) AS vote, max(olde) AS old, max(recent) AS recent, max(nofiles) as nofiles, sources.distribution
     FROM sources, popcon,
-          (SELECT DISTINCT packages.package, packages.source FROM packages) as packages
+          (SELECT DISTINCT packages.package, packages.source, packages.distribution FROM packages) as packages
     WHERE 
           packages.source = sources.package AND
+	  packages.distribution = sources.distribution AND
 	  popcon.name = packages.package AND
 	  popcon.distribution = sources.distribution
     GROUP BY sources.package, sources.distribution;