tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1071-Formulario-gráfica-combinada-automática-open' into 'develop' 

Add column id_server to tgraph_source and fix metaconsole automatic_graph report_template - #1071

See merge request !634
This commit is contained in:
vgilc 2017-07-28 14:31:46 +02:00
parent ea93a55982 88879462a3
commit 03cb255562
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
View File

@ -1401,4 +1401,22 @@ ALTER TABLE tpolicy_modules MODIFY post_process double(24,15) default 0;
-- Table `tserver_export`
-- ---------------------------------------------------------------------
ALTER TABLE tserver_export MODIFY `name` varchar(600) BINARY NOT NULL default '';
ALTER TABLE tserver_export MODIFY `name` varchar(600) BINARY NOT NULL default '';
-- ---------------------------------------------------------------------
-- Table `tgraph_source` column 'id_server'
-- ---------------------------------------------------------------------
START TRANSACTION;
SET @st_oum707 = (SELECT IF(
(SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = 'tgraph_source' AND table_schema = DATABASE() AND column_name = 'id_server') > 0,
"SELECT 1",
"ALTER TABLE tgraph_source ADD COLUMN id_server int(11) UNSIGNED NOT NULL default 0"
));
PREPARE pr_oum707 FROM @st_oum707;
EXECUTE pr_oum707;
DEALLOCATE PREPARE pr_oum707;
COMMIT;