schema/spacewalk/oracle/end.sql | 2 ++
schema/spacewalk/postgres/end.sql | 2 +-
schema/spacewalk/spacewalk-schema-upgrade | 27 +++++++++------------------
schema/spacewalk/spacewalk-schema.spec | 2 ++
4 files changed, 14 insertions(+), 19 deletions(-)
New commits:
commit 919fceb82aa3251be190e7f686b0c3f2da1a90f8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Jan 21 11:23:34 2011 +0100
Moving database-specific "end" parts off spacewalk-schema-upgrade script,
reusing end.sql.
diff --git a/schema/spacewalk/oracle/end.sql b/schema/spacewalk/oracle/end.sql
index 6f03fb5..4509747 100644
--- a/schema/spacewalk/oracle/end.sql
+++ b/schema/spacewalk/oracle/end.sql
@@ -15,6 +15,8 @@
COMMIT;
+exec dbms_utility.compile_schema(user);
+
-- check whether all objects are valid
declare
invalid_objects number;
diff --git a/schema/spacewalk/postgres/end.sql b/schema/spacewalk/postgres/end.sql
index ded9953..6370a73 100644
--- a/schema/spacewalk/postgres/end.sql
+++ b/schema/spacewalk/postgres/end.sql
@@ -1,4 +1,4 @@
--- oracle equivalent source sha1 14209d5b6d662eb00d6a7042f32f68c8677ff9c9
+-- oracle equivalent source sha1 add00c99b59028f5056a3dac6f14c7112ce6d504
--
-- Copyright (c) 2010 Red Hat, Inc.
--
diff --git a/schema/spacewalk/spacewalk-schema-upgrade
b/schema/spacewalk/spacewalk-schema-upgrade
index 9102c35..d55b58b 100755
--- a/schema/spacewalk/spacewalk-schema-upgrade
+++ b/schema/spacewalk/spacewalk-schema-upgrade
@@ -196,25 +196,16 @@ EOF
$start = $t;
}
-$in .= <<EOF;
-
-exec dbms_utility.compile_schema(user);
-
--- check whether all objects are valid
-declare
- invalid_objects number;
-begin
- select count(*)
- into invalid_objects
- from user_objects
- where status <> 'VALID' and
- (object_name, object_type) not in (select object_name, type from recyclebin);
- if invalid_objects > 0 then
- RAISE_APPLICATION_ERROR(-20001, 'SCHEMA UPGRADE ENDS WITH INVALD OBJECTS');
- end if;
-end;
-/
+my $endfile = "/etc/sysconfig/rhn/$options{db_backend}/upgrade-end.sql";
+local * END;
+open END, '<', $endfile or die "Error reading [$endfile]: $!\n";
+{
+local $/ = undef;
+$in .= join '', <END>;
+}
+close END;
+$in .= <<EOF;
insert into rhnVersionInfo
( label, name_id, evr_id, created, modified )
values ('schema', lookup_package_name('$my_schema_name'),
diff --git a/schema/spacewalk/spacewalk-schema.spec
b/schema/spacewalk/spacewalk-schema.spec
index fa37e4d..459777f 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -41,6 +41,8 @@ install -m 0755 -d $RPM_BUILD_ROOT%{oracle}
install -m 0755 -d $RPM_BUILD_ROOT%{postgres}
install -m 0644 oracle/main.sql $RPM_BUILD_ROOT%{oracle}
install -m 0644 postgres/main.sql $RPM_BUILD_ROOT%{postgres}
+install -m 0644 oracle/end.sql $RPM_BUILD_ROOT%{oracle}/upgrade-end.sql
+install -m 0644 postgres/end.sql $RPM_BUILD_ROOT%{postgres}/upgrade-end.sql
install -m 0755 -d $RPM_BUILD_ROOT%{_bindir}
install -m 0755 %{name}-upgrade $RPM_BUILD_ROOT%{_bindir}
install -m 0755 spacewalk-sql $RPM_BUILD_ROOT%{_bindir}
Show replies by date