From fc0ff3794f381ee90231a595a6993d6f4058b4c6 Mon Sep 17 00:00:00 2001
From: thomaswoehlke <thomas.woehlke@gmail.com>
Date: Sat, 13 Feb 2021 21:42:10 +0100
Subject: [PATCH] * Fixed #123 split RkiBundeslaenderService into two Services,
one for bundeslaender and one for landkreise * Fixed #128 add fields from csv
to RkiLandkreiseImport * Fixed #139 refactor RkiBundeslaenderServiceDownload
to new method scheme introduced 07.02.2021 * Fixed #140 move WhoImport to RKI
in: rk_service_import.py * Fixed #125 implement RkiLandkreise * Fixed #126
implement RkiBundeslaenderImport
---
src/covid19/blueprints/ecdc/ecdc_model.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/covid19/blueprints/ecdc/ecdc_model.py b/src/covid19/blueprints/ecdc/ecdc_model.py
index 2c2f9d36..c6a7372e 100644
--- a/src/covid19/blueprints/ecdc/ecdc_model.py
+++ b/src/covid19/blueprints/ecdc/ecdc_model.py
@@ -10,7 +10,7 @@ class EcdcDateReported(ApplicationDateReported):
'concrete': True
}
__table_args__ = (
- db.UniqueConstraint('date_reported', 'datum', name="uix_europe_date_reported"),
+ db.UniqueConstraint('date_reported', 'datum', name="uix_ecdc_date_reported"),
)
id = db.Column(db.Integer, primary_key=True)
@@ -53,7 +53,7 @@ class EcdcContinent(ApplicationRegion):
__tablename__ = 'ecdc_continent'
__mapper_args__ = {'concrete': True}
__table_args__ = (
- db.UniqueConstraint('region', name="uix_europe_continent"),
+ db.UniqueConstraint('region', name="uix_ecdc_continent"),
)
id = db.Column(db.Integer, primary_key=True)
@@ -63,7 +63,7 @@ class EcdcContinent(ApplicationRegion):
class EcdcCountry(db.Model):
__tablename__ = 'ecdc_country'
__table_args__ = (
- db.UniqueConstraint('countries_and_territories', 'geo_id', 'country_territory_code', name="uix_europe_country"),
+ db.UniqueConstraint('countries_and_territories', 'geo_id', 'country_territory_code', name="uix_ecdc_country"),
)
id = db.Column(db.Integer, primary_key=True)
@@ -132,11 +132,11 @@ class EcdcData(db.Model):
cases_weekly = db.Column(db.Integer, nullable=False)
notification_rate_per_100000_population_14days = db.Column(db.Float, nullable=False)
- europe_country_id = db.Column(db.Integer, db.ForeignKey('ecdc_country.id'), nullable=False)
- europe_country = db.relationship('EcdcCountry', lazy='joined', cascade="all, delete")
+ ecdc_country_id = db.Column(db.Integer, db.ForeignKey('ecdc_country.id'), nullable=False)
+ ecdc_country = db.relationship('EcdcCountry', lazy='joined', cascade="all, delete")
- europe_date_reported_id = db.Column(db.Integer, db.ForeignKey('ecdc_date_reported.id'), nullable=False)
- europe_date_reported = db.relationship(
+ 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