grahamc/hydra2 - Change WKZLAYIEIH2VQJGFTDZAVL2ILQWI32X5UZA7Y6YBVE7LVVS5A2TQC

Fix check in jobsets

The current check happening in jobsets is incorrect. The wanted constraint is stated as follow :

If type is 0 (legacy), then the flake field should be null, and both nixExprInput and nixExprPath should be non-null
If type is 1 (flake), then the flake field should be non-null, and both nixExprInput and nixExprPath should be null

The current version will not catch (i.e. it will accept) situations where you have for instance : type = 1, nixExprPath null, nixExprInput non-null, flake non-null

This commit fixes that.

I split(ted) that into two constraints, to make it more readable and easier to extend if a new type appears in the future.

The complete query could be instead : ( type = 0 AND nixExprInput IS NOT NULL AND nixExprPath IS NOT NULL AND flake IS NULL ) OR ( type = 1 AND nixExprInput IS NULL AND nixExprPath IS NULL AND flake IS NOT NULL )

(but an "OR" cannot be split, hence the other formulation)

Created by Ismaël Bouya on February 1, 2021

WKZLAYIEIH2VQJGFTDZAVL2ILQWI32X5UZA7Y6YBVE7LVVS5A2TQC

Dependencies

In channels

main

Change contents

Replacement in src/sql/hydra.sql at line 87 [4.1]

B:BD[3.4039] → [2.537:537]

∅:D[2.537] → [5.0:34]

∅:D[6.784] → [5.0:34]

∅:D[7.1044] → [5.0:34]

∅:D[3.4039] → [5.0:34]

∅:D[8.4843] → [5.0:34]

B:BD[9.1325] → [5.0:34]

B:BD[5.34] → [7.1045:1172]

    check (schedulingShares > 0),
    check ((type = 0) = (nixExprInput is not null and nixExprPath is not null)),
    check ((type = 1) = (flake is not null)),

[3.4039]

[10.5479]

    constraint jobsets_schedulingshares_nonzero_check check (schedulingShares > 0),
    constraint jobsets_type_known_check   check (type = 0 or type = 1),
    -- If the type is 0, then nixExprInput and nixExprPath should be non-null and other type-specific fields should be null
    -- Otherwise the check passes
    constraint jobsets_legacy_paths_check check ((type = 0) = (nixExprInput is not null and nixExprPath is not null and flake is     null)),
    -- If the type is 1, then flake should be non-null and other type-specific fields should be null
    -- Otherwise the check passes
    constraint jobsets_flake_paths_check  check ((type = 1) = (nixExprInput is     null and nixExprPath is     null and flake is not null)),

File addition: upgrade-74.sql (----------)

[11.3004]

alter table Jobsets add constraint jobsets_type_known_check   check (type = 0 or type = 1);
alter table Jobsets add constraint jobsets_legacy_paths_check check ((type = 0) = (nixExprInput is not null and nixExprPath is not null and flake is     null));
alter table Jobsets add constraint jobsets_flake_paths_check  check ((type = 1) = (nixExprInput is     null and nixExprPath is     null and flake is not null));
alter table Jobsets add constraint jobsets_schedulingshares_nonzero_check check (schedulingShares > 0);
alter table Jobsets drop constraint if exists jobsets_schedulingshares_check;
alter table Jobsets drop constraint if exists jobsets_check;
alter table Jobsets drop constraint if exists jobsets_check1;
alter table Jobsets drop constraint if exists jobsets_check2;