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

[neronus-guest at alioth.debian.org]

Author: neronus-guest
Date: 2008-07-28 15:15:02 +0000 (Mon, 28 Jul 2008)
New Revision: 959

Modified:
   udd/src/db_manager.py
   udd/src/setup-db.sql
Log:
upload_history wasn't deleted by db_manager
optimized popcon_src_* views a little


Modified: udd/src/db_manager.py
===================================================================
--- udd/src/db_manager.py	2008-07-28 14:56:37 UTC (rev 958)
+++ udd/src/db_manager.py	2008-07-28 15:15:02 UTC (rev 959)
@@ -7,7 +7,7 @@
 """This scripts sets up and deletes the tables of the database"""
 
 TABLES = ('sources', 'packages', 'popcon', 'migrations', 'bugs', 'bug_merged_with', 'bug_user_tags', 'bug_found_in',
-          'bug_fixed_in')
+          'bug_fixed_in', 'upload_history')
 VIEWS = ('popcon_src_average', 'popcon_src_max')
 
 def print_help():

Modified: udd/src/setup-db.sql
===================================================================
--- udd/src/setup-db.sql	2008-07-28 14:56:37 UTC (rev 958)
+++ udd/src/setup-db.sql	2008-07-28 15:15:02 UTC (rev 959)
@@ -46,26 +46,22 @@
  (package text, version text, date timestamp with time zone, changed_by text, maintainer text, nmu boolean, signed_by text, key_id text);
 
 CREATE VIEW popcon_src_average AS
-  SELECT sources.package, avg(insts), avg(vote) AS vote, avg(olde) AS old, avg(recent) AS recent, avg(nofiles) as nofiles, sources.distribution
-    FROM sources, popcon,
+  SELECT package, avg(insts) AS insts, avg(vote) AS vote, avg(olde) AS old, avg(recent) AS recent, avg(nofiles) as nofiles, packages.distribution
+    FROM popcon,
           (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;
+	  popcon.distribution = packages.distribution
+    GROUP BY packages.source, packages.distribution, packages.package;
 
 CREATE VIEW popcon_src_max AS
-  SELECT sources.package, max(insts), max(vote) AS vote, max(olde) AS old, max(recent) AS recent, max(nofiles) as nofiles, sources.distribution
-    FROM sources, popcon,
+  SELECT package, max(insts) AS insts, max(vote) AS vote, max(olde) AS old, max(recent) AS recent, max(nofiles) as nofiles, packages.distribution
+    FROM popcon,
           (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;
+	  popcon.distribution = packages.distribution
+    GROUP BY packages.source, packages.distribution, packages.package;
 
 CREATE INDEX pkgs_src_id_idx ON Packages USING btree (Source);
 CREATE INDEX sources_distribution_idx on sources(distribution);