diff options
| author | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-03-06 11:43:10 +0000 |
|---|---|---|
| committer | alex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-03-06 11:43:10 +0000 |
| commit | 9ef27a42a050c16a0e76757507d922b5798eb2ef (patch) | |
| tree | caa5f7cc29923f62fc9a408c6143f370c2c83804 /upgrades/dbpatches | |
| parent | 9fcb201d990fc2305ce26a8f36a92a7227e27d0a (diff) | |
| download | zabbix-9ef27a42a050c16a0e76757507d922b5798eb2ef.tar.gz zabbix-9ef27a42a050c16a0e76757507d922b5798eb2ef.tar.xz zabbix-9ef27a42a050c16a0e76757507d922b5798eb2ef.zip | |
- added actions.evaltype (Alexei)
- added support of all AND, all OR and AND/OR action conditions (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@3870 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'upgrades/dbpatches')
| -rw-r--r-- | upgrades/dbpatches/1.3/mysql/patch/actions.sql | 3 | ||||
| -rw-r--r-- | upgrades/dbpatches/1.3/postgresql/patch/actions.sql | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/upgrades/dbpatches/1.3/mysql/patch/actions.sql b/upgrades/dbpatches/1.3/mysql/patch/actions.sql index 7581dd2c..cde11926 100644 --- a/upgrades/dbpatches/1.3/mysql/patch/actions.sql +++ b/upgrades/dbpatches/1.3/mysql/patch/actions.sql @@ -8,11 +8,12 @@ CREATE TABLE actions_tmp ( repeatdelay integer DEFAULT '600' NOT NULL, source integer DEFAULT '0' NOT NULL, actiontype integer DEFAULT '0' NOT NULL, + evaltype integer DEFAULT '0' NOT NULL, status integer DEFAULT '0' NOT NULL, scripts blob DEFAULT '' NOT NULL, PRIMARY KEY (actionid) ) ENGINE=InnoDB ; -insert into actions_tmp select * from actions; +insert into actions_tmp select actionid,userid,subject,message,recipient,maxrepeats,repeatdelay,source,actiontype,0,status,scripts from actions; drop table actions; alter table actions_tmp rename actions; diff --git a/upgrades/dbpatches/1.3/postgresql/patch/actions.sql b/upgrades/dbpatches/1.3/postgresql/patch/actions.sql index 36042556..6a9c5778 100644 --- a/upgrades/dbpatches/1.3/postgresql/patch/actions.sql +++ b/upgrades/dbpatches/1.3/postgresql/patch/actions.sql @@ -8,11 +8,12 @@ CREATE TABLE actions_tmp ( repeatdelay integer DEFAULT '600' NOT NULL, source integer DEFAULT '0' NOT NULL, actiontype integer DEFAULT '0' NOT NULL, + evaltype integer DEFAULT '0' NOT NULL, status integer DEFAULT '0' NOT NULL, scripts text DEFAULT '' NOT NULL, PRIMARY KEY (actionid) ); -insert into actions_tmp select * from actions; +insert into actions_tmp select actionid,userid,subject,message,recipient,maxrepeats,repeatdelay,source,actiontype,0,status,scripts from actions; drop table actions; alter table actions_tmp rename to actions; |