db/models/ch_experimentdb_experiment_data_model.py

@@ -1,14 +1,14 @@
-from db.models.base import Base, int_pk_incr
-from sqlalchemy import Sequence
+from sqlalchemy import Identity
 from sqlalchemy.orm import Mapped, mapped_column
 
+from db.models.base import Base
+
 
 class ChExperimentDBExperimentData(Base):
     __tablename__ = 'ch_experimentdb_experiment_data'
 
-    id: Mapped[int] = mapped_column(primary_key=True,
-                                    autoincrement=True,
-                                    server_default=Sequence('ch_experimentdb_experiment_data_id_seq', start=11).next_value())
+    id: Mapped[int] = mapped_column(Identity(start=11, cycle=True),
+                                    primary_key=True)
     volume: Mapped[float]
     nitrogen_oxide_emission: Mapped[float]
     temperature: Mapped[float]

db/models/experiment_data_model.py

@@ -1,17 +1,16 @@
 from typing import Optional
-from sqlalchemy import Sequence
-from db.models.base import Base, int_pk_incr
+
+from sqlalchemy import Identity
 from sqlalchemy.orm import Mapped, mapped_column
 
-id_seq = Sequence('experiment_data_id_seq', start=186581)
+from db.models.base import Base
 
 
 class ExperimentData(Base):
     __tablename__ = 'experiment_data'
 
-    id: Mapped[int] = mapped_column(primary_key=True,
-                                    autoincrement=True,
-                                    server_default=Sequence('experiment_data_id_seq', start=186581).next_value())
+    id: Mapped[int] = mapped_column(Identity(start=21, cycle=True),
+                                    primary_key=True)
     direction: Mapped[float]
     temperature: Mapped[float]
     nox: Mapped[float]

db/models/experiment_parameters_model.py

@@ -1,16 +1,16 @@
 from typing import Optional
-from sqlalchemy import Sequence
-from sqlalchemy import ForeignKey
 
-from db.models.base import Base, int_pk_incr
+from sqlalchemy import ForeignKey, Identity
 from sqlalchemy.orm import Mapped, mapped_column
 
+from db.models.base import Base
+
+
 class ExperimentParameters(Base):
     __tablename__ = 'experiment_parameters'
 
-    id: Mapped[int] = mapped_column(primary_key=True,
-                                    autoincrement=True,
-                                    server_default=Sequence('experiment_parameters_id_seq', start=11).next_value())
+    id: Mapped[int] = mapped_column(Identity(start=11, cycle=True),
+                                    primary_key=True)
     outer_blades_count: Mapped[int]
     outer_blades_length: Mapped[float]
     outer_blades_angle: Mapped[float]

db/models/load_parameters_model.py

@@ -1,14 +1,14 @@
-from db.models.base import Base, int_pk_incr
-from sqlalchemy import Sequence
+from sqlalchemy import Identity
 from sqlalchemy.orm import Mapped, mapped_column
 
+from db.models.base import Base
+
 
 class LoadParameters(Base):
     __tablename__ = 'load_parameters'
 
-    id: Mapped[int] = mapped_column(primary_key=True,
-                                    autoincrement=True,
-                                    server_default=Sequence('load_parameters_id_seq', start=6).next_value())
+    id: Mapped[int] = mapped_column(Identity(start=6, cycle=True),
+                                    primary_key=True)
     load: Mapped[int]
     primary_air_consumption: Mapped[float]
     secondary_air_consumption: Mapped[float]

db/models/recycling_parameters_model.py

@@ -1,17 +1,17 @@
 from typing import Optional
-from sqlalchemy import Sequence
 
-from sqlalchemy import ForeignKey
+from sqlalchemy import ForeignKey, Identity
+from sqlalchemy.orm import Mapped, mapped_column
 
 from db.models.base import Base
-from sqlalchemy.orm import Mapped, mapped_column
+
 
 class RecyclingParameters(Base):
     __tablename__ = 'recycling_parameters'
 
-    id: Mapped[int] = mapped_column(primary_key=True,
-                                    autoincrement=True,
-                                    server_default=Sequence('recycling_parameters_id_seq', start=41).next_value())
+    id: Mapped[int] = mapped_column(Identity(start=6, cycle=True),
+                                    primary_key=True)
+
     load_id: Mapped[Optional[int]] = mapped_column(ForeignKey('load_parameters.id', ondelete='SET NULL'))
     recycling_level: Mapped[int]
     co2: Mapped[float]