Commit b808272b authored by mkanat%kerio.com's avatar mkanat%kerio.com

Bug 309680: Use SQL "JOIN ... ON ..." syntax instead of "JOIN ... USING(...)"

Patch By Lance Larsh <lance.larsh@oracle.com> r=mkanat, a=justdave
parent cf77347a
...@@ -177,7 +177,7 @@ sub initBug { ...@@ -177,7 +177,7 @@ sub initBug {
$dbh->sql_date_format('deadline', '%Y-%m-%d') . " $dbh->sql_date_format('deadline', '%Y-%m-%d') . "
FROM bugs FROM bugs
LEFT JOIN votes LEFT JOIN votes
USING (bug_id) ON bugs.bug_id = votes.bug_id
INNER JOIN components INNER JOIN components
ON components.id = bugs.component_id ON components.id = bugs.component_id
INNER JOIN products INNER JOIN products
...@@ -1011,7 +1011,7 @@ sub RemoveVotes { ...@@ -1011,7 +1011,7 @@ sub RemoveVotes {
"products.votesperuser, products.maxvotesperbug " . "products.votesperuser, products.maxvotesperbug " .
"FROM profiles " . "FROM profiles " .
"LEFT JOIN votes ON profiles.userid = votes.who " . "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 " . "LEFT JOIN products ON products.id = bugs.product_id " .
"WHERE votes.bug_id = ? " . $whopart); "WHERE votes.bug_id = ? " . $whopart);
$sth->execute($id); $sth->execute($id);
......
...@@ -2445,7 +2445,7 @@ if (!($sth->fetchrow_arrayref()->[0])) { ...@@ -2445,7 +2445,7 @@ if (!($sth->fetchrow_arrayref()->[0])) {
$sth = $dbh->prepare( $sth = $dbh->prepare(
"SELECT longdescs.bug_id, thetext " . "SELECT longdescs.bug_id, thetext " .
"FROM longdescs " . "FROM longdescs " .
"LEFT JOIN bugs using(bug_id) " . "LEFT JOIN bugs ON longdescs.bug_id = bugs.bug_id " .
"WHERE (" . $dbh->sql_regexp("thetext", "WHERE (" . $dbh->sql_regexp("thetext",
"'[.*.]{3} This bug has been marked as a duplicate of [[:digit:]]+ [.*.]{3}'") . ") " . "'[.*.]{3} This bug has been marked as a duplicate of [[:digit:]]+ [.*.]{3}'") . ") " .
"AND (resolution = 'DUPLICATE') " . "AND (resolution = 'DUPLICATE') " .
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment