diff --git a/common/models/db_models.py b/common/models/db_models.py index cc40b023..22a86c2f 100644 --- a/common/models/db_models.py +++ b/common/models/db_models.py @@ -44,7 +44,7 @@ class APPLICATION(Base, EntityHelper): VERSION = Column(String(255), nullable=False) FACILITY_ID = Column(ForeignKey('FACILITY.ID'), nullable=False) - FACILITY = relationship('FACILITY', primaryjoin='APPLICATION.FACILITY_ID == FACILITY.ID', backref='applications') + FACILITY = relationship('FACILITY', primaryjoin='APPLICATION.FACILITY_ID == FACILITY.ID', backref='APPLICATION') class FACILITY(Base, EntityHelper): @@ -89,9 +89,9 @@ class DATACOLLECTIONDATAFILE(Base, EntityHelper): DATACOLLECTION = relationship('DATACOLLECTION', primaryjoin='DATACOLLECTIONDATAFILE.DATACOLLECTION_ID == DATACOLLECTION.ID', - backref='datacollectiondatafiles') + backref='DATACOLLECTIONDATAFILE') DATAFILE = relationship('DATAFILE', primaryjoin='DATACOLLECTIONDATAFILE.DATAFILE_ID == DATAFILE.ID', - backref='datacollectiondatafiles') + backref='DATACOLLECTIONDATAFILE') class DATACOLLECTIONDATASET(Base, EntityHelper): @@ -110,9 +110,9 @@ class DATACOLLECTIONDATASET(Base, EntityHelper): DATACOLLECTION = relationship('DATACOLLECTION', primaryjoin='DATACOLLECTIONDATASET.DATACOLLECTION_ID == DATACOLLECTION.ID', - backref='datacollectiondatasets') + backref='DATACOLLECTIONDATASET') DATASET = relationship('DATASET', primaryjoin='DATACOLLECTIONDATASET.DATASET_ID == DATASET.ID', - backref='datacollectiondatasets') + backref='DATACOLLECTIONDATASET') class DATACOLLECTIONPARAMETER(Base, EntityHelper): @@ -137,10 +137,10 @@ class DATACOLLECTIONPARAMETER(Base, EntityHelper): DATACOLLECTION = relationship('DATACOLLECTION', primaryjoin='DATACOLLECTIONPARAMETER.DATACOLLECTION_ID == DATACOLLECTION.ID', - backref='datacollectionparameters') + backref='DATACOLLECTIONPARAMETER') PARAMETERTYPE = relationship('PARAMETERTYPE', primaryjoin='DATACOLLECTIONPARAMETER.PARAMETER_TYPE_ID == PARAMETERTYPE.ID', - backref='datacollectionparameters') + backref='DATACOLLECTIONPARAMETER') class DATAFILE(Base, EntityHelper): @@ -166,8 +166,8 @@ class DATAFILE(Base, EntityHelper): DATASET_ID = Column(ForeignKey('DATASET.ID'), nullable=False) DATAFILEFORMAT = relationship('DATAFILEFORMAT', primaryjoin='DATAFILE.DATAFILEFORMAT_ID == DATAFILEFORMAT.ID', - backref='datafiles') - DATASET = relationship('DATASET', primaryjoin='DATAFILE.DATASET_ID == DATASET.ID', backref='datafiles') + backref='DATAFILE') + DATASET = relationship('DATASET', primaryjoin='DATAFILE.DATASET_ID == DATASET.ID', backref='DATAFILE') class DATAFILEFORMAT(Base, EntityHelper): @@ -188,7 +188,7 @@ class DATAFILEFORMAT(Base, EntityHelper): FACILITY_ID = Column(ForeignKey('FACILITY.ID'), nullable=False) FACILITY = relationship('FACILITY', primaryjoin='DATAFILEFORMAT.FACILITY_ID == FACILITY.ID', - backref='datafileformats') + backref='DATAFILEFORMAT') class DATAFILEPARAMETER(Base, EntityHelper): @@ -212,9 +212,9 @@ class DATAFILEPARAMETER(Base, EntityHelper): PARAMETER_TYPE_ID = Column(ForeignKey('PARAMETERTYPE.ID'), nullable=False, index=True) DATAFILE = relationship('DATAFILE', primaryjoin='DATAFILEPARAMETER.DATAFILE_ID == DATAFILE.ID', - backref='datafileparameters') + backref='DATAFILEPARAMETER') PARAMETERTYPE = relationship('PARAMETERTYPE', primaryjoin='DATAFILEPARAMETER.PARAMETER_TYPE_ID == PARAMETERTYPE.ID', - backref='datafileparameters') + backref='DATAFILEPARAMETER') class DATASET(Base, EntityHelper): @@ -240,9 +240,9 @@ class DATASET(Base, EntityHelper): TYPE_ID = Column(ForeignKey('DATASETTYPE.ID'), nullable=False, index=True) INVESTIGATION = relationship('INVESTIGATION', primaryjoin='DATASET.INVESTIGATION_ID == INVESTIGATION.ID', - backref='datasets') - SAMPLE = relationship('SAMPLE', primaryjoin='DATASET.SAMPLE_ID == SAMPLE.ID', backref='datasets') - DATASETTYPE = relationship('DATASETTYPE', primaryjoin='DATASET.TYPE_ID == DATASETTYPE.ID', backref='datasets') + backref='DATASET') + SAMPLE = relationship('SAMPLE', primaryjoin='DATASET.SAMPLE_ID == SAMPLE.ID', backref='DATASET') + DATASETTYPE = relationship('DATASETTYPE', primaryjoin='DATASET.TYPE_ID == DATASETTYPE.ID', backref='DATASET') class DATASETPARAMETER(Base, EntityHelper): @@ -266,9 +266,9 @@ class DATASETPARAMETER(Base, EntityHelper): PARAMETER_TYPE_ID = Column(ForeignKey('PARAMETERTYPE.ID'), nullable=False, index=True) DATASET = relationship('DATASET', primaryjoin='DATASETPARAMETER.DATASET_ID == DATASET.ID', - backref='datasetparameters') + backref='DATASETPARAMETER') PARAMETERTYPE = relationship('PARAMETERTYPE', primaryjoin='DATASETPARAMETER.PARAMETER_TYPE_ID == PARAMETERTYPE.ID', - backref='datasetparameters') + backref='DATASETPARAMETER') class DATASETTYPE(Base, EntityHelper): @@ -286,7 +286,7 @@ class DATASETTYPE(Base, EntityHelper): NAME = Column(String(255), nullable=False) FACILITY_ID = Column(ForeignKey('FACILITY.ID'), nullable=False) - FACILITY = relationship('FACILITY', primaryjoin='DATASETTYPE.FACILITY_ID == FACILITY.ID', backref='datasettypes') + FACILITY = relationship('FACILITY', primaryjoin='DATASETTYPE.FACILITY_ID == FACILITY.ID', backref='DATASETTYPE') class FACILITYCYCLE(Base, EntityHelper): @@ -307,7 +307,7 @@ class FACILITYCYCLE(Base, EntityHelper): FACILITY_ID = Column(ForeignKey('FACILITY.ID'), nullable=False) FACILITY = relationship('FACILITY', primaryjoin='FACILITYCYCLE.FACILITY_ID == FACILITY.ID', - backref='facilitycycles') + backref='FACILITYCYCLE') class GROUPING(Base, EntityHelper): @@ -339,7 +339,7 @@ class INSTRUMENT(Base, EntityHelper): URL = Column(String(255)) FACILITY_ID = Column(ForeignKey('FACILITY.ID'), nullable=False) - FACILITY = relationship('FACILITY', primaryjoin='INSTRUMENT.FACILITY_ID == FACILITY.ID', backref='instruments') + FACILITY = relationship('FACILITY', primaryjoin='INSTRUMENT.FACILITY_ID == FACILITY.ID', backref='INSTRUMENT') class INSTRUMENTSCIENTIST(Base, EntityHelper): @@ -357,8 +357,8 @@ class INSTRUMENTSCIENTIST(Base, EntityHelper): USER_ID = Column(ForeignKey('USER_.ID'), nullable=False) INSTRUMENT = relationship('INSTRUMENT', primaryjoin='INSTRUMENTSCIENTIST.INSTRUMENT_ID == INSTRUMENT.ID', - backref='instrumentscientists') - USER_ = relationship('USER', primaryjoin='INSTRUMENTSCIENTIST.USER_ID == USER.ID', backref='instrumentscientists') + backref='INSTRUMENTSCIENTIST') + USER_ = relationship('USER', primaryjoin='INSTRUMENTSCIENTIST.USER_ID == USER.ID', backref='INSTRUMENTSCIENTIST') class INVESTIGATION(Base, EntityHelper): @@ -384,9 +384,9 @@ class INVESTIGATION(Base, EntityHelper): TYPE_ID = Column(ForeignKey('INVESTIGATIONTYPE.ID'), nullable=False, index=True) FACILITY = relationship('FACILITY', primaryjoin='INVESTIGATION.FACILITY_ID == FACILITY.ID', - backref='investigations') + backref='INVESTIGATION') INVESTIGATIONTYPE = relationship('INVESTIGATIONTYPE', primaryjoin='INVESTIGATION.TYPE_ID == INVESTIGATIONTYPE.ID', - backref='investigations') + backref='INVESTIGATION') class INVESTIGATIONGROUP(Base, EntityHelper): @@ -405,9 +405,9 @@ class INVESTIGATIONGROUP(Base, EntityHelper): INVESTIGATION_ID = Column(ForeignKey('INVESTIGATION.ID'), nullable=False, index=True) GROUPING = relationship('GROUPING', primaryjoin='INVESTIGATIONGROUP.GROUP_ID == GROUPING.ID', - backref='investigationgroups') + backref='INVESTIGATIONGROUP') INVESTIGATION = relationship('INVESTIGATION', primaryjoin='INVESTIGATIONGROUP.INVESTIGATION_ID == INVESTIGATION.ID', - backref='investigationgroups') + backref='INVESTIGATIONGROUP') class INVESTIGATIONINSTRUMENT(Base, EntityHelper): @@ -425,10 +425,10 @@ class INVESTIGATIONINSTRUMENT(Base, EntityHelper): INVESTIGATION_ID = Column(ForeignKey('INVESTIGATION.ID'), nullable=False) INSTRUMENT = relationship('INSTRUMENT', primaryjoin='INVESTIGATIONINSTRUMENT.INSTRUMENT_ID == INSTRUMENT.ID', - backref='investigationinstruments') + backref='INVESTIGATIONINSTRUMENT') INVESTIGATION = relationship('INVESTIGATION', primaryjoin='INVESTIGATIONINSTRUMENT.INVESTIGATION_ID == INVESTIGATION.ID', - backref='investigationinstruments') + backref='INVESTIGATIONINSTRUMENT') class INVESTIGATIONPARAMETER(Base, EntityHelper): @@ -453,10 +453,10 @@ class INVESTIGATIONPARAMETER(Base, EntityHelper): INVESTIGATION = relationship('INVESTIGATION', primaryjoin='INVESTIGATIONPARAMETER.INVESTIGATION_ID == INVESTIGATION.ID', - backref='investigationparameters') + backref='INVESTIGATIONPARAMETER') PARAMETERTYPE = relationship('PARAMETERTYPE', primaryjoin='INVESTIGATIONPARAMETER.PARAMETER_TYPE_ID == PARAMETERTYPE.ID', - backref='investigationparameters') + backref='INVESTIGATIONPARAMETER') class INVESTIGATIONTYPE(Base, EntityHelper): @@ -475,7 +475,7 @@ class INVESTIGATIONTYPE(Base, EntityHelper): FACILITY_ID = Column(ForeignKey('FACILITY.ID'), nullable=False, index=True) FACILITY = relationship('FACILITY', primaryjoin='INVESTIGATIONTYPE.FACILITY_ID == FACILITY.ID', - backref='investigationtypes') + backref='INVESTIGATIONTYPE') class INVESTIGATIONUSER(Base, EntityHelper): @@ -494,8 +494,8 @@ class INVESTIGATIONUSER(Base, EntityHelper): USER_ID = Column(ForeignKey('USER_.ID'), nullable=False) INVESTIGATION = relationship('INVESTIGATION', primaryjoin='INVESTIGATIONUSER.INVESTIGATION_ID == INVESTIGATION.ID', - backref='investigationusers') - USER_ = relationship('USER', primaryjoin='INVESTIGATIONUSER.USER_ID == USER.ID', backref='investigationusers') + backref='INVESTIGATIONUSER') + USER_ = relationship('USER', primaryjoin='INVESTIGATIONUSER.USER_ID == USER.ID', backref='INVESTIGATIONUSER') class JOB(Base, EntityHelper): @@ -511,11 +511,10 @@ class JOB(Base, EntityHelper): INPUTDATACOLLECTION_ID = Column(ForeignKey('DATACOLLECTION.ID'), index=True) OUTPUTDATACOLLECTION_ID = Column(ForeignKey('DATACOLLECTION.ID'), index=True) - APPLICATION = relationship('APPLICATION', primaryjoin='JOB.APPLICATION_ID == APPLICATION.ID', backref='jobs') + APPLICATION = relationship('APPLICATION', primaryjoin='JOB.APPLICATION_ID == APPLICATION.ID', backref='JOB') DATACOLLECTION = relationship('DATACOLLECTION', primaryjoin='JOB.INPUTDATACOLLECTION_ID == DATACOLLECTION.ID', - backref='datacollection_jobs') - DATACOLLECTION1 = relationship('DATACOLLECTION', primaryjoin='JOB.OUTPUTDATACOLLECTION_ID == DATACOLLECTION.ID', - backref='datacollection_jobs_0') + backref='JOB') + class KEYWORD(Base, EntityHelper): @@ -533,7 +532,7 @@ class KEYWORD(Base, EntityHelper): INVESTIGATION_ID = Column(ForeignKey('INVESTIGATION.ID'), nullable=False, index=True) INVESTIGATION = relationship('INVESTIGATION', primaryjoin='KEYWORD.INVESTIGATION_ID == INVESTIGATION.ID', - backref='keywords') + backref='KEYWORD') class PARAMETERTYPE(Base, EntityHelper): @@ -564,7 +563,7 @@ class PARAMETERTYPE(Base, EntityHelper): FACILITY_ID = Column(ForeignKey('FACILITY.ID'), nullable=False) FACILITY = relationship('FACILITY', primaryjoin='PARAMETERTYPE.FACILITY_ID == FACILITY.ID', - backref='parametertypes') + backref='PARAMETERTYPE') class PERMISSIBLESTRINGVALUE(Base, EntityHelper): @@ -583,7 +582,7 @@ class PERMISSIBLESTRINGVALUE(Base, EntityHelper): PARAMETERTYPE = relationship('PARAMETERTYPE', primaryjoin='PERMISSIBLESTRINGVALUE.PARAMETERTYPE_ID == PARAMETERTYPE.ID', - backref='permissiblestringvalues') + backref='PERMISSIBLESTRINGVALUE') class PUBLICATION(Base, EntityHelper): @@ -602,7 +601,7 @@ class PUBLICATION(Base, EntityHelper): INVESTIGATION_ID = Column(ForeignKey('INVESTIGATION.ID'), nullable=False, index=True) INVESTIGATION = relationship('INVESTIGATION', primaryjoin='PUBLICATION.INVESTIGATION_ID == INVESTIGATION.ID', - backref='publications') + backref='PUBLICATION') class PUBLICSTEP(Base, EntityHelper): @@ -636,9 +635,7 @@ class RELATEDDATAFILE(Base, EntityHelper): SOURCE_DATAFILE_ID = Column(ForeignKey('DATAFILE.ID'), nullable=False) DATAFILE = relationship('DATAFILE', primaryjoin='RELATEDDATAFILE.DEST_DATAFILE_ID == DATAFILE.ID', - backref='datafile_relateddatafiles') - DATAFILE1 = relationship('DATAFILE', primaryjoin='RELATEDDATAFILE.SOURCE_DATAFILE_ID == DATAFILE.ID', - backref='datafile_relateddatafiles_0') + backref='RELATEDDATAFILE') class RULE(Base, EntityHelper): @@ -663,7 +660,7 @@ class RULE(Base, EntityHelper): WHAT = Column(String(1024), nullable=False) GROUPING_ID = Column(ForeignKey('GROUPING.ID'), index=True) - GROUPING = relationship('GROUPING', primaryjoin='RULE.GROUPING_ID == GROUPING.ID', backref='rules') + GROUPING = relationship('GROUPING', primaryjoin='RULE.GROUPING_ID == GROUPING.ID', backref='RULE') class SAMPLE(Base, EntityHelper): @@ -682,8 +679,8 @@ class SAMPLE(Base, EntityHelper): SAMPLETYPE_ID = Column(ForeignKey('SAMPLETYPE.ID'), index=True) INVESTIGATION = relationship('INVESTIGATION', primaryjoin='SAMPLE.INVESTIGATION_ID == INVESTIGATION.ID', - backref='samples') - SAMPLETYPE = relationship('SAMPLETYPE', primaryjoin='SAMPLE.SAMPLETYPE_ID == SAMPLETYPE.ID', backref='samples') + backref='SAMPLE') + SAMPLETYPE = relationship('SAMPLETYPE', primaryjoin='SAMPLE.SAMPLETYPE_ID == SAMPLETYPE.ID', backref='SAMPLE') class SAMPLEPARAMETER(Base, EntityHelper): @@ -707,8 +704,8 @@ class SAMPLEPARAMETER(Base, EntityHelper): PARAMETER_TYPE_ID = Column(ForeignKey('PARAMETERTYPE.ID'), nullable=False, index=True) PARAMETERTYPE = relationship('PARAMETERTYPE', primaryjoin='SAMPLEPARAMETER.PARAMETER_TYPE_ID == PARAMETERTYPE.ID', - backref='sampleparameters') - SAMPLE = relationship('SAMPLE', primaryjoin='SAMPLEPARAMETER.SAMPLE_ID == SAMPLE.ID', backref='sampleparameters') + backref='SAMPLEPARAMETER') + SAMPLE = relationship('SAMPLE', primaryjoin='SAMPLEPARAMETER.SAMPLE_ID == SAMPLE.ID', backref='SAMPLEPARAMETER') class SESSION(Base, EntityHelper): @@ -736,7 +733,7 @@ class SHIFT(Base, EntityHelper): INVESTIGATION_ID = Column(ForeignKey('INVESTIGATION.ID'), nullable=False) INVESTIGATION = relationship('INVESTIGATION', primaryjoin='SHIFT.INVESTIGATION_ID == INVESTIGATION.ID', - backref='shifts') + backref='SHIFT') class USER(Base, EntityHelper): @@ -767,8 +764,8 @@ class USERGROUP(Base, EntityHelper): GROUP_ID = Column(ForeignKey('GROUPING.ID'), nullable=False, index=True) USER_ID = Column(ForeignKey('USER_.ID'), nullable=False) - GROUPING = relationship('GROUPING', primaryjoin='USERGROUP.GROUP_ID == GROUPING.ID', backref='usergroups') - USER_ = relationship('USER', primaryjoin='USERGROUP.USER_ID == USER.ID', backref='usergroups') + GROUPING = relationship('GROUPING', primaryjoin='USERGROUP.GROUP_ID == GROUPING.ID', backref='USERGROUP') + USER_ = relationship('USER', primaryjoin='USERGROUP.USER_ID == USER.ID', backref='USERGROUP') class STUDYINVESTIGATION(Base, EntityHelper): @@ -786,8 +783,8 @@ class STUDYINVESTIGATION(Base, EntityHelper): STUDY_ID = Column(ForeignKey('STUDY.ID'), nullable=False) INVESTIGATION = relationship('INVESTIGATION', primaryjoin='STUDYINVESTIGATION.INVESTIGATION_ID == INVESTIGATION.ID', - backref='studyinvestigations') - STUDY = relationship('STUDY', primaryjoin='STUDYINVESTIGATION.STUDY_ID == STUDY.ID', backref='studyinvestigations') + backref='STUDYINVESTIGATION') + STUDY = relationship('STUDY', primaryjoin='STUDYINVESTIGATION.STUDY_ID == STUDY.ID', backref='STUDYINVESTIGATION') class STUDY(Base, EntityHelper): @@ -804,7 +801,7 @@ class STUDY(Base, EntityHelper): STATUS = Column(Integer) USER_ID = Column(ForeignKey('USER_.ID'), index=True) - USER_ = relationship('USER', primaryjoin='STUDY.USER_ID == USER.ID', backref='studies') + USER_ = relationship('USER', primaryjoin='STUDY.USER_ID == USER.ID', backref='STUDY') class SAMPLETYPE(Base, EntityHelper): @@ -823,4 +820,4 @@ class SAMPLETYPE(Base, EntityHelper): SAFETYINFORMATION = Column(String(4000)) FACILITY_ID = Column(ForeignKey('FACILITY.ID'), nullable=False) - FACILITY = relationship('FACILITY', primaryjoin='SAMPLETYPE.FACILITY_ID == FACILITY.ID', backref='sampletypes') + FACILITY = relationship('FACILITY', primaryjoin='SAMPLETYPE.FACILITY_ID == FACILITY.ID', backref='SAMPLETYPE')