[Collab-qa-commits] r1953 - in udd: sql udd

[Lucas Nussbaum]

Author: lucas
Date: 2011-05-31 08:24:56 +0000 (Tue, 31 May 2011)
New Revision: 1953

Modified:
   udd/sql/setup.sql
   udd/sql/upgrade.sql
   udd/udd/bugs_gatherer.pl
Log:
apply patch from Ryan Kavanagh to add done_date to bugs

Modified: udd/sql/setup.sql
===================================================================
--- udd/sql/setup.sql	2011-05-31 08:18:25 UTC (rev 1952)
+++ udd/sql/setup.sql	2011-05-31 08:24:56 UTC (rev 1953)
@@ -195,7 +195,7 @@
   (id int PRIMARY KEY, package text, source text, arrival timestamp, status text,
      severity bugs_severity, submitter text, submitter_name text,
      submitter_email text, owner text, owner_name text, owner_email text,
-     done text, done_name text, done_email text, title text,
+     done text, done_name text, done_email text, done_date timestamp, title text,
      last_modified timestamp, forwarded text, affects_oldstable boolean,
      affects_stable boolean,
     affects_testing boolean, affects_unstable boolean,
@@ -235,7 +235,7 @@
   (id int PRIMARY KEY, package text, source text, arrival timestamp, status text,
      severity bugs_severity, submitter text, submitter_name text,
      submitter_email text, owner text, owner_name text, owner_email text,
-     done text, done_name text, done_email text, title text,
+     done text, done_name text, done_email text, done_date timestamp, title text,
      last_modified timestamp, forwarded text, affects_oldstable boolean,
      affects_stable boolean,
     affects_testing boolean, affects_unstable boolean,

Modified: udd/sql/upgrade.sql
===================================================================
--- udd/sql/upgrade.sql	2011-05-31 08:18:25 UTC (rev 1952)
+++ udd/sql/upgrade.sql	2011-05-31 08:24:56 UTC (rev 1953)
@@ -341,3 +341,6 @@
 ALTER TABLE ubuntu_packages add ruby_versions text;
 ALTER TABLE derivatives_sources add ruby_versions text;
 ALTER TABLE derivatives_packages add ruby_versions text;
+-- 2011-05-31
+ALTER TABLE bugs add done_date timestamp;
+ALTER TABLE archived_bugs add done_date timestamp;

Modified: udd/udd/bugs_gatherer.pl
===================================================================
--- udd/udd/bugs_gatherer.pl	2011-05-31 08:18:25 UTC (rev 1952)
+++ udd/udd/bugs_gatherer.pl	2011-05-31 08:24:56 UTC (rev 1953)
@@ -180,7 +180,7 @@
 	my $location = $src_config{archived} ? 'archive' : 'db_h';
 	$table = $src_config{archived} ? $archived_table : $table;
 	# Read all bugs
-	my $insert_bugs_handle = $dbh->prepare("INSERT INTO $table (id, package, source, arrival, status, severity, submitter, submitter_name, submitter_email, owner, owner_name, owner_email, done, done_name, done_email, title, forwarded, last_modified, affects_oldstable, affects_stable, affects_testing, affects_unstable, affects_experimental) VALUES (\$1, \$2, \$3, \$4::abstime, \$5, \$6, \$7, \$8, \$9, \$10, \$11, \$12, \$13, \$14, \$15, \$16, \$17, \$18::abstime, \$19, \$20, \$21, \$22, \$23)");
+	my $insert_bugs_handle = $dbh->prepare("INSERT INTO $table (id, package, source, arrival, status, severity, submitter, submitter_name, submitter_email, owner, owner_name, owner_email, done, done_name, done_email, done_date, title, forwarded, last_modified, affects_oldstable, affects_stable, affects_testing, affects_unstable, affects_experimental) VALUES (\$1, \$2, \$3, \$4::abstime, \$5, \$6, \$7, \$8, \$9, \$10, \$11, \$12, \$13, \$14, \$15, \$16::abstime, \$17, \$18, \$19::abstime, \$20, \$21, \$22, \$23, \$24)");
 	my $insert_bugs_packages_handle = $dbh->prepare("INSERT INTO ${table}_packages (id, package, source) VALUES (\$1, \$2, \$3)");
 	my $insert_bugs_found_handle = $dbh->prepare("INSERT INTO ${table}_found_in (id, version) VALUES (\$1, \$2)");
 	my $insert_bugs_fixed_handle = $dbh->prepare("INSERT INTO ${table}_fixed_in (id, version) VALUES (\$1, \$2)");
@@ -213,7 +213,7 @@
 			} else {
 				$bug{$_} = 0;
 			}
-		} qw{date log_modified};
+		} qw{date log_modified done_date};
 
 		my $srcpkg;
 		if ($bug{package} =~ /^src:(.*)/)
@@ -312,8 +312,8 @@
 		# Insert data into bugs table
 		$insert_bugs_handle->execute($bug_nr, $bug{package}, $srcpkg, $bug{date}, $bug{pending},
 			$bug{severity}, $bug{originator}, $submitter_name, $submitter_email, $bug{owner},
-		       	$owner_name, $owner_email, $bug{done}, $done_name, $done_email, $bug{subject},
-		       	$bug{forwarded}, $bug{log_modified},
+		       	$owner_name, $owner_email, $bug{done}, $done_name, $done_email, $bug{done_date},
+		       	$bug{subject}, $bug{forwarded}, $bug{log_modified},
 			$present_in_oldstable, $present_in_stable, $present_in_testing, $present_in_unstable, $present_in_experimental) or die $!;
 
 		my $src;