summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-02-14 07:36:43 +0000
committerhugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2006-02-14 07:36:43 +0000
commit618331bb4ca20c154b4f7cd7902eb170667535e7 (patch)
treebc5473290b09d97b4cf1ec6fc7b2ff6effa4b954
parent6472e22659b2e8eac37370541181b91b71976c50 (diff)
downloadzabbix-618331bb4ca20c154b4f7cd7902eb170667535e7.tar.gz
zabbix-618331bb4ca20c154b4f7cd7902eb170667535e7.tar.xz
zabbix-618331bb4ca20c154b4f7cd7902eb170667535e7.zip
- added triggers.templateid (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@2641 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r--ChangeLog1
-rw-r--r--create/mysql/schema.sql1
-rw-r--r--create/postgresql/schema.sql1
-rw-r--r--upgrades/dbpatches/1.1beta6_to_1.1beta7/mysql/patch.sql1
-rw-r--r--upgrades/dbpatches/1.1beta6_to_1.1beta7/postgresql/patch.sql1
5 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c29432dc..6061852c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
Changes for 1.1beta7:
+ - added triggers.templateid (Alexei)
- fixed navigation bar for Sreens (Eugene)
- fixed incorrect groupid error for actions (Eugene)
- improved Templates logic (Eugene)
diff --git a/create/mysql/schema.sql b/create/mysql/schema.sql
index 71b95730..c2b2ddd8 100644
--- a/create/mysql/schema.sql
+++ b/create/mysql/schema.sql
@@ -414,6 +414,7 @@ CREATE TABLE triggers (
dep_level int(2) DEFAULT '0' NOT NULL,
comments blob,
error varchar(128) DEFAULT '' NOT NULL,
+ templateid int(4) DEFAULT '0' NOT NULL,
PRIMARY KEY (triggerid),
KEY (status),
KEY (value)
diff --git a/create/postgresql/schema.sql b/create/postgresql/schema.sql
index ada6dfff..fdb13f36 100644
--- a/create/postgresql/schema.sql
+++ b/create/postgresql/schema.sql
@@ -143,6 +143,7 @@ CREATE TABLE triggers (
dep_level int2 DEFAULT '0' NOT NULL,
comments text,
error varchar(128) DEFAULT '' NOT NULL,
+ templateid int4 DEFAULT '0' NOT NULL,
PRIMARY KEY (triggerid)
);
diff --git a/upgrades/dbpatches/1.1beta6_to_1.1beta7/mysql/patch.sql b/upgrades/dbpatches/1.1beta6_to_1.1beta7/mysql/patch.sql
index 1c030261..8c1382b4 100644
--- a/upgrades/dbpatches/1.1beta6_to_1.1beta7/mysql/patch.sql
+++ b/upgrades/dbpatches/1.1beta6_to_1.1beta7/mysql/patch.sql
@@ -1,2 +1,3 @@
alter table hosts add templateid int(4) DEFAULT '0' NOT NULL;
alter table items add templateid int(4) DEFAULT '0' NOT NULL;
+alter table triggers add templateid int(4) DEFAULT '0' NOT NULL;
diff --git a/upgrades/dbpatches/1.1beta6_to_1.1beta7/postgresql/patch.sql b/upgrades/dbpatches/1.1beta6_to_1.1beta7/postgresql/patch.sql
index c0efc643..682d2fc2 100644
--- a/upgrades/dbpatches/1.1beta6_to_1.1beta7/postgresql/patch.sql
+++ b/upgrades/dbpatches/1.1beta6_to_1.1beta7/postgresql/patch.sql
@@ -1,2 +1,3 @@
alter table hosts add templateid int4 DEFAULT '0' NOT NULL;
alter table items add templateid int4 DEFAULT '0' NOT NULL;
+alter table triggers add templateid int4 DEFAULT '0' NOT NULL;