backend/server/action/solarispkgs.py | 31 +++++++--------
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 18 --------
web/modules/sniglets/Sniglets/ListView/SystemList.pm | 4 -
3 files changed, 15 insertions(+), 38 deletions(-)
New commits:
commit c76d0f61f057afe1845f1f30a518b6d0fca6a00a
Author: Pierre Casenove <pcasenove(a)gmail.com>
Date: Wed Jun 27 16:24:49 2012 +0000
Correct SQL query for installing and removing solaris patches
diff --git a/backend/server/action/solarispkgs.py b/backend/server/action/solarispkgs.py
index 1fca8ce..39610bd 100644
--- a/backend/server/action/solarispkgs.py
+++ b/backend/server/action/solarispkgs.py
@@ -57,14 +57,13 @@ _query_remove = rhnSQL.Statement("""
pe.version asversion,
pe.release as release,
pa.label as arch
- from rhnActionPackage ap,
- rhnPackageName pn,
+ from rhnPackageName pn,
rhnPackageEVR pe,
- rhnPackageArch pa
+ rhnActionPackage ap
+ left join rhnPackageArch pa on ap.package_arch_id = pa.id
where ap.action_id = :action_id
and ap.evr_id = pe.id
and ap.name_id = pn.id
- and ap.package_arch_id = pa.id (+)
""")
def install(server_id, action_id, dry_run=0):
commit 8badfd903e32de669796637d80ca4f2156d85f36
Author: Pierre Casenove <pcasenove(a)gmail.com>
Date: Wed Jun 27 11:56:42 2012 +0000
Correct query for PGSQL, addressing: SQL Error generated: ('syntax error at or
near "name" at character 41\n', 0, '\n select distinct\n pn.name name,\n
pe.epoch epoch,\n pe.version version,\n pe.release release,\n pa.label arch,\n c.label
channel_label,\n nvl2(c.parent_channel, 0, 1) is_parent_channel\n from rhnActionPackage
ap,\n rhnPackage p,\n rhnPackageName pn,\n rhnPackageEVR pe,\n rhnPackageArch pa,\n
rhnServerChannel sc,\n rhnChannelPackage cp,\n rhnChannel c\n where ap.action_id =
%(action_id)s\n and ap.evr_id = p.evr_id\n and ap.evr_id = pe.id\n and ap.name_id =
p.name_id\n and ap.name_id = pn.id\n and p.package_arch_id = pa.id\n and p.id =
cp.package_id\n and cp.channel_id = sc.channel_id\n and sc.server_id = %(server_id)s\n and
sc.channel_id = c.id\n')
diff --git a/backend/server/action/solarispkgs.py b/backend/server/action/solarispkgs.py
index 64cb9f5..1fca8ce 100644
--- a/backend/server/action/solarispkgs.py
+++ b/backend/server/action/solarispkgs.py
@@ -23,13 +23,13 @@ __rhnexport__ = ['install', 'remove',
'patchInstall', 'patchRemove',
_query_install = rhnSQL.Statement("""
select distinct
- pn.name name,
- pe.epoch epoch,
- pe.version version,
- pe.release release,
- pa.label arch,
- c.label channel_label,
- nvl2(c.parent_channel, 0, 1) is_parent_channel
+ pn.name as name,
+ pe.epoch as epoch,
+ pe.version as version,
+ pe.release as release,
+ pa.label as arch,
+ c.label as channel_label,
+ case when c.parent_channel is not null then 0 else 1 end is_parent_channel
from rhnActionPackage ap,
rhnPackage p,
rhnPackageName pn,
@@ -52,11 +52,11 @@ _query_install = rhnSQL.Statement("""
_query_remove = rhnSQL.Statement("""
select distinct
- pn.name name,
- pe.epoch epoch,
- pe.version version,
- pe.release release,
- pa.label arch
+ pn.name as name,
+ pe.epoch as epoch,
+ pe.version asversion,
+ pe.release as release,
+ pa.label as arch
from rhnActionPackage ap,
rhnPackageName pn,
rhnPackageEVR pe,
commit 2c57bd8a03843b920c791a9af3c02820eedb8057
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Jun 27 14:30:06 2012 +0200
removed unused query
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index 8f1e9c7..805589a 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -97,24 +97,6 @@ ORDER BY UPPER(coalesce(S.SERVER_NAME, '(none)')), S.ID
</mode>
-<mode name="users_systems_with_value_for_key">
- <query params="user_id, cikid">
-SELECT S.id,
- S.name AS SERVER_NAME,
- SCDV.value
- FROM rhnServer S,
- rhnServerCustomDataValue SCDV,
- rhnUserServerPerms USP
- WHERE USP.user_id = :user_id
- AND USP.server_id = SCDV.server_id
- AND SCDV.key_id = :cikid
- AND USP.server_id = S.id
-ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
- </query>
- <elaborator name="system_overview" />
-</mode>
-
-
<query name="ssm_package_upgrades_systems" params="user_id">
SELECT DISTINCT
S.id,
diff --git a/web/modules/sniglets/Sniglets/ListView/SystemList.pm
b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
index ed9fccb..ee6bd22 100644
--- a/web/modules/sniglets/Sniglets/ListView/SystemList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
@@ -66,10 +66,6 @@ sub _register_modes {
-datasource => RHN::DataSource::System->new,
-provider => \&provisioning_systems_in_set_cb);
- Sniglets::ListView::List->add_mode(-mode =>
"users_systems_with_value_for_key",
- -datasource => RHN::DataSource::System->new,
- -provider => \&custominfo_values_provider);
-
Sniglets::ListView::List->add_mode(-mode => "visible_to_user",
-datasource => RHN::DataSource::System->new);