tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-28 16:24:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Import: renamed column imported_rowset_checksum TO rowset_checksum resolves: #9700

Browse Source
This commit is contained in:
Stefan Scheungrab 2015-07-22 11:13:52 +02:00
parent bc49af2685
commit 2076d6b9a7
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/tables/ImportrunTable.php
View File

@ -46,7 +46,7 @@ class ImportrunTable extends QuickTable
array() array()
)->joinLeft( )->joinLeft(
array('rs' => 'imported_rowset'), array('rs' => 'imported_rowset'),
'rs.checksum = r.imported_rowset_checksum', 'rs.checksum = r.rowset_checksum',
array() array()
)->joinLeft( )->joinLeft(
array('rsr' => 'imported_rowset_row'), array('rsr' => 'imported_rowset_row'),

2
library/Director/Import/Import.php
View File

@ -105,7 +105,7 @@ class Import
'import_run', 'import_run',
array( array(
'source_id' => $source->id, 'source_id' => $source->id,
'imported_rowset_checksum' => $rowset, 'rowset_checksum' => $rowset,
'start_time' => date('Y-m-d H:i:s'), 'start_time' => date('Y-m-d H:i:s'),
'succeeded' => 'y' 'succeeded' => 'y'
) )

4
schema/mysql-changes/upgrade_26.sql Normal file
View File

@ -0,0 +1,4 @@
ALTER TABLE import_run DROP FOREIGN KEY import_run_rowset;
ALTER TABLE import_run CHANGE imported_rowset_checksum rowset_checksum varbinary(20) DEFAULT NULL;
ALTER TABLE import_run ADD CONSTRAINT import_run_rowset FOREIGN KEY rowset (rowset_checksum) REFERENCES imported_rowset (checksum) ON DELETE RESTRICT ON UPDATE CASCADE;

4
schema/mysql.sql
View File

@ -831,7 +831,7 @@ CREATE TABLE imported_rowset (
CREATE TABLE import_run ( CREATE TABLE import_run (
id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL, id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL,
source_id INT(10) UNSIGNED NOT NULL, source_id INT(10) UNSIGNED NOT NULL,
imported_rowset_checksum VARBINARY(20) DEFAULT NULL, rowset_checksum VARBINARY(20) DEFAULT NULL,
start_time DATETIME NOT NULL, start_time DATETIME NOT NULL,
end_time DATETIME DEFAULT NULL, end_time DATETIME DEFAULT NULL,
succeeded ENUM('y', 'n') DEFAULT NULL, succeeded ENUM('y', 'n') DEFAULT NULL,
@ -842,7 +842,7 @@ CREATE TABLE import_run (
ON DELETE RESTRICT ON DELETE RESTRICT
ON UPDATE CASCADE, ON UPDATE CASCADE,
CONSTRAINT import_run_rowset CONSTRAINT import_run_rowset
FOREIGN KEY rowset (imported_rowset_checksum) FOREIGN KEY rowset (rowset_checksum)
REFERENCES imported_rowset (checksum) REFERENCES imported_rowset (checksum)
ON DELETE RESTRICT ON DELETE RESTRICT
ON UPDATE CASCADE ON UPDATE CASCADE