backend/server/action/packages.py | 77 ++++++++++++++++++-------------------
backend/spacewalk-backend.spec | 5 +-
rel-eng/packages/spacewalk-backend | 2
3 files changed, 44 insertions(+), 40 deletions(-)
New commits:
commit e27de35ffa38289c6e29c548beaba23db1937a34
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jan 21 17:33:21 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.3.46-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 61cf69c..4ddcbce 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.3.45
+Version: 1.3.46
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -684,6 +684,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Jan 21 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.3.46-1
+- 671466 - use ansi syntax in left join
+
* Thu Jan 20 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.45-1
- updating Copyright years for year 2011 (tlestach(a)redhat.com)
- update .po and .pot files for spacewalk-backend (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index fd7268f..04cba72 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.3.45-1 backend/
+1.3.46-1 backend/
commit 7721a8e21f945922daa07a11367bb5e44efa6c0e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jan 21 17:20:57 2011 +0100
671466 - use ansi syntax in left join
This is to make the query digestible for PostgreSQL
diff --git a/backend/server/action/packages.py b/backend/server/action/packages.py
index b32f4b2..bd3b28f 100644
--- a/backend/server/action/packages.py
+++ b/backend/server/action/packages.py
@@ -142,17 +142,18 @@ def runTransaction(server_id, action_id, dry_run=0):
# Fetch packages
h = rhnSQL.prepare("""
- select tro.label operation, pn.name, pe.version, pe.release, pe.epoch,
- pa.label package_arch
- from rhnPackageDeltaElement pde, rhnTransactionPackage rp,
- rhnTransactionOperation tro, rhnPackageName pn, rhnPackageEVR pe,
- rhnPackageArch pa
+ select tro.label as operation, pn.name, pe.version, pe.release, pe.epoch,
+ pa.label as package_arch
+ from rhnPackageDeltaElement pde,
+ rhnTransactionPackage rp
+ left join rhnPackageArch pa
+ on rp.package_arch_id = pa.id,
+ rhnTransactionOperation tro, rhnPackageName pn, rhnPackageEVR pe,
where pde.package_delta_id = :package_delta_id
and pde.transaction_package_id = rp.id
and rp.operation = tro.id
and rp.name_id = pn.id
and rp.evr_id = pe.id
- and rp.package_arch_id = pa.id (+)
order by tro.label, pn.name
""")
h.execute(package_delta_id=package_delta_id)
@@ -194,16 +195,17 @@ def runTransaction(server_id, action_id, dry_run=0):
# SQL statements -- used by update()
_packageStatement_update = """
select distinct
- pn.name name,
- pe.epoch epoch,
- pe.version version,
- pe.release release,
- pa.label arch
- from rhnActionPackage ap,
+ pn.name as name,
+ pe.epoch as epoch,
+ pe.version as version,
+ pe.release as release,
+ pa.label as arch
+ from rhnActionPackage ap
+left join rhnPackageArch pa
+ on ap.package_arch_id = pa.id,
rhnPackage p,
rhnPackageName pn,
rhnPackageEVR pe,
- rhnPackageArch pa,
rhnServerChannel sc,
rhnChannelPackage cp
where ap.action_id = :actionid
@@ -212,67 +214,66 @@ _packageStatement_update = """
and ap.evr_id = pe.id
and ap.name_id = p.name_id
and ap.name_id = pn.id
- and ap.package_arch_id = pa.id(+)
and p.id = cp.package_id
and cp.channel_id = sc.channel_id
and sc.server_id = :serverid
union
select distinct
- pn.name name,
- null version,
- null release,
- null epoch,
- pa.label arch
- from rhnActionPackage ap,
+ pn.name as name,
+ null as version,
+ null as release,
+ null as epoch,
+ pa.label as arch
+ from rhnActionPackage ap
+left join rhnPackageArch pa
+ on ap.package_arch_id = pa.id,
rhnPackage p,
rhnPackageName pn,
- rhnPackageArch pa,
rhnServerChannel sc,
rhnChannelPackage cp
where ap.action_id = :actionid
and ap.evr_id is null
and ap.name_id = p.name_id
and p.name_id = pn.id
- and ap.package_arch_id = pa.id(+)
and p.id = cp.package_id
and cp.channel_id = sc.channel_id
and sc.server_id = :serverid"""
_packageStatement_remove = """
select distinct
- pn.name name,
- pe.epoch epoch,
- pe.version version,
- pe.release release,
- pa.label arch
- from rhnActionPackage ap,
+ pn.name as name,
+ pe.epoch as epoch,
+ pe.version as version,
+ pe.release as release,
+ pa.label as arch
+ from rhnActionPackage ap
+left join rhnPackageArch pa
+ on ap.package_arch_id = pa.id,
rhnPackageName pn,
rhnPackageEVR pe,
- rhnPackageArch pa,
rhnServerPackage sp
where ap.action_id = :actionid
and ap.evr_id is not null
and ap.evr_id = pe.id
and ap.name_id = pn.id
- and ap.package_arch_id = pa.id(+)
and sp.server_id = :serverid
and sp.name_id = ap.name_id
and sp.evr_id = ap.evr_id
and (sp.package_arch_id = ap.package_arch_id or sp.package_arch_id is null)
union
select distinct
- pn.name name,
- null version,
- null release,
- null epoch,
- pa.label arch
- from rhnActionPackage ap,
+ pn.name as name,
+ null as version,
+ null as release,
+ null as epoch,
+ pa.label as arch
+ from rhnActionPackage ap
+left join rhnPackageArch pa
+ on ap.package_arch_id = pa.id,
rhnPackageName pn,
- rhnPackageArch pa,
rhnServerPackage sp
where ap.action_id = :actionid
and ap.evr_id is null
- and ap.package_arch_id = pa.id(+)
and sp.server_id = :serverid
and (sp.package_arch_id = ap.package_arch_id or sp.package_arch_id is
null)"""