[icinga-checkins] icinga.org: icinga-core/mfriedrich/ido: idoutils: fix typo in oracle upgrade script, add using previous tbs defines

git at icinga.org git at icinga.org
Sat Feb 18 11:30:31 CET 2012


Module: icinga-core
Branch: mfriedrich/ido
Commit: bf01139381a0fcdeb84cc7ee70871471d84f7f89
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=bf01139381a0fcdeb84cc7ee70871471d84f7f89

Author: Thomas Dressler <tdressler at tdressler.net>
Date:   Fri Feb  3 20:04:41 2012 +0100

idoutils: fix typo in oracle upgrade script, add using previous tbs defines

---

 .../db/oracle/upgrade/oracle-upgrade-1.7.0.sql     |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/module/idoutils/db/oracle/upgrade/oracle-upgrade-1.7.0.sql b/module/idoutils/db/oracle/upgrade/oracle-upgrade-1.7.0.sql
index 7879615..2fdde58 100644
--- a/module/idoutils/db/oracle/upgrade/oracle-upgrade-1.7.0.sql
+++ b/module/idoutils/db/oracle/upgrade/oracle-upgrade-1.7.0.sql
@@ -1,8 +1,8 @@
 -- -----------------------------------------
 -- upgrade path for Icinga IDOUtils 1.7.0
 --
--- run it as icinga database user whithin  current directory
--- sqlplus icinga@<instance> @ oracle-upgrade.1-6.0.sql
+-- run it as icinga database user from directory of this file
+-- sqlplus icinga@<instance> @ oracle-upgrade.1-7.0.sql
 -- -----------------------------------------
 -- Copyright (c) 2010-2011 Icinga Development Team (http://www.icinga.org)
 --
@@ -26,6 +26,9 @@ define DATATBS='ICINGA_DATA1';
 define LOBTBS='ICINGA_LOB1';
 define IDXTBS='ICINGA_IDX1';
 
+/* load defines from file, if any */
+ at ../icinga_defines.sql
+
 /* script will be terminated on the first error */
 whenever sqlerror exit failure
 spool oracle-upgrade-&&ICINGA_VERSION..log
@@ -33,7 +36,7 @@ spool oracle-upgrade-&&ICINGA_VERSION..log
 -- -----------------------------------------
 -- index for BP Addon #2274
 -- -----------------------------------------
-create index statehistory_state_idx on statehistory(objectid,state)
+create index statehistory_state_idx on statehistory(object_id,state)
 tablespace &IDXTBS;
 
 -- -----------------------------------------





More information about the icinga-checkins mailing list