From 0059661626dc86eade515f44a8f559b5251db211 Mon Sep 17 00:00:00 2001 From: Inohara Date: Mon, 21 Oct 2024 13:25:59 +0400 Subject: [PATCH] =?UTF-8?q?=D1=82=D0=B5=D0=BF=D0=B5=D1=80=D1=8C=20=D1=82?= =?UTF-8?q?=D0=BE=D1=87=D0=BD=D0=BE=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= =?UTF-8?q?=D0=B5=D1=82=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D1=81=20=D0=B8=D0=BD=D0=BA=D1=80=D0=B5=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D1=82=D0=BE=D0=BC=20=D0=B0=D0=B9=D0=B4=D0=B8=D1=88?= =?UTF-8?q?=D0=BD=D0=B8=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/models/ch_experimentdb_experiment_data_model.py | 10 +++++----- db/models/experiment_data_model.py | 13 ++++++------- db/models/experiment_parameters_model.py | 14 +++++++------- db/models/load_parameters_model.py | 10 +++++----- db/models/recycling_parameters_model.py | 14 +++++++------- 5 files changed, 30 insertions(+), 31 deletions(-) diff --git a/db/models/ch_experimentdb_experiment_data_model.py b/db/models/ch_experimentdb_experiment_data_model.py index 1c70683..eb68185 100644 --- a/db/models/ch_experimentdb_experiment_data_model.py +++ b/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] diff --git a/db/models/experiment_data_model.py b/db/models/experiment_data_model.py index d5611fc..07c2e17 100644 --- a/db/models/experiment_data_model.py +++ b/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] @@ -20,4 +19,4 @@ class ExperimentData(Base): file_id: Mapped[Optional[str]] def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/db/models/experiment_parameters_model.py b/db/models/experiment_parameters_model.py index 69e3df5..dd02a27 100644 --- a/db/models/experiment_parameters_model.py +++ b/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] @@ -20,4 +20,4 @@ class ExperimentParameters(Base): experiment_hash: Mapped[str] def __repr__(self): - return f"" \ No newline at end of file + return f"" diff --git a/db/models/load_parameters_model.py b/db/models/load_parameters_model.py index 98cda7e..ffb5a8a 100644 --- a/db/models/load_parameters_model.py +++ b/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] diff --git a/db/models/recycling_parameters_model.py b/db/models/recycling_parameters_model.py index 7baa544..507b261 100644 --- a/db/models/recycling_parameters_model.py +++ b/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] @@ -20,4 +20,4 @@ class RecyclingParameters(Base): o2: Mapped[float] def __repr__(self): - return f"" \ No newline at end of file + return f""