Showing
5 changed files
with
17 additions
and
17 deletions
| 1 | from sqlalchemy.orm import Mapped, mapped_column | 1 | from sqlalchemy.orm import Mapped, mapped_column |
| 2 | -from presupuestov1.schema import BaseModel | 2 | +from presupuestov1.model import Base |
| 3 | 3 | ||
| 4 | from sqlalchemy import ( | 4 | from sqlalchemy import ( |
| 5 | Integer, | 5 | Integer, |
| ... | @@ -11,7 +11,7 @@ from sqlalchemy import ( | ... | @@ -11,7 +11,7 @@ from sqlalchemy import ( |
| 11 | ) | 11 | ) |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | -class ActecoEstado(BaseModel): | 14 | +class ActecoEstado(Base): |
| 15 | __tablename__ = "finfun_estado" | 15 | __tablename__ = "finfun_estado" |
| 16 | __table_args__ = ( | 16 | __table_args__ = ( |
| 17 | Index("idx_acteco_estado_acteco", "acteco"), | 17 | Index("idx_acteco_estado_acteco", "acteco"), |
| ... | @@ -46,7 +46,7 @@ class ActecoEstado(BaseModel): | ... | @@ -46,7 +46,7 @@ class ActecoEstado(BaseModel): |
| 46 | top3_pct: Mapped[float | None] = mapped_column(Numeric) | 46 | top3_pct: Mapped[float | None] = mapped_column(Numeric) |
| 47 | 47 | ||
| 48 | 48 | ||
| 49 | -class ActecoEntidad(BaseModel): | 49 | +class ActecoEntidad(Base): |
| 50 | __tablename__ = "acteco_entidad" | 50 | __tablename__ = "acteco_entidad" |
| 51 | __table_args__ = ( | 51 | __table_args__ = ( |
| 52 | Index("idx_finfun_entidad_acteco", "acteco"), | 52 | Index("idx_finfun_entidad_acteco", "acteco"), | ... | ... |
| 1 | from sqlalchemy.orm import Mapped, mapped_column | 1 | from sqlalchemy.orm import Mapped, mapped_column |
| 2 | -from presupuestov1.schema import BaseModel | 2 | +from presupuestov1.model import Base |
| 3 | 3 | ||
| 4 | from sqlalchemy import ( | 4 | from sqlalchemy import ( |
| 5 | Integer, | 5 | Integer, |
| ... | @@ -12,7 +12,7 @@ from sqlalchemy import ( | ... | @@ -12,7 +12,7 @@ from sqlalchemy import ( |
| 12 | from sqlalchemy.dialects.postgresql import JSONB | 12 | from sqlalchemy.dialects.postgresql import JSONB |
| 13 | 13 | ||
| 14 | 14 | ||
| 15 | -class ClasInstitucional(BaseModel): | 15 | +class ClasInstitucional(Base): |
| 16 | __tablename__ = "clas_institucional" | 16 | __tablename__ = "clas_institucional" |
| 17 | 17 | ||
| 18 | entidad: Mapped[int] = mapped_column(Integer, primary_key=True) | 18 | entidad: Mapped[int] = mapped_column(Integer, primary_key=True) | ... | ... |
| 1 | from sqlalchemy.orm import Mapped, mapped_column | 1 | from sqlalchemy.orm import Mapped, mapped_column |
| 2 | -from presupuestov1.schema import BaseModel | 2 | +from presupuestov1.model import Base |
| 3 | 3 | ||
| 4 | from sqlalchemy import ( | 4 | from sqlalchemy import ( |
| 5 | Integer, | 5 | Integer, |
| ... | @@ -11,7 +11,7 @@ from sqlalchemy import ( | ... | @@ -11,7 +11,7 @@ from sqlalchemy import ( |
| 11 | ) | 11 | ) |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | -class EntidadesPorFinfun(BaseModel): | 14 | +class EntidadesPorFinfun(Base): |
| 15 | __tablename__ = "entidades_por_finfun" | 15 | __tablename__ = "entidades_por_finfun" |
| 16 | __table_args__ = ( | 16 | __table_args__ = ( |
| 17 | Index("idx_entidades_por_finfun_finfun", "finfun"), | 17 | Index("idx_entidades_por_finfun_finfun", "finfun"), |
| ... | @@ -25,7 +25,7 @@ class EntidadesPorFinfun(BaseModel): | ... | @@ -25,7 +25,7 @@ class EntidadesPorFinfun(BaseModel): |
| 25 | entidad_desc: Mapped[str | None] = mapped_column(Text) | 25 | entidad_desc: Mapped[str | None] = mapped_column(Text) |
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | -class FinfunEstado(BaseModel): | 28 | +class FinfunEstado(Base): |
| 29 | __tablename__ = "finfun_estado" | 29 | __tablename__ = "finfun_estado" |
| 30 | __table_args__ = ( | 30 | __table_args__ = ( |
| 31 | Index("idx_finfun_estado_finfun", "finfun"), | 31 | Index("idx_finfun_estado_finfun", "finfun"), |
| ... | @@ -60,7 +60,7 @@ class FinfunEstado(BaseModel): | ... | @@ -60,7 +60,7 @@ class FinfunEstado(BaseModel): |
| 60 | top3_pct: Mapped[float | None] = mapped_column(Numeric) | 60 | top3_pct: Mapped[float | None] = mapped_column(Numeric) |
| 61 | 61 | ||
| 62 | 62 | ||
| 63 | -class FinfunEntidad(BaseModel): | 63 | +class FinfunEntidad(Base): |
| 64 | __tablename__ = "finfun_entidad" | 64 | __tablename__ = "finfun_entidad" |
| 65 | __table_args__ = ( | 65 | __table_args__ = ( |
| 66 | Index("idx_finfun_entidad_finfun", "finfun"), | 66 | Index("idx_finfun_entidad_finfun", "finfun"), | ... | ... |
| 1 | from sqlalchemy.orm import Mapped, mapped_column | 1 | from sqlalchemy.orm import Mapped, mapped_column |
| 2 | -from presupuestov1.schema import BaseModel | 2 | +from presupuestov1.model import Base |
| 3 | 3 | ||
| 4 | from sqlalchemy import ( | 4 | from sqlalchemy import ( |
| 5 | Integer, | 5 | Integer, |
| ... | @@ -11,7 +11,7 @@ from sqlalchemy import ( | ... | @@ -11,7 +11,7 @@ from sqlalchemy import ( |
| 11 | ) | 11 | ) |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | -class EntidadesPorObjeto(BaseModel): | 14 | +class EntidadesPorObjeto(Base): |
| 15 | __tablename__ = "entidades_por_objeto" | 15 | __tablename__ = "entidades_por_objeto" |
| 16 | __table_args__ = ( | 16 | __table_args__ = ( |
| 17 | Index("idx_entidades_por_objeto_objeto", "objeto"), | 17 | Index("idx_entidades_por_objeto_objeto", "objeto"), |
| ... | @@ -25,7 +25,7 @@ class EntidadesPorObjeto(BaseModel): | ... | @@ -25,7 +25,7 @@ class EntidadesPorObjeto(BaseModel): |
| 25 | entidad_desc: Mapped[str | None] = mapped_column(Text) | 25 | entidad_desc: Mapped[str | None] = mapped_column(Text) |
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | -class ObjetoEstado(BaseModel): | 28 | +class ObjetoEstado(Base): |
| 29 | __tablename__ = "objeto_estado" | 29 | __tablename__ = "objeto_estado" |
| 30 | __table_args__ = ( | 30 | __table_args__ = ( |
| 31 | Index("idx_objeto_estado_objeto", "objeto"), | 31 | Index("idx_objeto_estado_objeto", "objeto"), |
| ... | @@ -60,7 +60,7 @@ class ObjetoEstado(BaseModel): | ... | @@ -60,7 +60,7 @@ class ObjetoEstado(BaseModel): |
| 60 | top3_pct: Mapped[float | None] = mapped_column(Numeric) | 60 | top3_pct: Mapped[float | None] = mapped_column(Numeric) |
| 61 | 61 | ||
| 62 | 62 | ||
| 63 | -class ObjetoEntidad(BaseModel): | 63 | +class ObjetoEntidad(Base): |
| 64 | __tablename__ = "objeto_entidad" | 64 | __tablename__ = "objeto_entidad" |
| 65 | __table_args__ = ( | 65 | __table_args__ = ( |
| 66 | Index("idx_finfun_entidad_objeto", "objeto"), | 66 | Index("idx_finfun_entidad_objeto", "objeto"), | ... | ... |
| 1 | from sqlalchemy.orm import Mapped, mapped_column | 1 | from sqlalchemy.orm import Mapped, mapped_column |
| 2 | -from presupuestov1.schema import BaseModel | 2 | +from presupuestov1.model import Base |
| 3 | 3 | ||
| 4 | from sqlalchemy import ( | 4 | from sqlalchemy import ( |
| 5 | Integer, | 5 | Integer, |
| ... | @@ -11,7 +11,7 @@ from sqlalchemy import ( | ... | @@ -11,7 +11,7 @@ from sqlalchemy import ( |
| 11 | ) | 11 | ) |
| 12 | 12 | ||
| 13 | 13 | ||
| 14 | -class TreemapObjeto(BaseModel): | 14 | +class TreemapObjeto(Base): |
| 15 | __tablename__ = "treemap_objeto" | 15 | __tablename__ = "treemap_objeto" |
| 16 | __table_args__ = ( | 16 | __table_args__ = ( |
| 17 | Index("idx_treemap_objeto_gestion_entidad", "gestion", "entidad"), | 17 | Index("idx_treemap_objeto_gestion_entidad", "gestion", "entidad"), |
| ... | @@ -28,7 +28,7 @@ class TreemapObjeto(BaseModel): | ... | @@ -28,7 +28,7 @@ class TreemapObjeto(BaseModel): |
| 28 | devengado: Mapped[float | None] = mapped_column(Numeric) | 28 | devengado: Mapped[float | None] = mapped_column(Numeric) |
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | -class TreemapFinFun(BaseModel): | 31 | +class TreemapFinFun(Base): |
| 32 | __tablename__ = "treemap_finfun" | 32 | __tablename__ = "treemap_finfun" |
| 33 | __table_args__ = ( | 33 | __table_args__ = ( |
| 34 | Index("idx_treemap_finfun_gestion_entidad", "gestion", "entidad"), | 34 | Index("idx_treemap_finfun_gestion_entidad", "gestion", "entidad"), |
| ... | @@ -45,7 +45,7 @@ class TreemapFinFun(BaseModel): | ... | @@ -45,7 +45,7 @@ class TreemapFinFun(BaseModel): |
| 45 | devengado: Mapped[float | None] = mapped_column(Numeric) | 45 | devengado: Mapped[float | None] = mapped_column(Numeric) |
| 46 | 46 | ||
| 47 | 47 | ||
| 48 | -class TreemapActeco(BaseModel): | 48 | +class TreemapActeco(Base): |
| 49 | __tablename__ = "treemap_acteco" | 49 | __tablename__ = "treemap_acteco" |
| 50 | __table_args__ = ( | 50 | __table_args__ = ( |
| 51 | Index("idx_treemap_acteco_gestion_entidad", "gestion", "entidad"), | 51 | Index("idx_treemap_acteco_gestion_entidad", "gestion", "entidad"), | ... | ... |
-
Please register or login to post a comment