Improve database schema and install components

This commit is contained in:
2026-08-19 14:15:20 +02:00
parent 2476d1091a
commit ed2d1c1e84
6 changed files with 244 additions and 55 deletions
+110 -40
View File
@@ -5,8 +5,10 @@
/* TODO
- check all values if unsigned can be used or not
- implement foreign keys where possible
- implement foreign keys where missing and possible
- add referential actions where appropriate
- rename provisions to provision(?)
- review defaults
*/
/* User
@@ -125,9 +127,17 @@ CREATE TABLE storage (
angle smallint(4) NOT NULL DEFAULT 0,
color char(6) DEFAULT NULL,
remarks varchar(150) DEFAULT NULL,
PRIMARY KEY (sid)
PRIMARY KEY (sid),
FOREIGN KEY fk_storage_vessel (vid)
REFERENCES vessel(vid)
) ENGINE=InnoDB;
/* intentionally after storage creation */
ALTER TABLE vessel
ADD CONSTRAINT fk_vessel_storage
FOREIGN KEY (sid_default)
REFERENCES storage(sid);
CREATE TABLE tag (
tagid smallint(6) UNSIGNED NOT NULL AUTO_INCREMENT,
tagname varchar(20) NOT NULL,
@@ -141,7 +151,10 @@ CREATE TABLE tagref (
tagid smallint(6) UNSIGNED NOT NULL,
objid int(10) UNSIGNED NOT NULL,
objtype enum('equip','inv','prov','doc', 'proj', 'task', 'maint') NOT NULL,
PRIMARY KEY (tagid, objid, objtype)
PRIMARY KEY (tagid, objid, objtype),
FOREIGN KEY fk_tagref_tag (tagid)
REFERENCES tag(tagid)
ON DELETE CASCADE
) ENGINE=InnoDB;
/* TODO Boxes can be nested via parent
@@ -157,7 +170,9 @@ CREATE TABLE box (
weight float(5,2) UNSIGNED DEFAULT NULL,
remarks varchar(150) DEFAULT NULL,
PRIMARY KEY (boxid),
INDEX ix_label (label)
INDEX ix_label (label),
FOREIGN KEY fk_box_storage (sid)
REFERENCES storage(sid)
) ENGINE=InnoDB;
CREATE TABLE equipment (
@@ -165,7 +180,7 @@ CREATE TABLE equipment (
vid smallint(6) NOT NULL DEFAULT 1,
ename varchar(80) NOT NULL,
shortname varchar(20) DEFAULT NULL,
model varchar(40),
model varchar(40) DEFAULT NULL,
ecat tinyint(3) DEFAULT NULL,
serial varchar(30) DEFAULT NULL,
supplier smallint(6) DEFAULT NULL,
@@ -175,25 +190,21 @@ CREATE TABLE equipment (
weight float(5,2) UNSIGNED DEFAULT NULL,
remarks varchar(150) DEFAULT NULL,
flags set('ordered','removed','deleted') DEFAULT NULL,
PRIMARY KEY(eid)
PRIMARY KEY(eid),
FOREIGN KEY fk_equipment_vessel (vid)
REFERENCES vessel(vid)
ON DELETE RESTRICT,
FOREIGN KEY fk_equipment_supplier (supplier)
REFERENCES company(compid)
ON DELETE RESTRICT
) ENGINE=InnoDB;
/*
convert to
sid SMALLINT UNSIGNED NULL,
boxid SMALLINT UNSIGNED NULL,
CHECK (
(sid IS NOT NULL AND boxid IS NULL)
OR
(sid IS NULL AND boxid IS NOT NULL)
)
*/
CREATE TABLE inventory (
invid int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
invname varchar(80) NOT NULL,
conttype enum('storage','box') NOT NULL DEFAULT 'storage',
sid smallint(6) UNSIGNED NOT NULL DEFAULT 1,
boxid smallint(6) UNSIGNED NOT NULL DEFAULT 1,
sid smallint(6) UNSIGNED DEFAULT NULL,
boxid smallint(6) UNSIGNED DEFAULT NULL,
eid smallint(6) UNSIGNED DEFAULT NULL,
number smallint(6) UNSIGNED NOT NULL DEFAULT 1,
weight float(5,2) UNSIGNED DEFAULT NULL,
@@ -203,7 +214,18 @@ CREATE TABLE inventory (
remarks varchar(150) DEFAULT NULL,
flags set('ordered','removed','deleted') DEFAULT NULL,
PRIMARY KEY (invid),
INDEX ix_invname (invname)
INDEX ix_invname (invname),
FOREIGN KEY fk_inventory_storage (sid)
REFERENCES storage(sid),
FOREIGN KEY fk_inventory_box (boxid)
REFERENCES box(boxid),
FOREIGN KEY fk_inventory_equipment (eid)
REFERENCES equipment(eid)
CHECK (
(sid IS NOT NULL AND boxid IS NULL)
OR
(sid IS NULL AND boxid IS NOT NULL)
)
) ENGINE=InnoDB;
CREATE TABLE cable (
@@ -222,7 +244,13 @@ CREATE TABLE cable (
cablecond enum('unknown','new','excellent','good','fair','bad','repairable','defect') NOT NULL default 'unknown',
remarks varchar(150) DEFAULT NULL,
PRIMARY KEY (cableid),
INDEX ix_cablename (vid, cablename)
INDEX ix_cablename (vid, cablename),
FOREIGN KEY fk_cable_vessel (vid)
REFERENCES vessel(vid),
FOREIGN KEY fk_cable_supplier (supplier)
REFERENCES company(compid),
FOREIGN KEY fk_cable_manufacturer (manufacturer)
REFERENCES company(compid)
) ENGINE=InnoDB;
CREATE table fuse (
@@ -237,7 +265,13 @@ CREATE table fuse (
description varchar(60) DEFAULT NULL,
remarks varchar(150) DEFAULT NULL,
PRIMARY KEY (fuseid),
UNIQUE INDEX ix_fusenumber (vid, fnumber)
UNIQUE INDEX ix_fusenumber (vid, fnumber),
FOREIGN KEY fk_fuse_vessel (vid)
REFERENCES vessel(vid),
FOREIGN KEY fk_fuse_cable (cableid)
REFERENCES cable(cableid),
FOREIGN KEY fk_fuse_equipment (eid)
REFERENCES equipment(eid)
) ENGINE=InnoDB;
-- change vals to decimal(12,4)?
@@ -245,6 +279,7 @@ CREATE TABLE measurement (
mid smallint(6) NOT NULL AUTO_INCREMENT,
mname varchar(80) NOT NULL,
vid smallint(6) NOT NULL DEFAULT 1,
eid smallint(6) UNSIGNED DEFAULT NULL,
nval tinyint(1) UNSIGNED NOT NULL DEFAULT 1,
val1 int(10) NOT NULL,
val2 int(10) DEFAULT NULL,
@@ -253,8 +288,11 @@ CREATE TABLE measurement (
accuracy enum('unknown','precise','normal','rough','estimated') NOT NULL DEFAULT 'unknown',
mdate date DEFAULT NULL,
note varchar(80) DEFAULT NULL,
eid smallint(6) UNSIGNED DEFAULT NULL,
PRIMARY KEY (mid)
PRIMARY KEY (mid),
FOREIGN KEY fk_measurement_vessel (vid)
REFERENCES vessel(vid),
FOREIGN KEY fk_measurement_equipment (eid)
REFERENCES equipment(eid)
) ENGINE=InnoDB;
CREATE TABLE provisions (
@@ -273,7 +311,11 @@ CREATE TABLE provisions (
shelflife date DEFAULT NULL,
price decimal(12,2) DEFAULT NULL,
remarks varchar(150) DEFAULT NULL,
PRIMARY KEY (provid)
PRIMARY KEY (provid),
FOREIGN KEY fk_provisions_storage (sid)
REFERENCES storage(sid),
FOREIGN KEY fk_provisions_box (boxid)
REFERENCES box(boxid)
) ENGINE=InnoDB;
/* TODO
@@ -322,9 +364,17 @@ CREATE TABLE maintenance (
eid smallint(6) UNSIGNED DEFAULT NULL,
series smallint(6) DEFAULT NULL,
activities varchar(40) NOT NULL,
plan_date DATE DEFAULT NULL,
completion_date DATE DEFAULT NULL,
interval_hours smallint(6) DEFAULT NULL,
last_hours int(10) DEFAULT NULL,
remarks varchar(150) DEFAULT NULL,
maintstate enum('new','planned','ongoing','done') NOT NULL DEFAULT 'new',
PRIMARY KEY (maintid)
PRIMARY KEY (maintid),
FOREIGN KEY fk_maintenance_vessel (vid)
REFERENCES vessel(vid),
FOREIGN KEY fk_maintenance_equipment (eid)
REFERENCES equipment(eid)
) ENGINE=InnoDB;
/* TODO? time recording */
@@ -340,9 +390,14 @@ CREATE TABLE project (
costs_final decimal(12,2) DEFAULT NULL,
remarks varchar(150) DEFAULT NULL,
projstate enum('new','plan','ongoing','paused','finished') NOT NULL DEFAULT 'new',
PRIMARY KEY (projid)
PRIMARY KEY (projid),
FOREIGN KEY fk_project_vessel (vid)
REFERENCES vessel(vid),
FOREIGN KEY fk_project_user (responsible)
REFERENCES user(userid)
) ENGINE=InnoDB;
/* TODO executed_by : company or user? or both? */
CREATE TABLE task (
taskid int(10) NOT NULL AUTO_INCREMENT,
vid smallint(6) DEFAULT NULL,
@@ -356,13 +411,16 @@ CREATE TABLE task (
started datetime DEFAULT NULL,
finished datetime DEFAULT NULL,
responsible smallint(6) NOT NULL,
/* TODO executed_by : company or user? or both? */
PRIMARY KEY (taskid),
FOREIGN KEY fk_task_user (responsible)
REFERENCES user(userid)
REFERENCES user(userid),
FOREIGN KEY fk_task_vessel (vid)
REFERENCES vessel(vid),
FOREIGN KEY fk_task_project (projid)
REFERENCES project(projid)
) ENGINE=InnoDB;
/* Notes can be assigned to tasks,maintenances and equipment */
/* Notes can be assigned to tasks, maintenances and equipment */
CREATE TABLE note (
noteid int(10) NOT NULL AUTO_INCREMENT,
notetype enum('task','maint','equip') NOT NULL DEFAULT 'task',
@@ -376,28 +434,38 @@ CREATE TABLE checklist (
title varchar(30) NOT NULL,
parent smallint(6) DEFAULT NULL,
clstate enum('new','open','closed') NOT NULL DEFAULT 'new',
PRIMARY KEY (clid)
PRIMARY KEY (clid),
FOREIGN KEY fk_checklist_parent (parent)
REFERENCES checklist(clid)
) ENGINE=InnoDB;
CREATE TABLE checkgroup (
groupid smallint(6) UNSIGNED NOT NULL,
title varchar(30) NOT NULL,
PRIMARY KEY (groupid)
) ENGINE=InnoDB;
CREATE TABLE checkitem (
checkid int(10) NOT NULL AUTO_INCREMENT,
checkname varchar(60) NOT NULL,
groupid tinyint(3) DEFAULT NULL,
groupid smallint(6) UNSIGNED DEFAULT NULL,
checkresult enum('unchecked','checked','unused') NOT NULL DEFAULT 'unused',
PRIMARY KEY (checkid)
PRIMARY KEY (checkid),
FOREIGN KEY fk_checkitem_group (groupid)
REFERENCES checkgroup(groupid)
) ENGINE=InnoDB;
CREATE TABLE checkref (
clid smallint(6) NOT NULL,
checkid int(10) NOT NULL,
sort smallint(6) DEFAULT NULL,
PRIMARY KEY (clid, checkid)
) ENGINE=InnoDB;
CREATE TABLE checkgroup (
groupid int(10) NOT NULL,
title varchar(30) NOT NULL,
PRIMARY KEY (groupid)
PRIMARY KEY (clid, checkid),
FOREIGN KEY fk_checkref_checklist (clid)
REFERENCES checklist(clid)
ON DELETE CASCADE,
FOREIGN KEY fk_checkref_checkitem (checkid)
REFERENCES checkitem(checkid)
ON DELETE CASCADE
) ENGINE=InnoDB;
/* Expansion for future use: signalk mapping (just an idea) */
@@ -410,5 +478,7 @@ CREATE TABLE signalk (
skpath varchar(255) NOT NULL,
PRIMARY KEY (skid),
UNIQUE KEY ix_signalk
(vid, objtype, objid, datatype)
(vid, objtype, objid, datatype),
FOREIGN KEY fk_signalk_vessel (vid)
REFERENCES vessel(vid)
) ENGINE=InnoDB;