- removed support of action repeats (Alexei)

 - fixed upgrade of rights,sysmaps,sysmaps_elements (Alexei)
 - fixed initial creation of user rights in data.sql (Alexei)
 - fixes of PostgreSQL compile (Alexei)


git-svn-id: svn://svn.zabbix.com/trunk@3875 97f52cf1-0a1b-0410-bd0e-c28be96e8082

1 files changed, 1 insertions, 3 deletions

diff --git a/upgrades/dbpatches/1.3/postgresql/patch/actions.sql b/upgrades/dbpatches/1.3/postgresql/patch/actions.sql
index 6a9c5778..ecec38df 100644
--- a/upgrades/dbpatches/1.3/postgresql/patch/actions.sql
+++ b/upgrades/dbpatches/1.3/postgresql/patch/actions.sql
@@ -4,8 +4,6 @@ CREATE TABLE actions_tmp (
 	subject		varchar(255)		DEFAULT ''	NOT NULL,
 	message		text		DEFAULT ''	NOT NULL,
 	recipient	integer		DEFAULT '0'	NOT NULL,
-	maxrepeats	integer		DEFAULT '0'	NOT NULL,
-	repeatdelay	integer		DEFAULT '600'	NOT NULL,
 	source		integer		DEFAULT '0'	NOT NULL,
 	actiontype	integer		DEFAULT '0'	NOT NULL,
 	evaltype	integer		DEFAULT '0'	NOT NULL,
@@ -14,6 +12,6 @@ CREATE TABLE actions_tmp (
 	PRIMARY KEY (actionid)
 );
 
-insert into actions_tmp select actionid,userid,subject,message,recipient,maxrepeats,repeatdelay,source,actiontype,0,status,scripts from actions;
+insert into actions_tmp select actionid,userid,subject,message,recipient,source,actiontype,0,status,scripts from actions;
 drop table actions;
 alter table actions_tmp rename to actions;