Skip to content

Commit 26fad3b

Browse files
committed
autoincrement IDs on data collection related tables (for when not using ISPyB)
1 parent 696880d commit 26fad3b

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

src/murfey/util/db.py

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,9 @@ class Tilt(SQLModel, table=True): # type: ignore
377377

378378

379379
class DataCollectionGroup(SQLModel, table=True): # type: ignore
380-
id: int = Field(primary_key=True, unique=True)
380+
id: int = Field(
381+
primary_key=True, unique=True, sa_column_kwargs={"autoincrement": True}
382+
)
381383
session_id: int = Field(foreign_key="session.id", primary_key=True)
382384
tag: str = Field(primary_key=True)
383385
atlas_id: Optional[int] = None
@@ -429,7 +431,9 @@ class NotificationValue(SQLModel, table=True): # type: ignore
429431

430432

431433
class DataCollection(SQLModel, table=True): # type: ignore
432-
id: int = Field(primary_key=True, unique=True)
434+
id: int = Field(
435+
primary_key=True, unique=True, sa_column_kwargs={"autoincrement": True}
436+
)
433437
tag: str = Field(primary_key=True)
434438
dcg_id: int = Field(foreign_key="datacollectiongroup.id")
435439
data_collection_group: Optional[DataCollectionGroup] = Relationship(
@@ -441,7 +445,9 @@ class DataCollection(SQLModel, table=True): # type: ignore
441445

442446

443447
class ProcessingJob(SQLModel, table=True): # type: ignore
444-
id: int = Field(primary_key=True, unique=True)
448+
id: int = Field(
449+
primary_key=True, unique=True, sa_column_kwargs={"autoincrement": True}
450+
)
445451
recipe: str = Field(primary_key=True)
446452
dc_id: int = Field(foreign_key="datacollection.id")
447453
data_collection: Optional[DataCollection] = Relationship(
@@ -524,7 +530,9 @@ class TomographyProcessingParameters(SQLModel, table=True): # type: ignore
524530

525531

526532
class AutoProcProgram(SQLModel, table=True): # type: ignore
527-
id: int = Field(primary_key=True, unique=True)
533+
id: int = Field(
534+
primary_key=True, unique=True, sa_column_kwargs={"autoincrement": True}
535+
)
528536
pj_id: int = Field(foreign_key="processingjob.id")
529537
processing_job: Optional[ProcessingJob] = Relationship(
530538
back_populates="auto_proc_programs"

0 commit comments

Comments
 (0)