summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkanat%kerio.com <>2005-10-07 03:43:43 +0200
committermkanat%kerio.com <>2005-10-07 03:43:43 +0200
commitb808272b74ab202b17964fbb64b189e4b912ec2b (patch)
treed89d16b81a61026a7732245de1cfb60810e38620
parentcf77347aeaa2045ffd27ad2a4a511e9f150bcf49 (diff)
downloadbugzilla-b808272b74ab202b17964fbb64b189e4b912ec2b.tar.gz
bugzilla-b808272b74ab202b17964fbb64b189e4b912ec2b.tar.xz
Bug 309680: Use SQL "JOIN ... ON ..." syntax instead of "JOIN ... USING(...)"
Patch By Lance Larsh <lance.larsh@oracle.com> r=mkanat, a=justdave
-rwxr-xr-xBugzilla/Bug.pm4
-rwxr-xr-xchecksetup.pl2
2 files changed, 3 insertions, 3 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index b9206b9a0..e050d2211 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -177,7 +177,7 @@ sub initBug {
$dbh->sql_date_format('deadline', '%Y-%m-%d') . "
FROM bugs
LEFT JOIN votes
- USING (bug_id)
+ ON bugs.bug_id = votes.bug_id
INNER JOIN components
ON components.id = bugs.component_id
INNER JOIN products
@@ -1011,7 +1011,7 @@ sub RemoveVotes {
"products.votesperuser, products.maxvotesperbug " .
"FROM profiles " .
"LEFT JOIN votes ON profiles.userid = votes.who " .
- "LEFT JOIN bugs USING(bug_id) " .
+ "LEFT JOIN bugs ON votes.bug_id = bugs.bug_id " .
"LEFT JOIN products ON products.id = bugs.product_id " .
"WHERE votes.bug_id = ? " . $whopart);
$sth->execute($id);
diff --git a/checksetup.pl b/checksetup.pl
index 3f4a68b78..225a3341e 100755
--- a/checksetup.pl
+++ b/checksetup.pl
@@ -2445,7 +2445,7 @@ if (!($sth->fetchrow_arrayref()->[0])) {
$sth = $dbh->prepare(
"SELECT longdescs.bug_id, thetext " .
"FROM longdescs " .
- "LEFT JOIN bugs using(bug_id) " .
+ "LEFT JOIN bugs ON longdescs.bug_id = bugs.bug_id " .
"WHERE (" . $dbh->sql_regexp("thetext",
"'[.*.]{3} This bug has been marked as a duplicate of [[:digit:]]+ [.*.]{3}'") . ") " .
"AND (resolution = 'DUPLICATE') " .