Fix for bug 228917: Makes some flag SQL work with PostgreSQL by using the semanticall...

Patch by mkanat@kerio.com.
r=myk
a=myk

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index a766e9e6fecfd5f6530410fb1d874ef023709608..2052f950772d75c945724ad095958aa7c065f40e 100644 (file)
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -244,12 +244,12 @@ sub process {
     # no longer valid.
     &::SendSQL("
         SELECT flags.id 
-        FROM flags, bugs LEFT OUTER JOIN flaginclusions i
-        ON (flags.type_id = i.type_id 
+        FROM (flags INNER JOIN bugs ON flags.bug_id = bugs.bug_id)
+          LEFT OUTER JOIN flaginclusions i
+            ON (flags.type_id = i.type_id 
             AND (bugs.product_id = i.product_id OR i.product_id IS NULL)
             AND (bugs.component_id = i.component_id OR i.component_id IS NULL))
         WHERE flags.type_id = $target->{'bug'}->{'id'} 
-        AND flags.bug_id = bugs.bug_id
         AND i.type_id IS NULL
     ");
     clear(&::FetchOneColumn()) while &::MoreSQLData();

diff --git a/Bugzilla/FlagType.pm b/Bugzilla/FlagType.pm
index cc825e9054ab8296166ac014f239f6eb223e3282..e6bfaf7ef02a33b5e71917ee1a24129b8f213930 100644 (file)
--- a/Bugzilla/FlagType.pm
+++ b/Bugzilla/FlagType.pm
@@ -264,12 +264,12 @@ sub normalize {
     # Check for flags whose product/component is no longer included.
     &::SendSQL("
         SELECT flags.id 
-        FROM flags, bugs LEFT OUTER JOIN flaginclusions AS i
-        ON (flags.type_id = i.type_id 
+        FROM (flags INNER JOIN bugs ON flags.bug_id = bugs.bug_id)
+          LEFT OUTER JOIN flaginclusions AS i
+            ON (flags.type_id = i.type_id
             AND (bugs.product_id = i.product_id OR i.product_id IS NULL)
             AND (bugs.component_id = i.component_id OR i.component_id IS NULL))
         WHERE flags.type_id IN ($ids)
-        AND flags.bug_id = bugs.bug_id
         AND i.type_id IS NULL
     ");
     Bugzilla::Flag::clear(&::FetchOneColumn()) while &::MoreSQLData();