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

Merge branch '1192-mr_5_changes_mysql' into 'develop' 

mr-5 add queries

See merge request !718
This commit is contained in:
vgilc 2017-08-07 14:02:30 +02:00
parent 120fbad29d 590bfbfe84
commit 8d2b2da941
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pandora_console/extras/mr/5.sql Normal file
View File

@ -0,0 +1,15 @@
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;
ALTER TABLE tserver_export_data MODIFY `module_name` varchar(600) BINARY NOT NULL default '';
COMMIT;

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

@ -1408,16 +1408,10 @@ ALTER TABLE tserver_export MODIFY `name` varchar(600) BINARY NOT NULL default ''
-- Table `tgraph_source` column 'id_server' -- Table `tgraph_source` column 'id_server'
-- --------------------------------------------------------------------- -- ---------------------------------------------------------------------
START TRANSACTION; ALTER TABLE tgraph_source ADD COLUMN id_server int(11) UNSIGNED NOT NULL default 0;
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, -- Table `tserver_export_data`
"SELECT 1", -- ---------------------------------------------------------------------
"ALTER TABLE tgraph_source ADD COLUMN id_server int(11) UNSIGNED NOT NULL default 0"
));
PREPARE pr_oum707 FROM @st_oum707; ALTER TABLE tserver_export_data MODIFY `module_name` varchar(600) BINARY NOT NULL default '';
EXECUTE pr_oum707;
DEALLOCATE PREPARE pr_oum707;
COMMIT;

2
pandora_console/pandoradb.sql
View File

@ -1418,7 +1418,7 @@ CREATE TABLE IF NOT EXISTS `tserver_export_data` (
`id` int(20) unsigned NOT NULL auto_increment, `id` int(20) unsigned NOT NULL auto_increment,
`id_export_server` int(10) unsigned default NULL, `id_export_server` int(10) unsigned default NULL,
`agent_name` varchar(100) NOT NULL default '', `agent_name` varchar(100) NOT NULL default '',
`module_name` varchar(100) NOT NULL default '', `module_name` varchar(600) NOT NULL default '',
`module_type` varchar(100) NOT NULL default '', `module_type` varchar(100) NOT NULL default '',
`data` varchar(255) default NULL, `data` varchar(255) default NULL,
`timestamp` datetime NOT NULL default '1970-01-01 00:00:00', `timestamp` datetime NOT NULL default '1970-01-01 00:00:00',