web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml | 4 +- web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml | 15 +++++----- 2 files changed, 10 insertions(+), 9 deletions(-)
New commits: commit 254c57fd69bb9a14c17d7de2deddb304caf26b54 Author: Michael Mraka michael.mraka@redhat.com Date: Thu Aug 11 13:32:49 2011 +0200
fixed couple more joins
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml index c7715b0..35e37e2 100644 --- a/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml +++ b/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml @@ -18,24 +18,24 @@ SELECT CR.id AS ID, CFT.name as FILETYPE FROM rhnConfigChannelType CCT, rhnConfigChannel CC, - rhnConfigContent CCon, rhnConfigFileName CFN, rhnConfigFile CF, - rhnConfigRevision CR, rhnServerConfigChannel SCC, rhnConfigFileType CFT, - rhnChecksum Csum + rhnConfigRevision CR + LEFT JOIN rhnConfigContent CCon + ON CR.config_content_id = CCon.id + LEFT JOIN rhnChecksum Csum + ON CCon.checksum_id = Csum.id WHERE SCC.server_id = :sid AND SCC.config_channel_id = CF.config_channel_id AND CF.id = CR.config_file_id AND CF.config_file_name_id = CFN.id AND CF.config_channel_id = CC.id AND CC.confchan_type_id = CCT.id - AND CR.config_content_id = CCon.id (+) AND CF.latest_config_revision_id = CR.id AND CCT.label in ('normal', 'local_override') AND CR.config_file_type_id = CFT.id - AND CCon.checksum_id = Csum.id(+) ORDER BY CCT.priority, SCC.position </query> <elaborator params="sid" multiple="t"> @@ -152,13 +152,14 @@ ORDER BY UPPER(CFN.path) <query params="sid, aid"> SELECT CFN.path, CFF.name AS FAILURE_REASON - FROM rhnConfigFileFailure CFF, + FROM rhnConfigFileName CFN, rhnActionConfigFileName ACFN + LEFT JOIN rhnConfigFileFailure CFF + AND ACFN.failure_id = CFF.id WHERE ACFN.server_id = :sid AND ACFN.action_id = :aid AND ACFN.config_file_name_id = CFN.id - AND ACFN.failure_id = CFF.id (+) ORDER BY CFN.path </query> </mode>
commit baec14fac326204ab8f6b580add6b80f878dbfe1 Author: Michael Mraka michael.mraka@redhat.com Date: Thu Aug 11 12:02:32 2011 +0200
removed typo parenthesis
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml index 01244da..c928831 100644 --- a/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml +++ b/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml @@ -45,7 +45,7 @@ SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA, WHEN 3 THEN 'UNKNOWN' WHEN 4 THEN 'WARNING' WHEN 5 THEN 'CRITICAL' - END) ST + END as ST FROM rhn_probe_state PS, rhnServerGroupMembership SGM LEFT JOIN rhn_check_probe CP ON SGM.server_id = CP.host_id @@ -92,7 +92,7 @@ SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA, WHEN 3 THEN 'UNKNOWN' WHEN 4 THEN 'WARNING' WHEN 5 THEN 'CRITICAL' - END) ST + END as ST FROM rhn_probe_state PS, rhnServerGroupMembership SGM LEFT JOIN rhn_check_probe CP ON SGM.server_id = CP.host_id
spacewalk-commits@lists.fedorahosted.org