summaryrefslogtreecommitdiffstats
path: root/setup
diff options
context:
space:
mode:
authorBjörn Geiger2011-08-05 12:22:52 +0200
committerBjörn Geiger2011-08-05 12:22:52 +0200
commitc8b354b1e9f02a23c06060ed4bf86931b90239aa (patch)
tree25782493588f98d581682787fb88bee63ea3b4f7 /setup
parentverschiedene Fehler korrigiert (diff)
downloadpoolctrl-c8b354b1e9f02a23c06060ed4bf86931b90239aa.tar.gz
poolctrl-c8b354b1e9f02a23c06060ed4bf86931b90239aa.tar.xz
poolctrl-c8b354b1e9f02a23c06060ed4bf86931b90239aa.zip
Event Action wieder entfernt
Diffstat (limited to 'setup')
-rw-r--r--setup/poolctrl.sql8
-rw-r--r--setup/poolctrl_data.sql7
2 files changed, 0 insertions, 15 deletions
diff --git a/setup/poolctrl.sql b/setup/poolctrl.sql
index 61b532f..4a9b510 100644
--- a/setup/poolctrl.sql
+++ b/setup/poolctrl.sql
@@ -7,7 +7,6 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
CREATE TABLE IF NOT EXISTS `poolctrl_event` (
`eventID` int(11) NOT NULL AUTO_INCREMENT,
`title` varchar(30) COLLATE utf8_unicode_ci NOT NULL UNIQUE,
- `action` int(11) NOT NULL DEFAULT '1',
`start` timestamp COLLATE utf8_unicode_ci NOT NULL DEFAULT CURRENT_TIMESTAMP(),
`end` timestamp COLLATE utf8_unicode_ci NOT NULL,
`participants` int(4) NOT NULL DEFAULT 50 CHECK (participants > 0),
@@ -23,12 +22,6 @@ CREATE TABLE IF NOT EXISTS `poolctrl_event` (
PRIMARY KEY (`eventID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1;
-CREATE TABLE IF NOT EXISTS `poolctrl_eventaction` (
- `eventactionID` int(11) NOT NULL AUTO_INCREMENT,
- `title` varchar(30) COLLATE utf8_unicode_ci NOT NULL UNIQUE,
- PRIMARY KEY (`eventactionID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1;
-
CREATE TABLE IF NOT EXISTS `poolctrl_eventreport` (
`reportID` int(11) NOT NULL AUTO_INCREMENT,
`report` varchar(140) COLLATE utf8_unicode_ci DEFAULT 'success',
@@ -174,6 +167,5 @@ ALTER TABLE `poolctrl_event`
-- ADD CONSTRAINT `poolctrl_event_bootmenuidC` FOREIGN KEY (`pbs_bootmenuID`) REFERENCES `pbs_bootmenu` (`bootmenuID`) ON DELETE CASCADE,
-- ADD CONSTRAINT `poolctrl_event_filteridC` FOREIGN KEY (`pbs_filterID`) REFERENCES `pbs_filter` (`filterID`) ON DELETE CASCADE,
ADD CONSTRAINT `poolctrl_event_categoryC` FOREIGN KEY (`category`) REFERENCES `poolctrl_eventcategory` (`eventcategoryID`) ON DELETE CASCADE,
- ADD CONSTRAINT `poolctrl_event_actionC` FOREIGN KEY (`action`) REFERENCES `poolctrl_eventaction` (`eventactionID`) ON DELETE CASCADE,
ADD CONSTRAINT `poolctrl_event_startC` CHECK (start > CURRENT_TIMESTAMP()),
ADD CONSTRAINT `poolctrl_event_endC` CHECK (end > start);
diff --git a/setup/poolctrl_data.sql b/setup/poolctrl_data.sql
index faf4fbd..742e46a 100644
--- a/setup/poolctrl_data.sql
+++ b/setup/poolctrl_data.sql
@@ -87,13 +87,6 @@ INSERT INTO `poolctrl_eventcategory` (`eventcategoryID`, `title`) VALUES
(3, 'Boot'),
(4, 'Shutdown');
--- Adding eventactions
-INSERT INTO `poolctrl_eventaction` (`eventactionID`, `title`) VALUES
-(1, 'None'),
-(2, 'Boot'),
-(3, 'Shutdown'),
-(4, 'Maintenance');
-
-- Adding events
INSERT INTO `poolctrl_event` (`eventID`, `title`, `action`, `start`, `end`, `category`, `pbs_poolID`, `pbs_membershipID`, `pbs_bootosID`, `note`, `pbs_bootmenuID`, `pbs_filterID`) VALUES
(1, 'Systeme I', DEFAULT, '2011-06-24 12:10:00', '2011-06-24 14:00:00', '1', 1, 1, 1, 'Systeme I Vorlesung', 1, 1),