6 commits - rel-eng/packages web/modules web/spacewalk-web.spec

Michael Mraka mmraka at fedoraproject.org
Wed Jun 27 12:22:49 UTC 2012


 rel-eng/packages/spacewalk-web                           |    2 
 web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml |   83 ---------------
 web/modules/sniglets/Sniglets/ListView/SystemList.pm     |   12 --
 web/spacewalk-web.spec                                   |    7 +
 4 files changed, 10 insertions(+), 94 deletions(-)

New commits:
commit 8f3c0c0e3a73b4b1852be63a9f65a89e5737c7d5
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Wed Jun 27 14:22:32 2012 +0200

    Automatic commit of package [spacewalk-web] release [1.8.24-1].

diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 3f26822..e6d454d 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.23-1 web/
+1.8.24-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 9559224..fba5110 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
 Summary: Spacewalk Web site - Perl modules
 Group: Applications/Internet
 License: GPLv2
-Version: 1.8.23
+Version: 1.8.24
 Release: 1%{?dist}
 URL:          https://fedorahosted.org/spacewalk/
 Source0:      https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,11 @@ rm -rf $RPM_BUILD_ROOT
 
 # $Id$
 %changelog
+* Wed Jun 27 2012 Michael Mraka <michael.mraka at redhat.com> 1.8.24-1
+- ORDER BY expressions must appear in select list
+- removed dead query
+- fixed ssm provisioning
+
 * Wed Jun 27 2012 Jan Pazdziora 1.8.23-1
 - The remove_virtualization_host_entitlement no longer used, removing.
 - The rhn:delete_server_cb and delete_server_cb no longer used, removing.


commit d79e646a5ef01ee75c8f4a5494693be015328aef
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Wed Jun 27 14:15:56 2012 +0200

    ORDER BY expressions must appear in select list
    
    fixing
    Execution of
    /var/www/html/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt
    failed at Wed Jun 27 08:05:22 2012: RHN::Exception: DBD::Pg::st execute
    failed: ERROR:  for SELECT DISTINCT, ORDER BY expressions must appear in
    select list\nLINE 26: ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID\n

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 022e523..8f1e9c7 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -29,6 +29,7 @@ ORDER BY UPPER(COALESCE(X.server_name, '(none)')), X.id
 
 <mode name="provisioning_systems_in_set_with_tag">
   <query params="user_id, tag_id">
+SELECT * FROM (
 SELECT DISTINCT S.id,
        S.name AS SERVER_NAME,
        SS.id AS SNAPSHOT_ID,
@@ -52,8 +53,8 @@ SELECT DISTINCT S.id,
    AND USP.server_id = SS.server_id
    AND SS.id = STag.snapshot_id
    AND STag.tag_id = :tag_id
-   AND USP.server_id = S.id
-ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
+   AND USP.server_id = S.id) X
+ORDER BY UPPER(COALESCE(X.SERVER_NAME, '(none)')), X.ID
   </query>
   <elaborator name="system_overview" />
 </mode>


commit 823c8a8bc72b89976d5cbad9e60c5cf63c68ed27
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Wed Jun 27 14:10:25 2012 +0200

    removed dead 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 0d6e22f..022e523 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -27,32 +27,6 @@ ORDER BY UPPER(COALESCE(X.server_name, '(none)')), X.id
   <elaborator name="entitlements"/>
 </mode>
 
-<mode name="provisioning_systems_in_ks_set">
-  <query params="user_id, kstid">
-SELECT DISTINCT S.id,
-       S.name AS SERVER_NAME
-  FROM rhnServer S,
-       rhnSet ST,
-       rhnUserServerPerms USP,
-       rhnKickstartableTree KST,
-       rhnChannel C
- WHERE USP.user_id = :user_id
-   AND ST.user_id = :user_id
-   AND ST.label = 'system_list'
-   AND USP.server_id = ST.element
-   AND EXISTS (SELECT 1 FROM rhnServerEntitlementView SEV WHERE SEV.server_id = ST.element AND SEV.label = 'provisioning_entitled')
-   AND USP.server_id = S.id
-   AND KST.id = :kstid
-   AND C.id = KST.channel_id
-   AND EXISTS (SELECT 1 FROM rhnServerChannelArchCompat 
-               WHERE server_arch_id = S.server_arch_id
-               AND C.channel_arch_id = channel_arch_id) 
-ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
-  </query>
-  <elaborator name="system_overview" />
-  <elaborator name="entitlements"/>
-</mode>
-
 <mode name="provisioning_systems_in_set_with_tag">
   <query params="user_id, tag_id">
 SELECT DISTINCT S.id,
diff --git a/web/modules/sniglets/Sniglets/ListView/SystemList.pm b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
index 74a6ca7..ed9fccb 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 => "provisioning_systems_in_ks_set",
-			   -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);


commit 719a2c75fdb8c31f16011a17aa9923a23abf6d63
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Wed Jun 27 14:10:25 2012 +0200

    removed dead 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 8799d29..0d6e22f 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -27,25 +27,6 @@ ORDER BY UPPER(COALESCE(X.server_name, '(none)')), X.id
   <elaborator name="entitlements"/>
 </mode>
 
-<mode name="provisioning_systems_in_set">
-  <query params="user_id">
-SELECT DISTINCT S.id,
-       S.name AS SERVER_NAME
-  FROM rhnServer S,
-       rhnSet ST,
-       rhnUserServerPerms USP
- WHERE USP.user_id = :user_id
-   AND ST.user_id = :user_id
-   AND ST.label = 'system_list'
-   AND USP.server_id = ST.element
-   AND EXISTS (SELECT 1 FROM rhnServerEntitlementView SEV WHERE SEV.server_id = ST.element AND SEV.label = 'provisioning_entitled')
-   AND USP.server_id = S.id
-ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
-  </query>
-  <elaborator name="system_overview" />
-  <elaborator name="entitlements"/>
-</mode>
-
 <mode name="provisioning_systems_in_ks_set">
   <query params="user_id, kstid">
 SELECT DISTINCT S.id,
diff --git a/web/modules/sniglets/Sniglets/ListView/SystemList.pm b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
index b1b4869..74a6ca7 100644
--- a/web/modules/sniglets/Sniglets/ListView/SystemList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
@@ -62,10 +62,6 @@ sub _register_modes {
 			   -datasource => RHN::DataSource::System->new,
                            -action_callback => \&ssm_remote_command_action_cb);
 
-  Sniglets::ListView::List->add_mode(-mode => "provisioning_systems_in_set_with_tag",
-			   -datasource => RHN::DataSource::System->new,
-			   -action_callback => \&ssm_rollback_by_tag_action_cb);
-
   Sniglets::ListView::List->add_mode(-mode => "provisioning_systems_in_set",
 			   -datasource => RHN::DataSource::System->new,
 			   -provider => \&provisioning_systems_in_set_cb);


commit f2affe4fee41b8d8ad2ba3d4ec260aaa0c6121c8
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Wed Jun 27 13:32:18 2012 +0200

    fixed ssm provisioning
    
    fixing
    [Wed Jun 27 07:20:34 2012] [error] Execution of
    /var/www/html/network/systems/ssm/provisioning/rollback_by_tag_conf.pxt
    failed at Wed Jun 27 07:20:34 2012: RHN::Exception: DBD::Pg::st execute
    failed: ERROR:  for SELECT DISTINCT, ORDER BY expressions must appear in
    select list\nLINE 26: ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID\n
    ^\n  RHN::DB /usr/share/perl5/vendor_perl/RHN/DB.pm 121
    RHN::Exception::DB::throw\n  RHN::DB::st
    /usr/share/perl5/vendor_perl/RHN/DB.pm 452 RHN::DB::handle_error\n
    RHN::DB::DataSource /usr/share/perl5/vendor_perl/RHN/DB/DataSource.pm 75
    RHN::DB::st::execute_h\n  RHN::DataSource
    /usr/share/perl5/vendor_perl/RHN/DataSource.pm 108
    RHN::DB::DataSource::run_query\n  Sniglets::ListView::List
    /usr/share/perl5/vendor_perl/Sniglets/ListView/List.pm 1211
    RHN::DataSource::execute_query\n  Sniglets::ListView::List
    /usr/share/perl5/vendor_perl/Sniglets/ListView/List.pm 908
    Sniglets::ListView::List::default_provider\n  Sniglets::Lists
    /usr/share/perl5/vendor_perl/Sniglets/Lists.pm 119
    Sniglets::ListView::List::render\n  PXT::Parser
    /usr/share/perl5/vendor_perl/PXT/Parser.pm 160
    Sniglets::Lists::listview\n  PXT::Parser
    /usr/share/perl5/vendor_perl/PXT/Parser.pm 72 PXT::Parser::expand_tag\n
    PXT::ApacheHandler /usr/share/perl5/vendor_perl/PXT/ApacheHandler.pm 489
    PXT::Parser::expand_tags\n  PXT::ApacheHandler
    /usr/share/perl5/vendor_perl/PXT/ApacheHandler.pm 103
    PXT::ApacheHandler::pxt_parse_data\n  PXT::ApacheHandler
    /usr/share/perl5/vendor_perl/PXT/ApacheHandler.pm 103 (eval)\n  main -e
    0 PXT::ApacheHandler::handler\n  main -e 0 (eval)

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 73e1c38..8799d29 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -98,7 +98,7 @@ SELECT DISTINCT S.id,
    AND SS.id = STag.snapshot_id
    AND STag.tag_id = :tag_id
    AND USP.server_id = S.id
-ORDER BY UPPER(NVL(S.NAME, '(none)')), S.ID
+ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
   </query>
   <elaborator name="system_overview" />
 </mode>


commit bd76ccc4656a280131121e755c45620355918908
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Wed Jun 27 11:17:36 2012 +0200

    removed unused query
    
    it's already ported to java as config_queries.xml:config_managed_systems
    and it's there since old cvs times (I was able to track it down to svn
    commit 48158 where it was imported from cvs to svn)
    moreover there's no config_managed_systems_cb()

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 ef75f53..73e1c38 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -1196,39 +1196,6 @@ ORDER BY UPPER(NVL(S.NAME, '(none)')), SCC.server_id
   <elaborator name="entitlements"/>
 </mode>
 
-<mode name="config_managed_systems">
-  <query name="available_to_user" />
-  <elaborator>
-SELECT S.id, 
-       NVL((SELECT SCC.config_channel_id
-              FROM rhnConfigChannelType CCT, rhnConfigChannel CC, rhnServerConfigChannel SCC
-             WHERE SCC.server_id = S.id
-               AND SCC.config_channel_id = CC.id
-               AND CC.confchan_type_id = CCT.id
-               AND CCT.label = 'local_override'), 0) CCID,
-       (SELECT COUNT(CF.id)
-          FROM rhnConfigFile CF, rhnConfigChannelType CCT, rhnConfigChannel CC, rhnServerConfigChannel SCC
-         WHERE SCC.server_id = S.id
-           AND SCC.config_channel_id = CC.id
-           AND CC.confchan_type_id = CCT.id
-           AND CF.config_channel_id = CC.id
-           AND CCT.label = 'local_override') LOCAL_FILE_COUNT,
-       NVL((SELECT COUNT(SCC.config_channel_id)
-              FROM rhnConfigChannelType CCT, rhnConfigChannel CC, rhnServerConfigChannel SCC
-             WHERE SCC.server_id = S.id
-               AND SCC.config_channel_id = CC.id
-               AND CC.confchan_type_id = CCT.id
-               AND CCT.label = 'normal'), 0) CONF_CHANNEL_COUNT,
-       NVL((SELECT 1
-              FROM rhnServerFeaturesView SFV
-             WHERE SFV.server_id = S.id
-               AND SFV.label = 'ftr_config'), 0) AS SELECTABLE
-  FROM rhnServer S
- WHERE S.id IN (%s)
-  </elaborator>
-  <elaborator name="entitlements"/>
-</mode>
-
 <mode name="config_systems_list">
   <query params="user_id">
       SELECT DISTINCT S.id, S.name AS system
diff --git a/web/modules/sniglets/Sniglets/ListView/SystemList.pm b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
index 958ee86..b1b4869 100644
--- a/web/modules/sniglets/Sniglets/ListView/SystemList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/SystemList.pm
@@ -221,10 +221,6 @@ sub _register_modes {
 			   -datasource => RHN::DataSource::System->new,
                            -action_callback => \&add_systems_to_namespace_cb);
 
-  Sniglets::ListView::List->add_mode(-mode => "config_managed_systems",
-				     -datasource => RHN::DataSource::System->new,
-				     -action_callback => \&Sniglets::ConfigManagement::config_managed_systems_cb);
-
   Sniglets::ListView::List->add_mode(-mode => "config_systems_list",
 				     -datasource => RHN::DataSource::System->new,
 				     -provider => \&config_systems_list);




More information about the spacewalk-commits mailing list