From f5f31fc070588c2075dd13a0fbabe8117e3aad76 Mon Sep 17 00:00:00 2001
From: "mkanat%kerio.com" <>
Date: Tue, 5 Apr 2005 04:52:03 +0000
Subject: Bug 286235: Implicit joins should be replaced by explicit joins -
 installment A Patch By Tomas Kopal <Tomas.Kopal@altap.cz> r=joel, a=myk

---
 process_bug.cgi | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'process_bug.cgi')

diff --git a/process_bug.cgi b/process_bug.cgi
index 55f40bda3..94d86c936 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -227,8 +227,8 @@ sub CheckonComment( $ ) {
 # and make the user verify the version, component, target milestone,
 # and bug groups if so.
 if ( $::FORM{'id'} ) {
-    SendSQL("SELECT name FROM products, bugs " .
-            "WHERE products.id = bugs.product_id AND bug_id = $::FORM{'id'}");
+    SendSQL("SELECT name FROM products INNER JOIN bugs " .
+            "ON products.id = bugs.product_id WHERE bug_id = $::FORM{'id'}");
     $::oldproduct = FetchSQLData();
 }
 if ((($::FORM{'id'} && $::FORM{'product'} ne $::oldproduct) 
@@ -445,7 +445,7 @@ sub CheckCanChangeField {
     
     # At this point, the user is either the reporter or an
     # unprivileged user. We first check for fields the reporter
-    # is not allowed to change.
+    # is not allowed to change.
 
     # The reporter may not:
     # - reassign bugs, unless the bugs are assigned to him;
@@ -673,10 +673,10 @@ sub ChangeResolution {
 my @groupAdd = ();
 my @groupDel = ();
 
-SendSQL("SELECT groups.id, isactive FROM groups, user_group_map WHERE " .
-        "groups.id = user_group_map.group_id AND " .
-        "user_group_map.user_id = $whoid AND " .
-        "isbless = 0 AND isbuggroup = 1");
+SendSQL("SELECT groups.id, isactive FROM groups INNER JOIN user_group_map " .
+        "ON groups.id = user_group_map.group_id " .
+        "WHERE user_group_map.user_id = $whoid " .
+        "AND isbless = 0 AND isbuggroup = 1");
 while (my ($b, $isactive) = FetchSQLData()) {
     # The multiple change page may not show all groups a bug is in
     # (eg product groups when listing more than one product)
@@ -1099,8 +1099,8 @@ my $delta_ts;
 
 sub SnapShotBug {
     my ($id) = (@_);
-    SendSQL("select delta_ts, " . join(',', @::log_columns) .
-            " from bugs where bug_id = $id");
+    SendSQL("SELECT delta_ts, " . join(',', @::log_columns) .
+            " FROM bugs WHERE bug_id = $id");
     my @row = FetchSQLData();
     $delta_ts = shift @row;
 
@@ -1110,7 +1110,7 @@ sub SnapShotBug {
 
 sub SnapShotDeps {
     my ($i, $target, $me) = (@_);
-    SendSQL("select $target from dependencies where $me = $i order by $target");
+    SendSQL("SELECT $target FROM dependencies WHERE $me = $i ORDER BY $target");
     my @list;
     while (MoreSQLData()) {
         push(@list, FetchOneColumn());
@@ -1344,7 +1344,7 @@ foreach my $id (@idlist) {
             my @stack = @{$deps{$target}};
             while (@stack) {
                 my $i = shift @stack;
-                SendSQL("select $target from dependencies where $me = " .
+                SendSQL("SELECT $target FROM dependencies WHERE $me = " .
                         SqlQuote($i));
                 while (MoreSQLData()) {
                     my $t = FetchOneColumn();
@@ -1390,7 +1390,7 @@ foreach my $id (@idlist) {
 
     SendSQL("select now()");
     $timestamp = FetchOneColumn();
-    my $sql_timestamp = SqlQuote($timestamp);
+    my $sql_timestamp = SqlQuote($timestamp);
 
     my $work_time;
     if (UserInGroup(Param('timetrackinggroup'))) {
@@ -1435,9 +1435,9 @@ foreach my $id (@idlist) {
         }
         if ($changed) {
             SendSQL("SELECT keyworddefs.name 
-                     FROM keyworddefs, keywords
+                     FROM keyworddefs INNER JOIN keywords
+                       ON keyworddefs.id = keywords.keywordid
                      WHERE keywords.bug_id = $id
-                         AND keyworddefs.id = keywords.keywordid
                      ORDER BY keyworddefs.name");
             my @list;
             while (MoreSQLData()) {
-- 
cgit v1.2.3-24-g4f1b