rel-eng/packages/spacewalk-web | 2 +- web/modules/rhn/RHN/DB/Server.pm | 10 +++++----- web/spacewalk-web.spec | 5 ++++- 3 files changed, 10 insertions(+), 7 deletions(-)
New commits: commit 9866d46cb8fe9ad306eca26404dac2ee10b8065a Author: Miroslav Suchý msuchy@redhat.com Date: Thu Mar 1 17:28:55 2012 +0100
Automatic commit of package [spacewalk-web] release [1.7.26-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index c4e1975..fa189fb 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -1.7.25-1 web/ +1.7.26-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index ab9847a..b366901 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.7.25 +Version: 1.7.26 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%%7Bname%7D-%%7Bversion%7D.t... @@ -254,6 +254,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$ %changelog +* Thu Mar 01 2012 Miroslav Suchý 1.7.26-1 +- call plsql function or procedure correctly + * Mon Feb 27 2012 Jan Pazdziora 1.7.25-1 - call composite type correctly on Pg (msuchy@redhat.com) - call procedure compatible way (Pg) (msuchy@redhat.com)
commit 3d017eba87b1df09ecf32af7d8e5c5e53c1c1913 Author: Miroslav Suchý msuchy@redhat.com Date: Thu Mar 1 17:28:06 2012 +0100
call plsql function or procedure correctly
function or procedure? postgresql does not matter. but Oracle does due returning value
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm index 599ef52..77f0101 100644 --- a/web/modules/rhn/RHN/DB/Server.pm +++ b/web/modules/rhn/RHN/DB/Server.pm @@ -598,7 +598,7 @@ sub delete_server { my $sth;
eval { - $dbh->call_procedure('delete_server', $self->id); + $dbh->call_function('delete_server', $self->id); $dbh->commit; };
@@ -1452,7 +1452,7 @@ sub can_entitle_server { my $can = 0;
eval { - $can = $dbh->call_function('rhn_entitlements.can_entitle_server', $sid, $entitlement); + $can = $dbh->call_procedure('rhn_entitlements.can_entitle_server', $sid, $entitlement); };
if ($@) { @@ -1482,7 +1482,7 @@ sub entitle_server { }
my $dbh = RHN::DB->connect; - $dbh->call_function('rhn_entitlements.entitle_server', $sid, $label); + $dbh->call_procedure('rhn_entitlements.entitle_server', $sid, $label);
return; } @@ -1695,7 +1695,7 @@ sub add_servers_to_groups {
for my $server (@servers) { for my $group (@groups) { - $dbh->call_procedure('rhn_server.insert_into_servergroup_maybe', $server, $group); + $dbh->call_function('rhn_server.insert_into_servergroup_maybe', $server, $group); } }
@@ -1727,7 +1727,7 @@ sub remove_servers_from_groups {
for my $server (@servers) { for my $group (@groups) { - $dbh->call_procedure('rhn_server.delete_from_servergroup', $server, $group); + $dbh->call_function('rhn_server.delete_from_servergroup', $server, $group); } }