2012-05-10 Sergio Martin <sergio.martin@artica.es>

* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql: Set default value to id_alert_command
	column in db to avoid comparison errors in server




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6283 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2012-05-10 12:09:00 +00:00
parent a1457a95b3
commit 7eb3f27b04
4 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,10 @@
2012-05-10 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql
pandoradb.postgreSQL.sql
pandoradb.oracle.sql: Set default value to id_alert_command
column in db to avoid comparison errors in server
2012-05-10 Junichi Satoh <junichi@rworks.jp> 2012-05-10 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_alert_macros.php: Added to help two new macros. * include/help/ja/help_alert_macros.php: Added to help two new macros.

View File

@ -273,7 +273,7 @@ CREATE OR REPLACE TRIGGER talert_commands_inc BEFORE INSERT ON talert_commands R
CREATE TABLE talert_actions ( CREATE TABLE talert_actions (
id NUMBER(10, 0) NOT NULL PRIMARY KEY, id NUMBER(10, 0) NOT NULL PRIMARY KEY,
name CLOB default '', name CLOB default '',
id_alert_command NUMBER(10, 0) NOT NULL REFERENCES talert_commands(id) ON DELETE CASCADE, id_alert_command NUMBER(10, 0) default 0 NOT NULL REFERENCES talert_commands(id) ON DELETE CASCADE,
field1 CLOB default '', field1 CLOB default '',
field2 CLOB default '', field2 CLOB default '',
field3 CLOB default '', field3 CLOB default '',

View File

@ -240,7 +240,7 @@ CREATE TABLE "talert_commands" (
CREATE TABLE "talert_actions" ( CREATE TABLE "talert_actions" (
"id" SERIAL NOT NULL PRIMARY KEY, "id" SERIAL NOT NULL PRIMARY KEY,
"name" text default '', "name" text default '',
"id_alert_command" INTEGER NOT NULL REFERENCES talert_commands("id") ON DELETE CASCADE ON UPDATE CASCADE, "id_alert_command" INTEGER NOT NULL default 0 REFERENCES talert_commands("id") ON DELETE CASCADE ON UPDATE CASCADE,
"field1" text NOT NULL default '', "field1" text NOT NULL default '',
"field2" text default '', "field2" text default '',
"field3" text default '', "field3" text default '',

View File

@ -249,7 +249,7 @@ CREATE TABLE IF NOT EXISTS `talert_commands` (
CREATE TABLE IF NOT EXISTS `talert_actions` ( CREATE TABLE IF NOT EXISTS `talert_actions` (
`id` int(10) unsigned NOT NULL auto_increment, `id` int(10) unsigned NOT NULL auto_increment,
`name` text, `name` text,
`id_alert_command` int(10) unsigned NOT NULL, `id_alert_command` int(10) unsigned NULL default 0,
`field1` text NOT NULL, `field1` text NOT NULL,
`field2` text, `field2` text,
`field3` text, `field3` text,