summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-03-25 07:36:23 +0000
committeralex <alex@97f52cf1-0a1b-0410-bd0e-c28be96e8082>2007-03-25 07:36:23 +0000
commit616906768d2e6f3b86e96822dcb8e37e3b6cad2f (patch)
tree403928db13be6f85be05153b7655a77742e410cb
parent2f6b4a23edbb0e8556e1e8deee20c99eb2d830fd (diff)
downloadzabbix-616906768d2e6f3b86e96822dcb8e37e3b6cad2f.tar.gz
zabbix-616906768d2e6f3b86e96822dcb8e37e3b6cad2f.tar.xz
zabbix-616906768d2e6f3b86e96822dcb8e37e3b6cad2f.zip
- added new table slides and slideshows (Alexei)
git-svn-id: svn://svn.zabbix.com/trunk@3919 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rw-r--r--ChangeLog1
-rw-r--r--create/schema/schema.sql11
-rw-r--r--upgrades/dbpatches/1.3/mysql/patch/slides.sql8
-rw-r--r--upgrades/dbpatches/1.3/mysql/patch/slideshows.sql6
-rw-r--r--upgrades/dbpatches/1.3/postgresql/patch/slides.sql8
-rw-r--r--upgrades/dbpatches/1.3/postgresql/patch/slideshows.sql6
6 files changed, 40 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a06dee56..2738ed31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
Changes for 1.3.4:
+ - added new table slides and slideshows (Alexei)
- added server-side support of external checks. Thanks to Mike Nestor. (Alexei)
- fixed incorrect SQL statement for ICMP check (Alexei)
- support of multiple actions per set of conidtions (Alexei)
diff --git a/create/schema/schema.sql b/create/schema/schema.sql
index 4b96b753..9877974a 100644
--- a/create/schema/schema.sql
+++ b/create/schema/schema.sql
@@ -21,6 +21,17 @@
-- Do not use spaces
--
+TABLE|slideshows|slideshowid|ZBX_SYNC
+FIELD |slideshowid |t_id |'0' |NOT NULL |ZBX_SYNC
+FIELD |name |t_varchar(255) |'' |NOT NULL |ZBX_SYNC
+FIELD |delay |t_integer |'0' |NOT NULL |ZBX_SYNC
+
+TABLE|slides|slideid|ZBX_SYNC
+FIELD |slideid |t_id |'0' |NOT NULL |ZBX_SYNC
+FIELD |slideshowid |t_id |'0' |NOT NULL |ZBX_SYNC
+FIELD |delay |t_integer |'0' |NOT NULL |ZBX_SYNC
+INDEX |slides_1 |slideshowid
+
TABLE|drules|druleid|ZBX_SYNC
FIELD |druleid |t_id |'0' |NOT NULL |ZBX_SYNC
FIELD |name |t_varchar(255) |'' |NOT NULL |ZBX_SYNC
diff --git a/upgrades/dbpatches/1.3/mysql/patch/slides.sql b/upgrades/dbpatches/1.3/mysql/patch/slides.sql
new file mode 100644
index 00000000..1df2fa14
--- /dev/null
+++ b/upgrades/dbpatches/1.3/mysql/patch/slides.sql
@@ -0,0 +1,8 @@
+CREATE TABLE slides (
+ slideid bigint unsigned DEFAULT '0' NOT NULL,
+ slideshowid bigint unsigned DEFAULT '0' NOT NULL,
+ delay integer DEFAULT '0' NOT NULL,
+ PRIMARY KEY (slideid)
+) ENGINE=InnoDB;
+CREATE INDEX slides_slides_1 on slides (slideshowid);
+
diff --git a/upgrades/dbpatches/1.3/mysql/patch/slideshows.sql b/upgrades/dbpatches/1.3/mysql/patch/slideshows.sql
new file mode 100644
index 00000000..6d66a442
--- /dev/null
+++ b/upgrades/dbpatches/1.3/mysql/patch/slideshows.sql
@@ -0,0 +1,6 @@
+CREATE TABLE slideshows (
+ slideshowid bigint unsigned DEFAULT '0' NOT NULL,
+ name varchar(255) DEFAULT '' NOT NULL,
+ delay integer DEFAULT '0' NOT NULL,
+ PRIMARY KEY (slideshowid)
+) ENGINE=InnoDB;
diff --git a/upgrades/dbpatches/1.3/postgresql/patch/slides.sql b/upgrades/dbpatches/1.3/postgresql/patch/slides.sql
new file mode 100644
index 00000000..5f353598
--- /dev/null
+++ b/upgrades/dbpatches/1.3/postgresql/patch/slides.sql
@@ -0,0 +1,8 @@
+CREATE TABLE slides (
+ slideid bigint DEFAULT '0' NOT NULL,
+ slideshowid bigint DEFAULT '0' NOT NULL,
+ delay integer DEFAULT '0' NOT NULL,
+ PRIMARY KEY (slideid)
+);
+CREATE INDEX slides_slides_1 on slides (slideshowid);
+
diff --git a/upgrades/dbpatches/1.3/postgresql/patch/slideshows.sql b/upgrades/dbpatches/1.3/postgresql/patch/slideshows.sql
new file mode 100644
index 00000000..ad806da0
--- /dev/null
+++ b/upgrades/dbpatches/1.3/postgresql/patch/slideshows.sql
@@ -0,0 +1,6 @@
+CREATE TABLE slideshows (
+ slideshowid bigint DEFAULT '0' NOT NULL,
+ name varchar(255) DEFAULT '' NOT NULL,
+ delay integer DEFAULT '0' NOT NULL,
+ PRIMARY KEY (slideshowid)
+);