- 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, 4 deletions

diff --git a/upgrades/dbpatches/1.3/postgresql/patch/alerts.sql b/upgrades/dbpatches/1.3/postgresql/patch/alerts.sql
index 70cfd8ae..413e0ed0 100644
--- a/upgrades/dbpatches/1.3/postgresql/patch/alerts.sql
+++ b/upgrades/dbpatches/1.3/postgresql/patch/alerts.sql
@@ -11,10 +11,7 @@ CREATE TABLE alerts_tmp (
 	status		integer	DEFAULT '0'	NOT NULL,
 	retries		integer	DEFAULT '0'	NOT NULL,
 	error		varchar(128)		DEFAULT ''	NOT NULL,
-	repeats		integer	DEFAULT '0'	NOT NULL,
-	maxrepeats	integer	DEFAULT '0'	NOT NULL,
 	nextcheck	integer	DEFAULT '0'	NOT NULL,
-	delay		integer	DEFAULT '0'	NOT NULL,
 	PRIMARY KEY (alertid)
 );
 CREATE INDEX alerts_1 on alerts_tmp (actionid);
@@ -24,6 +21,6 @@ CREATE INDEX alerts_4 on alerts_tmp (status,retries);
 CREATE INDEX alerts_5 on alerts_tmp (mediatypeid);
 CREATE INDEX alerts_6 on alerts_tmp (userid);
 
-insert into alerts_tmp select * from alerts;
+insert into alerts_tmp select alertid,actionid,triggerid,userid,clock,mediatypeid,sendto,subject,message,status,retries,error,nextcheck from alerts;
 drop table alerts;
 alter table alerts_tmp rename to alerts;