summaryrefslogtreecommitdiffstats
path: root/setup
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-14 13:05:10 +0200
committerBjörn Geiger2011-09-14 13:05:10 +0200
commit07383f1d8525ec18ed1e577b8f976bd0c26c294b (patch)
tree8d0116660aa1075df39c7f8b8a9ae9f70955ee3e /setup
parentkleine Korrektur (diff)
downloadpoolctrl-07383f1d8525ec18ed1e577b8f976bd0c26c294b.tar.gz
poolctrl-07383f1d8525ec18ed1e577b8f976bd0c26c294b.tar.xz
poolctrl-07383f1d8525ec18ed1e577b8f976bd0c26c294b.zip
show Eventreports, Datenbankänderung
Diffstat (limited to 'setup')
-rwxr-xr-xsetup/poolctrl.sql5
-rwxr-xr-xsetup/poolctrl_data.sql16
2 files changed, 11 insertions, 10 deletions
diff --git a/setup/poolctrl.sql b/setup/poolctrl.sql
index a11b4b4..9e6d2ff 100755
--- a/setup/poolctrl.sql
+++ b/setup/poolctrl.sql
@@ -22,6 +22,7 @@ CREATE TABLE IF NOT EXISTS `poolctrl_event` (
`immediate` bool NOT NULL DEFAULT false,
`running` bool NOT NULL DEFAULT false,
`runningtype` int(11) DEFAULT NULL,
+ `created` varchar(14) COLLATE utf8_unicode_ci NULL,
PRIMARY KEY (`eventID`),
KEY `pbs_poolID` (`pbs_poolID`),
KEY `pbs_membershipID` (`pbs_membershipID`),
@@ -46,11 +47,11 @@ CREATE TABLE IF NOT EXISTS `poolctrl_eventcategory` (
CREATE TABLE IF NOT EXISTS `poolctrl_eventreport` (
`reportID` int(11) NOT NULL AUTO_INCREMENT,
- `result` varchar(140) COLLATE utf8_unicode_ci DEFAULT 'success',
+ `result` varchar(140) COLLATE utf8_unicode_ci DEFAULT 'succeeded',
`errors` varchar(140) COLLATE utf8_unicode_ci,
`type` int(11) NOT NULL,
`eventID` int(11) NOT NULL,
- `timestamp` timestamp COLLATE utf8_unicode_ci NOT NULL DEFAULT CURRENT_TIMESTAMP(),
+ `created` varchar(14) COLLATE utf8_unicode_ci NOT NULL,
PRIMARY KEY (`reportID`),
KEY `eventID` (`eventID`),
KEY `type` (`type`)
diff --git a/setup/poolctrl_data.sql b/setup/poolctrl_data.sql
index 6adbc6f..d866bd6 100755
--- a/setup/poolctrl_data.sql
+++ b/setup/poolctrl_data.sql
@@ -69,13 +69,13 @@ INSERT INTO `poolctrl_eventtype` (`eventtypeID`, `title`) VALUES
(2, 'Shutdown');
-- Adding events
-INSERT INTO `poolctrl_event` (`eventID`, `title`, `start`, `end`, `category`, `pbs_poolID`, `pbs_membershipID`, `pbs_bootosID`, `note`, `pbs_bootmenuID`, `pbs_filterID`) VALUES
-(1, 'Systeme I', '2011-06-24 12:10:00', '2011-06-24 14:00:00', '1', 1, 1, 1, 'Systeme I Vorlesung', 1, 1),
-(2, 'Systeme II', '2011-06-24 14:10:00', '2011-06-24 16:00:00', '1', 1, 1, 1, 'Systeme II Vorlesung', 1, 1),
-(3, 'Systeme III', '2011-06-24 16:10:00', '2011-06-24 18:00:00', '1', 1, 1, 1, 'Systeme III Vorlesung', 1, 1);
+INSERT INTO `poolctrl_event` (`eventID`, `title`, `start`, `end`, `category`, `pbs_poolID`, `pbs_membershipID`, `pbs_bootosID`, `note`, `pbs_bootmenuID`, `pbs_filterID`, `created`) VALUES
+(1, 'Systeme I', '2011-06-24 12:10:00', '2011-06-24 14:00:00', '1', 1, 1, 1, 'Systeme I Vorlesung', 1, 1, 1308583320),
+(2, 'Systeme II', '2011-06-24 14:10:00', '2011-06-24 16:00:00', '1', 1, 1, 1, 'Systeme II Vorlesung', 1, 1, 1308583320),
+(3, 'Systeme III', '2011-06-24 16:10:00', '2011-06-24 18:00:00', '1', 1, 1, 1, 'Systeme III Vorlesung', 1, 1, 1308583320);
-- Adding eventreports
-INSERT INTO `poolctrl_eventreport` (`reportID`, `result`, `errors`, `type`, `eventID`) VALUES
-(1, DEFAULT, null, 1, 1),
-(2, DEFAULT, null, 1, 2),
-(3, 'failed', 'wake-on-lan failed', 1, 3);
+INSERT INTO `poolctrl_eventreport` (`reportID`, `result`, `errors`, `type`, `eventID`, `created`) VALUES
+(1, DEFAULT, null, 1, 1, 1308917400),
+(2, DEFAULT, null, 1, 2, 1308917400),
+(3, 'failed', 'wake-on-lan failed', 1, 3, 1308931800);