[icinga-checkins] icinga.org: icinga-core/test/cgis: mark git master schema to -dev too #1711

git at icinga.org git at icinga.org
Sat Jul 16 00:20:00 CEST 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Mon Jul 11 21:16:22 2011 +0200

mark git master schema to -dev too #1711

refs #1711

---

 module/idoutils/db/mysql/mysql.sql      |    2 +-
 module/idoutils/db/oracle/oracle.sql    |    2 +-
 module/idoutils/db/pgsql/pgsql.sql      |    2 +-
 module/idoutils/db/scripts/installdb.in |    2 +-
 module/idoutils/db/scripts/upgradedb.in |    6 +++---
 module/idoutils/include/ido2db.h        |    2 +-
 update-version-schema                   |    2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/module/idoutils/db/mysql/mysql.sql b/module/idoutils/db/mysql/mysql.sql
index aa4b717..afe65c8 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.5.0') ON DUPLICATE KEY UPDATE version='1.5.0';
+INSERT INTO icinga_dbversion (name, version) VALUES ('idoutils', '1.5.0-dev') ON DUPLICATE KEY UPDATE version='1.5.0-dev';
 
 
diff --git a/module/idoutils/db/oracle/oracle.sql b/module/idoutils/db/oracle/oracle.sql
index c53029f..94797dd 100644
--- a/module/idoutils/db/oracle/oracle.sql
+++ b/module/idoutils/db/oracle/oracle.sql
@@ -21,7 +21,7 @@
 -- -- --------------------------------------------------------
 */
 
-DEFINE ICINGA_VERSION=1.5.0
+DEFINE ICINGA_VERSION=1.5.0-dev
 
 -- -----------------------------------------
 -- set defines
diff --git a/module/idoutils/db/pgsql/pgsql.sql b/module/idoutils/db/pgsql/pgsql.sql
index 2560655..b9600f3 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.5.0');
+SELECT updatedbversion('1.5.0-dev');
 
diff --git a/module/idoutils/db/scripts/installdb.in b/module/idoutils/db/scripts/installdb.in
index cf5d1c8..a19e936 100755
--- a/module/idoutils/db/scripts/installdb.in
+++ b/module/idoutils/db/scripts/installdb.in
@@ -45,7 +45,7 @@ my $dbh = DBI->connect("DBI:mysql:database=$database;host=$hostname",
 		or die "Cannot connect to database";
 
 # Current database version
-my $thisversion="1.5.0";
+my $thisversion="1.5.0-dev";
 
 # Create version table if it doesn't exist
 eval { $dbh->do("SELECT * FROM icinga_dbversion LIMIT 1") };
diff --git a/module/idoutils/db/scripts/upgradedb.in b/module/idoutils/db/scripts/upgradedb.in
index 25e6e13..d39087b 100755
--- a/module/idoutils/db/scripts/upgradedb.in
+++ b/module/idoutils/db/scripts/upgradedb.in
@@ -53,9 +53,9 @@ if ($@) {
 
 # Get current database version
 my $version;
-my $thisversion="1.5.0";
-my $lastversion="1.5.0";
-my $legacyversion="1.5.0";
+my $thisversion="1.5.0-dev";
+my $lastversion="1.5.0-dev";
+my $legacyversion="1.5.0-dev";
 
 $version = $dbh->selectrow_array("SELECT version FROM icinga_dbversion WHERE name='idoutils'");
 if ($version eq "") {
diff --git a/module/idoutils/include/ido2db.h b/module/idoutils/include/ido2db.h
index fe6a77b..323df34 100644
--- a/module/idoutils/include/ido2db.h
+++ b/module/idoutils/include/ido2db.h
@@ -16,7 +16,7 @@
 #define IDO2DB_DATE "08-17-2011"
 #define IDO2DB_VERSION "1.5.0-dev"
 
-#define IDO2DB_SCHEMA_VERSION "1.5.0"
+#define IDO2DB_SCHEMA_VERSION "1.5.0-dev"
 
 /*************** RDBMS headers *************/
 
diff --git a/update-version-schema b/update-version-schema
index b2c2ee5..9489041 100755
--- a/update-version-schema
+++ b/update-version-schema
@@ -10,7 +10,7 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.5.0
+CURRENTVERSION=1.5.0-dev
 
 # Last date
 LASTDATE=08-17-2011





More information about the icinga-checkins mailing list