verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

8524-devToTest #3415

Merged
alexm merged 343 commits from 8524-devToTest into test 2025-02-04 13:42:16 +00:00
Conversation 0 Commits 343 Files Changed 127 +4 -3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8dc803b5df - Show all commits

6
db/routines/vn/triggers/roadmapStop_beforeUpdate.sql
View File

@ -13,7 +13,7 @@ BEGIN
END IF; END IF;
IF (NOT (NEW.roadmapFk <=> OLD.roadmapFk) AND NEW.roadmapFk IS NOT NULL) IF (NOT (NEW.roadmapFk <=> OLD.roadmapFk) AND NEW.roadmapFk IS NOT NULL)
OR (NOT (NEW.eta <=> OLD.eta) AND NEW.eta IS NOT NULL) THEN OR (NOT (NEW.eta <=> OLD.eta)) THEN
IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN IF NEW.eta < (SELECT etd FROM roadmap WHERE id = NEW.roadmapFk) THEN
CALL util.throw('Departure time can not be after arrival time'); CALL util.throw('Departure time can not be after arrival time');
@ -24,7 +24,7 @@ BEGIN
WHERE roadmapFk = NEW.roadmapFk WHERE roadmapFk = NEW.roadmapFk
AND id <> OLD.id; AND id <> OLD.id;
IF vMaxEta IS NULL OR NEW.eta > vMaxEta THEN IF vMaxEta < NEW.eta OR vMaxEta IS NULL THEN
SET vMaxEta = NEW.eta; SET vMaxEta = NEW.eta;
END IF; END IF;
@ -32,7 +32,7 @@ BEGIN
FROM roadmap FROM roadmap
WHERE id = NEW.roadmapFk; WHERE id = NEW.roadmapFk;
IF vMaxEta <> vCurrentEta THEN IF (vMaxEta <> vCurrentEta OR vMaxEta IS NULL) OR vMaxEta IS NOT NULL THEN
UPDATE roadmap UPDATE roadmap
SET eta = vMaxEta SET eta = vMaxEta
WHERE id = NEW.roadmapFk; WHERE id = NEW.roadmapFk;

1
db/versions/11416-goldenTulip/09-firstScript.sql Normal file
View File

@ -0,0 +1 @@
CREATE INDEX route_dated_IDX USING BTREE ON vn.route (dated);