[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: modify version update for recent oracle changes #1358

git at icinga.org git at icinga.org
Tue Mar 29 11:10:07 CEST 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Mar 29 11:03:57 2011 +0200

modify version update for recent oracle changes #1358

refs #1358

---

 module/idoutils/db/mysql/mysql.sql   |    2 +-
 module/idoutils/db/oracle/oracle.sql |    3 +++
 module/idoutils/db/pgsql/pgsql.sql   |    2 +-
 update-version                       |    4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/module/idoutils/db/mysql/mysql.sql b/module/idoutils/db/mysql/mysql.sql
index 95de370..4cd9e19 100644
--- a/module/idoutils/db/mysql/mysql.sql
+++ b/module/idoutils/db/mysql/mysql.sql
@@ -1555,6 +1555,6 @@ CREATE INDEX statehist_i_id_o_id_s_ty_s_ti on icinga_statehistory(instance_id, o
 -- -----------------------------------------
 -- set dbversion
 -- -----------------------------------------
-INSERT INTO icinga_dbversion (name, version) VALUES ('idoutils', '1.3.0') ON DUPLICATE KEY UPDATE version='1.3.0';
+INSERT INTO icinga_dbversion (name, version) VALUES ('idoutils', '1.4.0') ON DUPLICATE KEY UPDATE version='1.4.0';
 
 
diff --git a/module/idoutils/db/oracle/oracle.sql b/module/idoutils/db/oracle/oracle.sql
index f80208d..8a45563 100755
--- a/module/idoutils/db/oracle/oracle.sql
+++ b/module/idoutils/db/oracle/oracle.sql
@@ -20,6 +20,9 @@
 --
 -- -- --------------------------------------------------------
 */
+
+DEFINE ICINGA_VERSION=1.4.0
+
 -- -----------------------------------------
 -- set defines
 -- EDIT THIS !
diff --git a/module/idoutils/db/pgsql/pgsql.sql b/module/idoutils/db/pgsql/pgsql.sql
index 286279b..9ec98a6 100644
--- a/module/idoutils/db/pgsql/pgsql.sql
+++ b/module/idoutils/db/pgsql/pgsql.sql
@@ -1588,5 +1588,5 @@ CREATE INDEX statehist_i_id_o_id_s_ty_s_ti on icinga_statehistory(instance_id, o
 -- set dbversion
 -- -----------------------------------------
 
-SELECT updatedbversion('1.3.0');
+SELECT updatedbversion('1.4.0');
 
diff --git a/update-version b/update-version
index 0b1278a..93a7a25 100755
--- a/update-version
+++ b/update-version
@@ -97,11 +97,11 @@ perl -i -p -e "s/LOG2IDO_DATE \".*\"/LOG2IDO_DATE \"$SHORTDATE\"/;" module/idout
 # Update dbversion in IDOUtils
 # mysql INSERT INTO icinga_dbversion (name, version) VALUES ('idoutils', '1.3.0') ON DUPLICATE KEY UPDATE version='1.3.0';
 # pgsql SELECT updatedbversion('1.3.0');
-# oracle INSERT INTO dbversion (id, name, version) VALUES ('1', 'idoutils', '1.3.0');
+# oracle DEFINE ICINGA_VERSION=1.3.0
 
 perl -i -p -e "s/VALUES \(\'idoutils\', \'.*\'\)/VALUES \(\'idoutils\', \'$newversion\'\)/;" module/idoutils/db/mysql/mysql.sql
 perl -i -p -e "s/version=\'.*\'/version=\'$newversion\'/;" module/idoutils/db/mysql/mysql.sql
 perl -i -p -e "s/updatedbversion\(\'.*\'\)/updatedbversion\(\'$newversion\'\)/;" module/idoutils/db/pgsql/pgsql.sql
-perl -i -p -e "s/VALUES \(\'1\', \'idoutils\', \'.*\'\)/VALUES \(\'1\', \'idoutils\', \'$newversion\'\)/;" module/idoutils/db/oracle/oracle.sql
+perl -i -p -e "s/ICINGA_VERSION=.*/ICINGA_VERSION=$newversion/;" module/idoutils/db/oracle/oracle.sql
 
 





More information about the icinga-checkins mailing list