summaryrefslogtreecommitdiff
path: root/database
diff options
context:
space:
mode:
authorGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-09-25 10:45:22 +0200
committerGeorgios Andreadis <g.andreadis@student.tudelft.nl>2017-09-25 10:45:22 +0200
commitd85c1233dab14a9239646410d76ca35ed1cd0665 (patch)
treed43d265c732497e98f5b9c57fda4a3157c4b9a57 /database
parent2ab2f88c4353207f7b99cd77bc478502610f2e9e (diff)
Fix issue with rack creation
Diffstat (limited to 'database')
-rw-r--r--database/schema.sql6
-rw-r--r--database/test.sql18
2 files changed, 12 insertions, 12 deletions
diff --git a/database/schema.sql b/database/schema.sql
index 0dc27afe..988f527a 100644
--- a/database/schema.sql
+++ b/database/schema.sql
@@ -442,7 +442,7 @@ DELIMITER ;
-- PSUs on tiles
DROP TABLE IF EXISTS psus;
CREATE TABLE psus (
- id INTEGER NOT NULL AUTO_INCREMENT,
+ id INTEGER NOT NULL,
energy_kwh INTEGER NOT NULL CHECK (energy_kwh > 0),
type VARCHAR(50) NOT NULL,
failure_model_id INTEGER NOT NULL,
@@ -464,7 +464,7 @@ CREATE TABLE psus (
-- Cooling items on tiles
DROP TABLE IF EXISTS cooling_items;
CREATE TABLE cooling_items (
- id INTEGER NOT NULL AUTO_INCREMENT,
+ id INTEGER NOT NULL,
energy_consumption_w INTEGER NOT NULL CHECK (energy_consumption_w > 0),
type VARCHAR(50) NOT NULL,
failure_model_id INTEGER NOT NULL,
@@ -486,7 +486,7 @@ CREATE TABLE cooling_items (
-- Racks on tiles
DROP TABLE IF EXISTS racks;
CREATE TABLE racks (
- id INTEGER NOT NULL AUTO_INCREMENT,
+ id INTEGER NOT NULL,
name TEXT,
capacity INTEGER NOT NULL CHECK (capacity > 0),
power_capacity_w INTEGER NOT NULL CHECK (power_capacity_w > 0),
diff --git a/database/test.sql b/database/test.sql
index e262ba54..d666b6a1 100644
--- a/database/test.sql
+++ b/database/test.sql
@@ -215,52 +215,52 @@ INSERT INTO tiles (position_x, position_y, room_id) VALUES (10, 13, 5);
-- Racks
INSERT INTO objects (type) VALUES ('RACK');
-INSERT INTO racks (capacity, name, power_capacity_w) VALUES (42, 'rack 1', 5000);
+INSERT INTO racks (id, capacity, name, power_capacity_w) VALUES (1, 42, 'rack 1', 5000);
UPDATE tiles
SET object_id = 1
WHERE id = 1;
INSERT INTO objects (type) VALUES ('RACK');
-INSERT INTO racks (capacity, name, power_capacity_w) VALUES (42, 'rack 2', 5000);
+INSERT INTO racks (id, capacity, name, power_capacity_w) VALUES (2, 42, 'rack 2', 5000);
UPDATE tiles
SET object_id = 2
WHERE id = 2;
INSERT INTO objects (type) VALUES ('RACK');
-INSERT INTO racks (capacity, name, power_capacity_w) VALUES (42, 'rack 1', 5000);
+INSERT INTO racks (id, capacity, name, power_capacity_w) VALUES (3, 42, 'rack 1', 5000);
UPDATE tiles
SET object_id = 3
WHERE id = 4;
INSERT INTO objects (type) VALUES ('RACK');
-INSERT INTO racks (capacity, name, power_capacity_w) VALUES (42, 'rack 2', 5000);
+INSERT INTO racks (id, capacity, name, power_capacity_w) VALUES (4, 42, 'rack 2', 5000);
UPDATE tiles
SET object_id = 4
WHERE id = 5;
INSERT INTO objects (type) VALUES ('RACK');
-INSERT INTO racks (capacity, name, power_capacity_w) VALUES (42, 'rack 3', 5000);
+INSERT INTO racks (id, capacity, name, power_capacity_w) VALUES (5, 42, 'rack 3', 5000);
UPDATE tiles
SET object_id = 5
WHERE id = 7;
INSERT INTO objects (type) VALUES ('RACK');
-INSERT INTO racks (capacity, name, power_capacity_w) VALUES (42, 'rack 1', 5000);
+INSERT INTO racks (id, capacity, name, power_capacity_w) VALUES (6, 42, 'rack 1', 5000);
UPDATE tiles
SET object_id = 6
WHERE id = 8;
INSERT INTO objects (type) VALUES ('RACK');
-INSERT INTO racks (capacity, name, power_capacity_w) VALUES (42, 'rack 2', 5000);
+INSERT INTO racks (id, capacity, name, power_capacity_w) VALUES (7, 42, 'rack 2', 5000);
UPDATE tiles
SET object_id = 7
WHERE id = 9;
INSERT INTO objects (type) VALUES ('RACK');
-INSERT INTO racks (capacity, name, power_capacity_w) VALUES (42, 'rack 3', 5000);
+INSERT INTO racks (id, capacity, name, power_capacity_w) VALUES (8, 42, 'rack 3', 5000);
UPDATE tiles
SET object_id = 8
WHERE id = 11;
INSERT INTO objects (type) VALUES ('RACK');
-INSERT INTO racks (capacity, name, power_capacity_w) VALUES (42, 'rack 4', 5000);
+INSERT INTO racks (id, capacity, name, power_capacity_w) VALUES (9, 42, 'rack 4', 5000);
UPDATE tiles
SET object_id = 9
WHERE id = 12;