deduplicate over (domain, org, id), not just over id

WARNING: This change requires to alter your database index. Mysql:
ALTER TABLE report DROP INDEX domain, ADD UNIQUE KEY domain (domain, org, reportid);

Author: mwander

dbx_Pg.pl

@@ -29,7 +29,7 @@
 			additional_definitions 		=> "PRIMARY KEY (serial)",
 			table_options			=> "",
 			indexes				=> [
-				"CREATE UNIQUE INDEX report_uidx_domain ON report (domain, reportid);"
+				"CREATE UNIQUE INDEX report_uidx_domain ON report (domain, org, reportid);"
 				],
 			},
 		"rptrecord" => {

dbx_mysql.pl

@@ -26,7 +26,7 @@
 				"policy_pct"		, "tinyint"		, "unsigned",
 				"raw_xml"		, "mediumtext"		, "",
 				],
-			additional_definitions 		=> "PRIMARY KEY (serial), UNIQUE KEY domain (domain, reportid)",
+			additional_definitions 		=> "PRIMARY KEY (serial), UNIQUE KEY domain (domain, org, reportid)",
 			table_options			=> "ROW_FORMAT=COMPRESSED",
 			indexes				=> [],
 			},

dmarcts-report-parser.pl

@@ -813,8 +813,8 @@ sub storeXMLInDatabase {
 	}
 
 	# see if already stored
-	my $sth = $dbh->prepare(qq{SELECT org, serial FROM report WHERE reportid=?});
-	$sth->execute($id);
+	my $sth = $dbh->prepare(qq{SELECT org, serial FROM report WHERE reportid=? AND org=? AND domain=?});
+	$sth->execute($id, $org, $domain);
 	while ( my ($xorg,$sid) = $sth->fetchrow_array() )
 	{
 		if ($reports_replace) {