Skip to content

Commit 76672d2

Browse files
committed
fixup! editoast, front, schemas: remove features field in rs model and remove SignalingSystem enum
1 parent cc883e3 commit 76672d2

File tree

4 files changed

+10
-15
lines changed

4 files changed

+10
-15
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
ALTER TABLE rolling_stock
2-
ADD features text[] NOT NULL DEFAULT '{}',
3-
ALTER COLUMN supported_signaling_systems DROP DEFAULT,
4-
ALTER COLUMN supported_signaling_systems type jsonb USING Array_to_json(supported_signaling_systems::text[]),
5-
DROP CONSTRAINT supported_signaling_systems_no_nulls,
6-
ALTER COLUMN supported_signaling_systems SET DEFAULT ('["BAPR", "BAL", "TVM300", "TVM430"]');
2+
ADD features text [] NOT NULL DEFAULT '{}',
3+
ALTER COLUMN supported_signaling_systems type jsonb USING Array_to_json(supported_signaling_systems::text []),
4+
ALTER COLUMN supported_signaling_systems
5+
SET DEFAULT ('["BAPR", "BAL", "TVM300", "TVM430"]');
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
2-
ALTER TABLE rolling_stock
3-
DROP COLUMN features,
4-
ALTER COLUMN supported_signaling_systems DROP DEFAULT,
5-
ALTER COLUMN supported_signaling_systems TYPE TEXT[] USING TRANSLATE(supported_signaling_systems::jsonb::text, '[]','{}')::TEXT[],
6-
ADD CONSTRAINT supported_signaling_systems_no_nulls CHECK (array_position(supported_signaling_systems, NULL) IS NULL),
7-
ALTER COLUMN supported_signaling_systems SET DEFAULT ('{"BAPR", "BAL", "TVM300", "TVM430"}');
1+
ALTER TABLE rolling_stock DROP COLUMN features,
2+
ALTER COLUMN supported_signaling_systems DROP DEFAULT,
3+
ALTER COLUMN supported_signaling_systems TYPE TEXT [] USING TRANSLATE(
4+
supported_signaling_systems::jsonb::text, '[]', '{}')::TEXT [];

front/src/modules/rollingStock/helpers/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ export const rollingStockEditorQueryArg = (
168168
modes: validCurves,
169169
},
170170
base_power_class: data.basePowerClass,
171-
supported_signaling_systems: []
171+
supported_signaling_systems: [],
172172
};
173173
};
174174

python/osrd_schemas/osrd_schemas/rolling_stock.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
from enum import Enum
2-
from typing import Annotated, List, Literal, Mapping, Optional, Union, get_args
2+
from typing import List, Literal, Mapping, Optional, Union, get_args
33

44
from pydantic import (
55
BaseModel,
66
Field,
77
NonNegativeFloat,
88
PositiveFloat,
99
RootModel,
10-
StringConstraints,
1110
model_validator,
1211
)
1312

0 commit comments

Comments
 (0)