db/routines/vn/triggers/roadmapStop_beforeUpdate.sql

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

db/versions/11416-goldenTulip/09-firstScript.sql

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