rel-eng/packages/spacewalk-web | 2
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 48 ++++------
web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml | 14 +-
web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml | 11 +-
web/spacewalk-web.spec | 6 +
5 files changed, 40 insertions(+), 41 deletions(-)
New commits:
commit 60994af4c821536336af372f1f41afd7d658bd86
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 29 11:45:32 2011 +0200
Automatic commit of package [spacewalk-web] release [1.6.5-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index a81b1ff..174a173 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.4-1 web/
+1.6.5-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index c15edef..39740bd 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.6.4
+Version: 1.6.5
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Jul 29 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.5-1
+- 724963 - use ANSI joins
+- 724963 - use LEFT JOIN instead of MINUS
+
* Wed Jul 27 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.4-1
- fixed ORA-00904 in remote commands
commit 95b35c52805616f5710dcf9dbc53d5d511edf02c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 29 11:20:16 2011 +0200
724963 - use ANSI joins
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 ccc9e3a..3f6de21 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
@@ -95,14 +95,15 @@ ORDER BY UPPER(GROUP_NAME), GO.GROUP_ID
SG.name AS GROUP_NAME,
SGT.label AS GROUP_TYPE_LABEL,
(SELECT 1 FROM rhnUserServerGroupPerms WHERE user_id = :user_id AND server_group_id =
SG.id) AS USER_PERMITTED_ACCESS
- FROM rhnServerGroupType SGT,
+ FROM
rhnServerGroup SG,
- rhnVisServerGroupMembership VSGM,
+ rhnVisServerGroupMembership VSGM
+ LEFT JOIN rhnServerGroupType SGT
+ ON VSGM.group_type = SGT.id,
rhnUserServerGroupPerms USGP
WHERE VSGM.org_id = :org_id
AND VSGM.server_id = :sid
AND VSGM.group_id = SG.id
- AND VSGM.group_type = SGT.id (+)
AND USGP.user_id = :user_id
AND USGP.server_group_id = SG.id
ORDER BY UPPER(SG.name)
commit 2bed66e27af71e46beebe994fce79920166f1607
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 29 11:20:16 2011 +0200
724963 - use ANSI joins
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 5e0e92c..ccc9e3a 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
@@ -14,15 +14,16 @@ SELECT SG.id,
SG.name AS GROUP_NAME,
SGT.label AS GROUP_TYPE_LABEL,
(SELECT 1 FROM rhnUserServerGroupPerms WHERE user_id = :user_id AND
server_group_id = SG.id) AS USER_PERMITTED_ACCESS
- FROM rhnServerGroupType SGT,
- rhnServerGroup SG,
+ FROM
+ rhnServerGroup SG
+ LEFT JOIN rhnServerGroupType SGT
+ ON SG.group_type = SGT.id,
rhnSnapshotServerGroup SSG,
rhnSnapshot SN
WHERE SN.id = :ss_id
AND SN.server_id = :sid
AND SN.id = SSG.snapshot_id
AND SSG.server_group_id = SG.id
- AND SG.group_type = SGT.id (+)
</query>
</mode>
commit c0c583f116e22417bdf4ab0e64463ac4203064b3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 29 11:20:16 2011 +0200
724963 - use ANSI 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 4c65568..2f412cb 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
@@ -82,18 +82,19 @@ SELECT DISTINCT
CCon.delim_end,
CF.config_channel_id,
TO_CHAR(coalesce(CCon.created, CF.created), 'YYYY-MM-DD HH24:MI:SS') AS
CREATED
- FROM rhnConfigContent CCon,
+ FROM
rhnConfigFileName CFN,
rhnConfigFile CF,
- rhnConfigRevision CR,
rhnSnapshotConfigRevision SCR,
- rhnChecksumView Csum
+ rhnConfigRevision CR
+ LEFT JOIN rhnConfigContent CCon
+ ON CR.config_content_id = CCon.id
+ LEFT JOIN rhnChecksumView Csum
+ ON CCon.checksum_id = Csum.id
WHERE SCR.snapshot_id = :ss_id
AND SCR.config_revision_id = CR.id
- AND CR.config_content_id = CCon.id (+)
AND CR.config_file_id = CF.id
AND CF.config_file_name_id = CFN.id
- AND CCon.checksum_id = Csum.id (+)
ORDER BY CFN.path
</query>
</mode>
commit cdc961ae76a68266fdc7b197a099e63a0f736e41
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jul 29 11:13:17 2011 +0200
724963 - use LEFT JOIN instead of MINUS
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 17d4adb..680ae18 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
@@ -34,44 +34,36 @@ SELECT PN.id AS NAME_ID,
PE.epoch AS EPOCH,
PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS NVRE,
UPPER(PN.name || '-' || evr_t_as_vre_simple(PE.evr)) AS U_NVRE
- FROM rhnPackageName PN,
- rhnPackageEVR PE,
- rhnPackageNEVRA PNEVRA,
- rhnSnapshotPackage SP,
- rhnSnapshot S
+ FROM rhnSnapshot S
+ JOIN rhnSnapshotPackage SP
+ ON S.id = SP.snapshot_id
+ JOIN rhnPackageNEVRA PNEVRA
+ ON SP.nevra_id = PNEVRA.id
+ JOIN rhnPackageName PN
+ ON PNEVRA.name_id = PN.id
+ JOIN rhnPackageEVR PE
+ ON PNEVRA.evr_id = PE.id
+ LEFT JOIN (SELECT p.id, p.name_id, p.evr_id
+ FROM rhnPackage P,
+ rhnChannelPackage CP,
+ rhnSnapshotChannel SC
+ WHERE SC.snapshot_id = :ss_id
+ AND SC.channel_id = CP.channel_id
+ AND CP.package_id = P.id
+ ) SCP
+ ON SCP.name_id = PN.id
+ AND SCP.evr_id = PE.id
WHERE S.id = :ss_id
AND S.server_id = :sid
- AND S.id = SP.snapshot_id
- AND SP.nevra_id = PNEVRA.id
- AND PNEVRA.name_id = PN.id
AND NOT EXISTS (SELECT 1 FROM rhnPackageSyncBlacklist PSB WHERE
PSB.package_name_id = PN.id AND org_id is NULL OR org_id = :org_id)
- AND PNEVRA.evr_id = PE.id
AND NOT EXISTS (
SELECT 1 FROM rhnServerPackage SP
WHERE SP.server_id = :sid
AND SP.name_id = PN.id
AND SP.evr_id = PE.id
)
-MINUS
-SELECT PN.id AS NAME_ID,
- PE.id AS EVR_ID,
- PN.name AS NAME,
- PE.version AS VERSION,
- PE.release AS RELEASE,
- PE.epoch AS EPOCH,
- PN.name || '-' || evr_t_as_vre_simple(PE.evr) AS NVRE,
- UPPER(PN.name || '-' || evr_t_as_vre_simple(PE.evr)) AS U_NVRE
- FROM rhnPackageName PN,
- rhnPackageEVR PE,
- rhnPackage P,
- rhnChannelPackage CP,
- rhnSnapshotChannel SC
- WHERE SC.snapshot_id = :ss_id
- AND SC.channel_id = CP.channel_id
- AND CP.package_id = P.id
- AND P.name_id = PN.id
- AND P.evr_id = PE.id
+ AND SCP.id IS NULL
ORDER BY 8
</query>
</mode>