Changes to 'refs/tags/spacewalk-schema-1.7.54-1'
by Milan Zazrivec
Tag 'spacewalk-schema-1.7.54-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2012-03-01 17:20 +0000
Tagging package [spacewalk-schema] version [1.7.54-1] in directory [schema/spacewalk/].
Changes since spacewalk-web-1.7.26-1:
Milan Zazrivec (1):
Automatic commit of package [spacewalk-schema] release [1.7.54-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
12 years, 2 months
rel-eng/packages schema/spacewalk
by Milan Zazrivec
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4daed489babddbab93b12c1d8c88c923703a9fcc
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Mar 1 18:20:52 2012 +0100
Automatic commit of package [spacewalk-schema] release [1.7.54-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 3803463..faf3e27 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.7.53-1 schema/spacewalk/
+1.7.54-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 67fb9b8..2048ab5 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.7.53
+Version: 1.7.54
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu Mar 01 2012 Milan Zazrivec <mzazrivec(a)redhat.com> 1.7.54-1
+- use pg_dblink_exec to execute insert inside create_pxt_session
+
* Thu Mar 01 2012 Jan Pazdziora 1.7.53-1
- On Fedora 16, we need to CREATE EXTENSION dblink.
12 years, 2 months
Changes to 'refs/tags/spacewalk-web-1.7.26-1'
by Miroslav Suchý
Tag 'spacewalk-web-1.7.26-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-03-01 16:28 +0000
Tagging package [spacewalk-web] version [1.7.26-1] in directory [web/].
Changes since spacewalk-schema-1.7.53-1:
Milan Zazrivec (2):
use pg_dblink_exec to execute insert inside create_pxt_session
create_pxt_session: schema upgrade
Miroslav Suchý (2):
call plsql function or procedure correctly
Automatic commit of package [spacewalk-web] release [1.7.26-1].
---
rel-eng/packages/spacewalk-web | 2 -
schema/spacewalk/postgres/procs/create_pxt_session.sql | 8 ++--
schema/spacewalk/postgres/procs/procs.deps | 3 +
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/110-create_pxt_session.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/110-create_pxt_session.sql.postgresql | 18 ++++++++++
web/modules/rhn/RHN/DB/Server.pm | 10 ++---
web/spacewalk-web.spec | 5 ++
7 files changed, 36 insertions(+), 11 deletions(-)
---
12 years, 2 months
2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by Miroslav Suchý
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(a)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/%{name}-%{version}.tar.gz
@@ -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(a)redhat.com)
- call procedure compatible way (Pg) (msuchy(a)redhat.com)
commit 3d017eba87b1df09ecf32af7d8e5c5e53c1c1913
Author: Miroslav Suchý <msuchy(a)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);
}
}
12 years, 2 months
2 commits - schema/spacewalk
by Milan Zazrivec
schema/spacewalk/postgres/procs/create_pxt_session.sql | 8 ++--
schema/spacewalk/postgres/procs/procs.deps | 3 +
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/110-create_pxt_session.sql.oracle | 1
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/110-create_pxt_session.sql.postgresql | 18 ++++++++++
4 files changed, 26 insertions(+), 4 deletions(-)
New commits:
commit 69ae5de9b7e688fe5df8558e83c685042e5f7d73
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Mar 1 16:43:35 2012 +0100
create_pxt_session: schema upgrade
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/110-create_pxt_session.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/110-create_pxt_session.sql.oracle
new file mode 100644
index 0000000..b7b00b1
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/110-create_pxt_session.sql.oracle
@@ -0,0 +1 @@
+-- This file is intentionally left empty.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/110-create_pxt_session.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/110-create_pxt_session.sql.postgresql
new file mode 100644
index 0000000..b20b377
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/110-create_pxt_session.sql.postgresql
@@ -0,0 +1,18 @@
+-- oracle equivalent source sha1 b14267384bc104605623a41b755e68e0103b5aa8
+
+create or replace function
+create_pxt_session(p_web_user_id in numeric, p_expires in numeric, p_value in varchar)
+returns numeric as $$
+declare
+ l_id numeric;
+begin
+ l_id := nextval( 'pxt_id_seq' );
+
+ perform pg_dblink_exec(
+ 'insert into PXTSessions (id, value, expires, web_user_id) values (' ||
+ l_id || ', ' || ', ' || coalesce(quote_literal(p_value), 'NULL') ||
+ ', ' || ', ' || p_expires || ', ' || p_web_user_id || '); commit');
+
+ return l_id;
+end;
+$$ language plpgsql;
commit c6ee6f26b2214fa0f342553c8d989898d4c892d5
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Thu Mar 1 16:40:38 2012 +0100
use pg_dblink_exec to execute insert inside create_pxt_session
diff --git a/schema/spacewalk/postgres/procs/create_pxt_session.sql b/schema/spacewalk/postgres/procs/create_pxt_session.sql
index 1e24e4c..4239494 100644
--- a/schema/spacewalk/postgres/procs/create_pxt_session.sql
+++ b/schema/spacewalk/postgres/procs/create_pxt_session.sql
@@ -24,10 +24,12 @@ returns numeric as $$
declare
l_id numeric;
begin
- select nextval( 'pxt_id_seq' ) into l_id;
+ l_id := nextval( 'pxt_id_seq' );
- insert into PXTSessions (id, value, expires, web_user_id)
- values (l_id, p_value, p_expires, p_web_user_id);
+ perform pg_dblink_exec(
+ 'insert into PXTSessions (id, value, expires, web_user_id) values (' ||
+ l_id || ', ' || ', ' || coalesce(quote_literal(p_value), 'NULL') ||
+ ', ' || ', ' || p_expires || ', ' || p_web_user_id || '); commit');
return l_id;
end;
diff --git a/schema/spacewalk/postgres/procs/procs.deps b/schema/spacewalk/postgres/procs/procs.deps
index 06f303d..d9ca05d 100644
--- a/schema/spacewalk/postgres/procs/procs.deps
+++ b/schema/spacewalk/postgres/procs/procs.deps
@@ -22,7 +22,8 @@ create_new_org :: web_customer rhnUserGroupType rhnUserGroup
create_new_user :: web_contact web_user_contact_permission \
web_user_personal_info web_user_site_info \
rhnUserInfo
-create_pxt_session :: PXTSessions
+create_pxt_session :: pg_dblink_exec \
+ PXTSessions
delete_server :: rhn_channel.pks rhn_config.pks \
rhn_config.pks rhn_server.pks rhn_entitlements.pks \
rhn_server.pks \
12 years, 2 months
Changes to 'refs/tags/spacewalk-schema-1.7.53-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.7.53-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-03-01 15:35 +0000
Tagging package [spacewalk-schema] version [1.7.53-1] in directory [schema/spacewalk/].
Changes since spacewalk-1.7.2-1:
Jan Pazdziora (2):
On Fedora 16, we need to create extension dblink.
Automatic commit of package [spacewalk-schema] release [1.7.53-1].
---
rel-eng/packages/spacewalk-schema | 2 -
schema/spacewalk/postgres/start.sql.91 | 18 ++++++++++
schema/spacewalk/spacewalk-schema.spec | 8 +++-
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/109-dblink.sql.postgresql.91 | 4 ++
4 files changed, 30 insertions(+), 2 deletions(-)
---
12 years, 2 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c719663b513b7ee86251c76f102372a6b9ef6d6b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 1 16:35:45 2012 +0100
Automatic commit of package [spacewalk-schema] release [1.7.53-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index d3dc60c..3803463 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.7.52-1 schema/spacewalk/
+1.7.53-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index d705d1b..67fb9b8 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.7.52
+Version: 1.7.53
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu Mar 01 2012 Jan Pazdziora 1.7.53-1
+- On Fedora 16, we need to CREATE EXTENSION dblink.
+
* Thu Mar 01 2012 Jan Pazdziora 1.7.52-1
- Create the dblink* functions during schema upgrade as well.
- lookup_xccdf_profile: schema upgrade (mzazrivec(a)redhat.com)
12 years, 2 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/postgres/start.sql.91 | 18 ++++++++++
schema/spacewalk/spacewalk-schema.spec | 3 +
schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/109-dblink.sql.postgresql.91 | 4 ++
3 files changed, 25 insertions(+)
New commits:
commit 6b920c5c232e726ed62abe55fae9c4dc337dde72
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 1 15:48:55 2012 +0100
On Fedora 16, we need to create extension dblink.
diff --git a/schema/spacewalk/postgres/start.sql.91 b/schema/spacewalk/postgres/start.sql.91
new file mode 100644
index 0000000..3062fa2
--- /dev/null
+++ b/schema/spacewalk/postgres/start.sql.91
@@ -0,0 +1,18 @@
+-- oracle equivalent source sha1 604ef37f8a2e6483e9592bed94937378d2189dc6
+--
+-- Copyright (c) 2010--2012 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+--
+
+create extension dblink;
+
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 6b0387e..d705d1b 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -30,6 +30,9 @@ Oracle tablespace name conversions have NOT been applied.
%setup -q
%build
+%if 0%{?fedora} >= 16
+find . -name '*.91' | while read i ; do mv $i ${i%%.91} ; done
+%endif
make -f Makefile.schema SCHEMA=%{name} VERSION=%{version} RELEASE=%{release}
pod2man spacewalk-schema-upgrade spacewalk-schema-upgrade.1
pod2man spacewalk-sql spacewalk-sql.1
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/109-dblink.sql.postgresql.91 b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/109-dblink.sql.postgresql.91
new file mode 100644
index 0000000..10d4990
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.6-to-spacewalk-schema-1.7/109-dblink.sql.postgresql.91
@@ -0,0 +1,4 @@
+-- oracle equivalent source sha1 b14267384bc104605623a41b755e68e0103b5aa8
+
+create extension dblink;
+
12 years, 2 months
Changes to 'refs/tags/spacewalk-1.7.2-1'
by Jan Pazdziora
Tag 'spacewalk-1.7.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-03-01 14:24 +0000
Tagging package [spacewalk] version [1.7.2-1] in directory [spacewalk/package/].
Changes since spacewalk-java-1.7.50-1:
Jan Pazdziora (2):
The path is different on PostgreSQL 9.1/Fedora 16, luckily the postgresql-contrib package name is the same.
Automatic commit of package [spacewalk] release [1.7.2-1].
---
rel-eng/packages/spacewalk | 2 +-
spacewalk/package/spacewalk.spec | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
---
12 years, 2 months
2 commits - rel-eng/packages spacewalk/package
by Jan Pazdziora
rel-eng/packages/spacewalk | 2 +-
spacewalk/package/spacewalk.spec | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 274dfa50ec5afc2e27e4e36567b6ad41dc0e2357
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 1 15:24:58 2012 +0100
Automatic commit of package [spacewalk] release [1.7.2-1].
diff --git a/rel-eng/packages/spacewalk b/rel-eng/packages/spacewalk
index e8c94cb..197a0d1 100644
--- a/rel-eng/packages/spacewalk
+++ b/rel-eng/packages/spacewalk
@@ -1 +1 @@
-1.7.1-1 spacewalk/package/
+1.7.2-1 spacewalk/package/
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index 899d7d8..c2feedd 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -1,7 +1,7 @@
%define release_name Smile
Name: spacewalk
-Version: 1.7.1
+Version: 1.7.2
Release: 1%{?dist}
Summary: Spacewalk Systems Management Application
URL: https://fedorahosted.org/spacewalk
@@ -174,6 +174,10 @@ rm -rf %{buildroot}
%{_datadir}/spacewalk/setup/defaults.d/postgresql-backend.conf
%changelog
+* Thu Mar 01 2012 Jan Pazdziora 1.7.2-1
+- The path is different on PostgreSQL 9.1/Fedora 16, luckily the postgresql-
+ contrib package name is the same.
+
* Wed Feb 29 2012 Jan Pazdziora 1.7.1-1
- Creating the dblink function(s) upon schema population, in schema public.
commit 9576956b8f38e40580f302f5040af01ba062b06c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 1 14:29:28 2012 +0100
The path is different on PostgreSQL 9.1/Fedora 16, luckily the postgresql-contrib package name is the same.
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index 4eb31af..899d7d8 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -132,7 +132,7 @@ Requires: spacewalk-java-postgresql
Requires: perl(DBD::Pg)
Requires: spacewalk-backend-sql-postgresql
Requires: /usr/bin/psql
-Requires: /usr/share/pgsql/contrib/dblink.sql
+Requires: postgresql-contrib
%description postgresql
Spacewalk is a systems management application that will
12 years, 2 months