Skip to content

Commit 82a7fe5

Browse files
committed
aliases not being applied on table creation
1 parent 3c36286 commit 82a7fe5

1 file changed

Lines changed: 44 additions & 9 deletions

File tree

src/murfey/util/db.py

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

416416

417417
class DataCollectionGroup(SQLModel, table=True): # type: ignore
418-
id: int = Field(primary_key=True, unique=True, alias="dataCollectionGroupId")
418+
id: int = Field(
419+
primary_key=True,
420+
unique=True,
421+
alias="dataCollectionGroupId",
422+
sa_column_kwargs={"name": "dataCollectionGroupId"},
423+
)
419424
session_id: int = Field(foreign_key="session.id", primary_key=True)
420425
tag: str = Field(primary_key=True)
421426
atlas_id: Optional[int] = None
@@ -479,10 +484,17 @@ class NotificationValue(SQLModel, table=True): # type: ignore
479484

480485

481486
class DataCollection(SQLModel, table=True): # type: ignore
482-
id: int = Field(primary_key=True, unique=True, alias="dataCollectionId")
487+
id: int = Field(
488+
primary_key=True,
489+
unique=True,
490+
alias="dataCollectionId",
491+
sa_column_kwargs={"name": "dataCollectionId"},
492+
)
483493
tag: str = Field(primary_key=True)
484494
dcg_id: int = Field(
485-
foreign_key="datacollectiongroup.id", alias="dataCollectionGroupId"
495+
foreign_key="datacollectiongroup.id",
496+
alias="dataCollectionGroupId",
497+
sa_column_kwargs={"name": "dataCollectionGroupId"},
486498
)
487499
data_collection_group: Optional[DataCollectionGroup] = Relationship(
488500
back_populates="data_collections"
@@ -502,9 +514,18 @@ class DataCollection(SQLModel, table=True): # type: ignore
502514

503515

504516
class ProcessingJob(SQLModel, table=True): # type: ignore
505-
id: int = Field(primary_key=True, unique=True, alias="processingJobId")
517+
id: int = Field(
518+
primary_key=True,
519+
unique=True,
520+
alias="processingJobId",
521+
sa_column_kwargs={"name": "processingJobId"},
522+
)
506523
recipe: str = Field(primary_key=True)
507-
dc_id: int = Field(foreign_key="datacollection.id", alias="dataCollectionId")
524+
dc_id: int = Field(
525+
foreign_key="datacollection.id",
526+
alias="dataCollectionId",
527+
sa_column_kwargs={"name": "dataCollectionId"},
528+
)
508529
data_collection: Optional[DataCollection] = Relationship(
509530
back_populates="processing_jobs"
510531
)
@@ -592,8 +613,17 @@ class TomographyProcessingParameters(SQLModel, table=True): # type: ignore
592613

593614

594615
class AutoProcProgram(SQLModel, table=True): # type: ignore
595-
id: int = Field(primary_key=True, unique=True, alias="autoProcProgramId")
596-
pj_id: int = Field(foreign_key="processingjob.id", alias="processingJobId")
616+
id: int = Field(
617+
primary_key=True,
618+
unique=True,
619+
alias="autoProcProgramId",
620+
sa_column_kwargs={"name": "autoProcProgramId"},
621+
)
622+
pj_id: int = Field(
623+
foreign_key="processingjob.id",
624+
alias="processingJobId",
625+
sa_column_kwargs={"name": "processingJobId"},
626+
)
597627
processing_job: Optional[ProcessingJob] = Relationship(
598628
back_populates="auto_proc_programs"
599629
)
@@ -763,10 +793,15 @@ class SearchMap(SQLModel, table=True): # type: ignore
763793

764794
class Movie(SQLModel, table=True): # type: ignore
765795
murfey_id: int = Field(
766-
primary_key=True, foreign_key="murfeyledger.id", alias="movieId"
796+
primary_key=True,
797+
foreign_key="murfeyledger.id",
798+
alias="movieId",
799+
sa_column_kwargs={"name": "movieId"},
767800
)
768801
data_collection_id: Optional[int] = Field(
769-
foreign_key="datacollection.id", alias="dataCollectionId"
802+
foreign_key="datacollection.id",
803+
alias="dataCollectionId",
804+
sa_column_kwargs={"name": "dataCollectionId"},
770805
)
771806
foil_hole_id: int = Field(foreign_key="foilhole.id", nullable=True, default=None)
772807
path: str

0 commit comments

Comments
 (0)