backend/satellite_tools/updatePackages.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 519838a74efa4f13b34f5e420ad390886678d1d6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 12 15:38:52 2012 +0200
prostgresql don't know about decode
fixing
ERROR: function decode(unknown, unknown, text, unknown) does not exist
diff --git a/backend/satellite_tools/updatePackages.py
b/backend/satellite_tools/updatePackages.py
index ea0b28e..0c0ebee 100644
--- a/backend/satellite_tools/updatePackages.py
+++ b/backend/satellite_tools/updatePackages.py
@@ -101,10 +101,13 @@ _get_path_query = """
rhnChecksumView.checksum,
rhnPackage.path,
rhnPackageEvr.epoch,
- decode(rhnPackage.org_id, null, 'NULL', rhnPackage.org_id) || '/' ||
substr(rhnChecksumView.checksum, 1, 3)
+ case when rhnPackage.org_id is null then 'NULL'
+ else rhnPackage.org_id || '' end
+ || '/' || substr(rhnChecksumView.checksum, 1, 3)
|| '/' || rhnPackageName.name
- || '/' || decode(rhnPackageEvr.epoch, null, '', rhnPackageEvr.epoch ||
':')
- || rhnPackageEvr.version || '-' || rhnPackageEvr.release
+ || '/' || case when rhnPackageEvr.epoch is null then ''
+ else rhnPackageEvr.epoch || ':' end
+ || rhnPackageEvr.version || '-' || rhnPackageEvr.release
|| '/' || rhnPackageArch.label
|| '/' || rhnChecksumView.checksum
|| substr(rhnPackage.path, instr(rhnPackage.path, '/', -1))
commit 63cad5aee9da45d54762d9619fdfbff2f197b727
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Jul 12 15:35:32 2012 +0200
fixed ERROR: subquery in FROM must have an alias
fixing
spacewalk.server.rhnSQL.sql_base.SQLStatementPrepareError: ('subquery
in FROM must have an alias at character 67\nHINT: For example, FROM
(SELECT ...) [AS] foo.\n', 0, "\n\tselect id, checksum_type, checksum,
diff --git a/backend/satellite_tools/updatePackages.py
b/backend/satellite_tools/updatePackages.py
index 5c87244..ea0b28e 100644
--- a/backend/satellite_tools/updatePackages.py
+++ b/backend/satellite_tools/updatePackages.py
@@ -114,7 +114,7 @@ _get_path_query = """
and rhnPackage.evr_id = rhnPackageEvr.id
and rhnPackage.package_arch_id = rhnPackageArch.id
and rhnPackage.checksum_id = rhnChecksumView.id
- )
+ ) X
where '/' || new_path <> nvl(substr(path, -length(new_path) - 1),
'x')
"""