Skip to content

Commit 341fbec

Browse files
gfrngithub-actions[bot]DiamondLightSource-build-server
authored
Bump schema version from v4.11.0 to v4.12.0 (#245)
* Bump schema version from v4.11.0 to v4.12.0 * Update ISPyB ORM schema to database schema v4.12.0 (#246) Generated with sqlacodegen 3.0.0rc5 SQLAlchemy 2.0.46 Co-authored-by: ISPyB-API Azure build <DiamondLightSource-build-server@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: ISPyB-API Azure build <DiamondLightSource-build-server@users.noreply.github.com>
1 parent 172a250 commit 341fbec

3 files changed

Lines changed: 47 additions & 2 deletions

File tree

.github/workflows/test-and-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55

66
env:
7-
DATABASE_SCHEMA: 4.11.0
7+
DATABASE_SCHEMA: 4.12.0
88

99
permissions:
1010
contents: read

HISTORY.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ History
55
Unreleased / main
66
-------------------
77

8+
11.1.2 (2026-02-13)
9+
-------------------
10+
11+
* Update database schema to v4.12.0
12+
813
11.1.1 (2026-01-13)
914
-------------------
1015

src/ispyb/sqlalchemy/_auto_db_schema.py

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__schema_version__ = "4.11.0"
1+
__schema_version__ = "4.12.0"
22
import datetime
33
import decimal
44
from typing import List, Optional
@@ -7102,12 +7102,18 @@ class SSXDataCollection(Base):
71027102
class AutoProcProgram(Base):
71037103
__tablename__ = "AutoProcProgram"
71047104
__table_args__ = (
7105+
ForeignKeyConstraint(
7106+
["parentAutoProcProgramId"],
7107+
["AutoProcProgram.autoProcProgramId"],
7108+
name="AutoProcProgram_fk_parentAutoProcProgramId",
7109+
),
71057110
ForeignKeyConstraint(
71067111
["processingJobId"],
71077112
["ProcessingJob.processingJobId"],
71087113
name="AutoProcProgram_FK2",
71097114
),
71107115
Index("AutoProcProgram_FK2", "processingJobId"),
7116+
Index("AutoProcProgram_fk_parentAutoProcProgramId", "parentAutoProcProgramId"),
71117117
)
71127118

71137119
autoProcProgramId: Mapped[int] = mapped_column(
@@ -7139,7 +7145,18 @@ class AutoProcProgram(Base):
71397145
)
71407146
processingJobId: Mapped[Optional[int]] = mapped_column(INTEGER(11))
71417147
processingPipelineId: Mapped[Optional[int]] = mapped_column(INTEGER(11))
7148+
parentAutoProcProgramId: Mapped[Optional[int]] = mapped_column(INTEGER(10))
71427149

7150+
AutoProcProgram: Mapped["AutoProcProgram"] = relationship(
7151+
"AutoProcProgram",
7152+
remote_side=[autoProcProgramId],
7153+
back_populates="AutoProcProgram_reverse",
7154+
)
7155+
AutoProcProgram_reverse: Mapped[List["AutoProcProgram"]] = relationship(
7156+
"AutoProcProgram",
7157+
remote_side=[parentAutoProcProgramId],
7158+
back_populates="AutoProcProgram",
7159+
)
71437160
ProcessingJob: Mapped["ProcessingJob"] = relationship(
71447161
"ProcessingJob", back_populates="AutoProcProgram"
71457162
)
@@ -8286,6 +8303,29 @@ class ProcessedTomogram(Base):
82868303
processingType: Mapped[Optional[str]] = mapped_column(
82878304
String(255), comment="nature of the processed tomogram"
82888305
)
8306+
feature: Mapped[Optional[str]] = mapped_column(
8307+
Enum(
8308+
"Membrane",
8309+
"Microtubule",
8310+
"Ribosome",
8311+
"Tric",
8312+
"Actin",
8313+
"Cytoplasm",
8314+
"Cytoplasmic granule",
8315+
"Lipid droplet",
8316+
"Mitochondrial granule",
8317+
"Mitochondrion",
8318+
"Npc",
8319+
"Nuclear envelope",
8320+
"Nucleus",
8321+
"Prohibitin",
8322+
"Proteasome",
8323+
"Vault",
8324+
"Vimentin",
8325+
"Void",
8326+
),
8327+
comment="Tomogram feature",
8328+
)
82898329

82908330
Tomogram: Mapped["Tomogram"] = relationship(
82918331
"Tomogram", back_populates="ProcessedTomogram"

0 commit comments

Comments
 (0)