From b1c6545d06433f70770d61bac5d9db8c134753aa Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 3 Apr 2021 20:01:43 +0200
Subject: [PATCH] update data
---
src/covid19/blueprints/ecdc/ecdc_model.py | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/covid19/blueprints/ecdc/ecdc_model.py b/src/covid19/blueprints/ecdc/ecdc_model.py
index 6d48d938..9f3500a2 100644
--- a/src/covid19/blueprints/ecdc/ecdc_model.py
+++ b/src/covid19/blueprints/ecdc/ecdc_model.py
@@ -5,10 +5,10 @@ from covid19.blueprints.application.application_model import ApplicationDateRepo
class EcdcDateReported(ApplicationDateReported):
- __tablename__ = 'ecdc_data_date_reported'
- __mapper_args__ = { 'concrete': True }
+ __tablename__ = 'ecdc_date_reported'
+ __mapper_args__ = {'concrete': True}
__table_args__ = (
- db.UniqueConstraint('date_reported', 'datum', name="uix_ecdc_data_date_reported"),
+ db.UniqueConstraint('date_reported', 'datum', name="uix_ecdc_date_reported"),
)
id = db.Column(db.Integer, primary_key=True)
@@ -76,10 +76,10 @@ class EcdcDateReported(ApplicationDateReported):
class EcdcContinent(ApplicationRegion):
- __tablename__ = 'ecdc_data_country_continent'
+ __tablename__ = 'ecdc_country_continent'
__mapper_args__ = {'concrete': True}
__table_args__ = (
- db.UniqueConstraint('region', name="uix_ecdc_data_country_continent"),
+ db.UniqueConstraint('region', name="uix_ecdc_country_continent"),
)
id = db.Column(db.Integer, primary_key=True)
@@ -87,14 +87,14 @@ class EcdcContinent(ApplicationRegion):
class EcdcCountry(db.Model):
- __tablename__ = 'ecdc_data_country'
+ __tablename__ = 'ecdc_country'
__mapper_args__ = {'concrete': True}
__table_args__ = (
db.UniqueConstraint(
'countries_and_territories',
'geo_id',
'country_territory_code',
- name="uix_ecdc_data_country"
+ name="uix_ecdc_country"
),
)
@@ -104,7 +104,7 @@ class EcdcCountry(db.Model):
geo_id = db.Column(db.String(255), nullable=False)
country_territory_code = db.Column(db.String(255), nullable=False)
- continent_id = db.Column(db.Integer, db.ForeignKey('ecdc_data_country_continent.id'), nullable=False)
+ continent_id = db.Column(db.Integer, db.ForeignKey('ecdc_country_continent.id'), nullable=False)
continent = db.relationship(
'EcdcContinent',
lazy='subquery', cascade="all, delete",
@@ -184,21 +184,21 @@ class EcdcCountry(db.Model):
class EcdcData(db.Model):
- __tablename__ = 'ecdc_data'
+ __tablename__ = 'ecdc'
id = db.Column(db.Integer, primary_key=True)
deaths = db.Column(db.Integer, nullable=False)
cases = db.Column(db.Integer, nullable=False)
cumulative_number_for_14_days_of_covid19_cases_per_100000 = db.Column(db.Float, nullable=False)
- ecdc_country_id = db.Column(db.Integer, db.ForeignKey('ecdc_data_country.id'), nullable=False)
+ ecdc_country_id = db.Column(db.Integer, db.ForeignKey('ecdc_country.id'), nullable=False)
ecdc_country = db.relationship(
'EcdcCountry',
lazy='subquery', cascade="all, delete",
order_by='asc(EcdcCountry.countries_and_territories)'
)
- ecdc_date_reported_id = db.Column(db.Integer, db.ForeignKey('ecdc_data_date_reported.id'), nullable=False)
+ ecdc_date_reported_id = db.Column(db.Integer, db.ForeignKey('ecdc_date_reported.id'), nullable=False)
ecdc_date_reported = db.relationship(
'EcdcDateReported',
lazy='joined', cascade='all, delete',
--
GitLab