update

src/dbschema.rs

@@ -305,7 +305,8 @@ pub async fn initdb<E: Executor>(db: &mut E) -> () {
         handwashing_facilities real,
         hospital_beds_per_thousand real,
         life_expectancy real,
-        human_development_index
+        human_development_index,
+        excess_mortality
 )",
         "CREATE UNIQUE INDEX owid_raw_uniq_idx ON owid_raw (date_julian, iso_code)",
     ];

src/dbschema/owid.rs

@@ -84,6 +84,7 @@ pub struct OWID {
     pub hospital_beds_per_thousand: Option<f64>,
     pub life_expectancy: Option<f64>,
     pub human_development_index: Option<f64>,
+    pub excess_mortality: Option<f64>,
 }
 
 impl OWID {
@@ -151,11 +152,12 @@ impl OWID {
             .bind(self.hospital_beds_per_thousand)
             .bind(self.life_expectancy)
             .bind(self.human_development_index)
+            .bind(self.excess_mortality)
     }
 
     /// Gets an INSERT INTO string representing all the values in the table.
     pub fn insert_str() -> &'static str {
-        "INSERT INTO owid_raw VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
+        "INSERT INTO owid_raw VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
     }
 
     /// Sets all date fields in the struct to appropriate representations of the

src/loader/owidloader.rs

@@ -85,6 +85,7 @@ pub struct OWIDRecord {
     pub hospital_beds_per_thousand: Option<f64>,
     pub life_expectancy: Option<f64>,
     pub human_development_index: Option<f64>,
+    pub excess_mortality: Option<f64>,
 }
 
 pub fn parse_to_final<A: Iterator<Item = csv::StringRecord>>(
@@ -159,7 +160,8 @@ pub async fn load<'a, A: std::io::Read>(
             "handwashing_facilities",
             "hospital_beds_per_thousand",
             "life_expectancy",
-            "human_development_index"
+            "human_development_index",
+            "excess_mortality",
         ],
         rdr.headers().unwrap().iter().collect::<Vec<&str>>()
     );
@@ -227,6 +229,7 @@ pub async fn load<'a, A: std::io::Read>(
             hospital_beds_per_thousand: rec.hospital_beds_per_thousand,
             life_expectancy: rec.life_expectancy,
             human_development_index: rec.human_development_index,
+            excess_mortality: rec.excess_mortality,
         };
         let query = sqlx::query(OWID::insert_str());
         dbrec