web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml | 14 ++++++------
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 16 +++++++-------
2 files changed, 15 insertions(+), 15 deletions(-)
New commits:
commit a33862b1ef130e322f46a1018a6d37f997e79774
Author: Julian Einwag <je(a)rockenstein.de>
Date: Fri May 20 14:28:37 2011 +0200
replaced (+) with ANSI left join
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
index 7df3ca8..de68eb0 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Action_queries.xml
@@ -9,8 +9,9 @@ SELECT SA.action_id AS ID,
AType.name AS history_type_name
FROM rhnActionType AType,
rhnActionStatus AStat,
- rhnUser U,
- rhnAction A,
+ rhnAction A
+ LEFT JOIN rhnUser U
+ ON A.scheduler = U.id,
rhnServerAction SA,
rhnSet ST
WHERE ST.user_id = :user_id
@@ -20,7 +21,6 @@ SELECT SA.action_id AS ID,
AND SA.action_id = A.id
AND AType.id = A.action_type
AND AStat.id = SA.status
- AND A.scheduler = U.id (+)
AND AStat.id = 0
</query>
</mode>
@@ -112,15 +112,15 @@ SELECT EVENT_ID, TO_CHAR(CREATED, 'YYYY-MM-DD HH24:MI:SS')
CREATED, SUMMARY
SA.created
FROM rhnActionType AType,
rhnActionStatus AStat,
- rhnUser U,
- rhnAction A,
+ rhnAction A
+ LEFT JOIN rhnUser U
+ ON U.id = A.scheduler,
rhnServerAction SA
WHERE SA.server_id = :support_sid
AND SA.action_id = A.id
AND ATYPE.id = A.action_type
AND AStat.id = SA.status
- AND U.id(+) = A.scheduler
- )
+ ) X
ORDER BY CREATED DESC, EVENT_ID DESC
</query>
</mode>
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
index 59863f3..17d4adb 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
@@ -590,9 +590,11 @@ SELECT P2.id AS ID, PN.name || '-' ||
evr_t_as_vre_simple(PE.evr) || '-' ||
rhnPackageName PN,
rhnPackageEVR PE,
rhnPackageEVR PE2,
- rhnErrata E,
- rhnErrataPackage EP,
- rhnPackage P2,
+ rhnPackage P2
+ LEFT JOIN rhnErrataPackage EP
+ ON P2.id = EP.package_id
+ LEFT JOIN rhnErrata E
+ ON E.id = EP.errata_id,
rhnAvailableChannels AC,
rhnChannelPackage CP2,
rhnChannelPackage CP1,
@@ -605,10 +607,8 @@ SELECT P2.id AS ID, PN.name || '-' ||
evr_t_as_vre_simple(PE.evr) || '-' ||
and ac.channel_id = cp2.channel_id
and p1.name_id = p2.name_id
AND cp2.package_id = P2.id
- AND P2.id = EP.package_id(+)
AND p2.evr_id = PE.id
AND PE2.id = P1.evr_id
- AND E.id(+) = EP.errata_id
and pe.id != pe2.id
AND PE.evr >= PE2.evr
-- after here is just for output
@@ -1421,11 +1421,12 @@ SELECT P.id AS ID,
E.advisory,
E.id AS ADVISORY_ID,
COUNT(DISTINCT SNPC.server_id) NUM_SYSTEMS
- FROM rhnErrata E,
+ FROM rhnServerNeededPackageCache SNPC
+ LEFT JOIN rhnErrata E
+ ON SNPC.errata_id = E.id,
rhnPackageEVR PE,
rhnPackageName PN,
rhnPackage P,
- rhnServerNeededPackageCache SNPC,
rhnSet S
WHERE S.user_id = :user_id
AND S.label = 'system_list'
@@ -1433,7 +1434,6 @@ SELECT P.id AS ID,
AND SNPC.package_id = P.id
AND P.name_id = PN.id
AND P.evr_id = PE.id
- AND SNPC.errata_id = E.id (+)
AND NOT EXISTS (SELECT 1 FROM rhnSolarisPatch SP WHERE
SP.package_id = P.id)
AND NOT EXISTS (SELECT 1 FROM rhnSolarisPatchSet SPS WHERE