Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.0
1.3.1
6 changes: 3 additions & 3 deletions src/ensembl/production/metadata/api/models/assembly.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
from sqlalchemy.dialects.mysql import TINYINT
from sqlalchemy.orm import relationship

from ensembl.production.metadata.api.models.base import Base
from ensembl.production.metadata.api.models.base import Base, LoadAble


class Assembly(Base):
class Assembly(LoadAble, Base):
__tablename__ = 'assembly'

assembly_id = Column(Integer, primary_key=True)
Expand All @@ -42,7 +42,7 @@ class Assembly(Base):
genomes = relationship("Genome", back_populates="assembly", cascade="all, delete, delete-orphan")


class AssemblySequence(Base):
class AssemblySequence(LoadAble, Base):
__tablename__ = 'assembly_sequence'
__table_args__ = (
Index('assembly_sequence_assembly_id_accession_5f3e5119_uniq', 'assembly_id', 'accession', unique=True),
Expand Down
8 changes: 4 additions & 4 deletions src/ensembl/production/metadata/api/models/genome.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
from sqlalchemy.dialects.mysql import DATETIME, TINYINT
from sqlalchemy.orm import relationship

from ensembl.production.metadata.api.models.base import Base
from ensembl.production.metadata.api.models.base import Base, LoadAble


class Genome(Base):
class Genome(LoadAble, Base):
__tablename__ = "genome"

genome_id = Column(Integer, primary_key=True)
Expand All @@ -38,7 +38,7 @@ class Genome(Base):
organism = relationship("Organism", back_populates="genomes")


class GenomeDataset(Base):
class GenomeDataset(LoadAble, Base):
__tablename__ = "genome_dataset"

genome_dataset_id = Column(Integer, primary_key=True)
Expand All @@ -58,7 +58,7 @@ class GenomeDataset(Base):
ensembl_release = relationship("EnsemblRelease", back_populates="genome_datasets")


class GenomeRelease(Base):
class GenomeRelease(LoadAble, Base):
__tablename__ = "genome_release"

genome_release_id = Column(Integer, primary_key=True)
Expand Down
8 changes: 4 additions & 4 deletions src/ensembl/production/metadata/api/models/organism.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
from sqlalchemy.dialects.mysql import TINYINT
from sqlalchemy.orm import relationship

from ensembl.production.metadata.api.models.base import Base
from ensembl.production.metadata.api.models.base import Base, LoadAble


class Organism(Base):
class Organism(LoadAble, Base):
__tablename__ = "organism"

organism_id = Column(Integer, primary_key=True)
Expand All @@ -39,7 +39,7 @@ class Organism(Base):
# organim_id and taxonomy_id to taxonomy_node #DIFFERENT DATABASE


class OrganismGroup(Base):
class OrganismGroup(LoadAble, Base):
__tablename__ = "organism_group"
__table_args__ = (
Index("group_type_name_63c2f6ac_uniq", "type", "name", unique=True),
Expand All @@ -57,7 +57,7 @@ class OrganismGroup(Base):
# none


class OrganismGroupMember(Base):
class OrganismGroupMember(LoadAble, Base):
__tablename__ = "organism_group_member"
__table_args__ = (
Index("organism_group_member_organism_id_organism_gro_fe8f49ac_uniq", "organism_id", "organism_group_id",
Expand Down
6 changes: 3 additions & 3 deletions src/ensembl/production/metadata/api/models/release.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
from sqlalchemy.dialects.mysql import TINYINT
from sqlalchemy.orm import relationship

from ensembl.production.metadata.api.models.base import Base
from ensembl.production.metadata.api.models.base import Base, LoadAble


class EnsemblSite(Base):
class EnsemblSite(LoadAble, Base):
__tablename__ = 'ensembl_site'

site_id = Column(Integer, primary_key=True)
Expand All @@ -30,7 +30,7 @@ class EnsemblSite(Base):
# none


class EnsemblRelease(Base):
class EnsemblRelease(LoadAble, Base):
__tablename__ = 'ensembl_release'
__table_args__ = (
Index('ensembl_release_version_site_id_b743399a_uniq', 'version', 'site_id', unique=True),
Expand Down