java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 24 ++++++----
1 file changed, 16 insertions(+), 8 deletions(-)
New commits:
commit ee9e14401e60bf794e74631eba3398cd5d4cb8da
Author: Stephen Herr <sherr(a)redhat.com>
Date: Wed Dec 5 15:23:00 2012 -0500
Revert "883546 - repodata inconsistency due to concurrent modification"
This reverts commit 165189729784f9134f5bd9d5090df2f9588eff54.
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index f75d967..fa1de80 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -606,11 +606,12 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<query params="channel_id">
SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version
FROM rhnPackageFile pkgf, rhnPackageCapability pkgcap,
- rhnChannelPackage chpkg
+ rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id =
chpkg.package_id
WHERE
chpkg.package_id = pkgf.package_id
AND pkgf.capability_id = pkgcap.id
AND chpkg.channel_id = :channel_id
+ AND prd.primary_xml is null
ORDER BY pkgf.package_id
</query>
</mode>
@@ -619,11 +620,12 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<query params="channel_id">
SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageProvides pkgp, rhnPackageCapability pkgcap,
- rhnChannelPackage chpkg
+ rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id =
chpkg.package_id
WHERE
chpkg.package_id = pkgp.package_id
AND pkgp.capability_id = pkgcap.id
AND chpkg.channel_id = :channel_id
+ AND prd.primary_xml is null
ORDER BY pkgp.package_id
</query>
</mode>
@@ -632,11 +634,12 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<query params="channel_id">
SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageRequires pkgp, rhnPackageCapability pkgcap,
- rhnChannelPackage chpkg
+ rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id =
chpkg.package_id
WHERE
chpkg.package_id = pkgp.package_id
AND pkgp.capability_id = pkgcap.id
AND chpkg.channel_id = :channel_id
+ AND prd.primary_xml is null
ORDER BY pkgp.package_id
</query>
</mode>
@@ -645,11 +648,12 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<query params="channel_id">
SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageConflicts pkgp, rhnPackageCapability pkgcap,
- rhnChannelPackage chpkg
+ rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id =
chpkg.package_id
WHERE
chpkg.package_id = pkgp.package_id
AND pkgp.capability_id = pkgcap.id
AND chpkg.channel_id = :channel_id
+ AND prd.primary_xml is null
ORDER BY pkgp.package_id
</query>
</mode>
@@ -658,11 +662,12 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<query params="channel_id">
SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageObsoletes pkgp, rhnPackageCapability pkgcap,
- rhnChannelPackage chpkg
+ rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id =
chpkg.package_id
WHERE
chpkg.package_id = pkgp.package_id
AND pkgp.capability_id = pkgcap.id
AND chpkg.channel_id = :channel_id
+ AND prd.primary_xml is null
ORDER BY pkgp.package_id
</query>
</mode>
@@ -671,11 +676,12 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<query params="channel_id">
SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageRecommends pkgp, rhnPackageCapability pkgcap,
- rhnChannelPackage chpkg
+ rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id =
chpkg.package_id
WHERE
chpkg.package_id = pkgp.package_id
AND pkgp.capability_id = pkgcap.id
AND chpkg.channel_id = :channel_id
+ AND prd.primary_xml is null
ORDER BY pkgp.package_id
</query>
</mode>
@@ -684,11 +690,12 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<query params="channel_id">
SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageSuggests pkgp, rhnPackageCapability pkgcap,
- rhnChannelPackage chpkg
+ rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id =
chpkg.package_id
WHERE
chpkg.package_id = pkgp.package_id
AND pkgp.capability_id = pkgcap.id
AND chpkg.channel_id = :channel_id
+ AND prd.primary_xml is null
ORDER BY pkgp.package_id
</query>
</mode>
@@ -697,11 +704,12 @@ where rhnChannelErrata.errata_id = rhnErrataPackage.errata_id
<query params="channel_id">
SELECT chpkg.package_id, pkgcap.id, pkgcap.name, pkgcap.version, pkgp.sense
FROM rhnPackageSupplements pkgp, rhnPackageCapability pkgcap,
- rhnChannelPackage chpkg
+ rhnChannelPackage chpkg left join rhnPackageRepodata prd ON prd.package_id =
chpkg.package_id
WHERE
chpkg.package_id = pkgp.package_id
AND pkgp.capability_id = pkgcap.id
AND chpkg.channel_id = :channel_id
+ AND prd.primary_xml is null
ORDER BY pkgp.package_id
</query>
</mode>