database version check

Author: ghubertpalo

Cargo.lock

@@ -19,14 +19,15 @@ flate2 = "1.0.23"
 hex = "0.4.3"
 mithril-common = { path = "../mithril-common" }
 reqwest = { version = "0.11", features = ["json"] }
-sqlite = "0.27"
+semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9.10"
 slog = { version = "2.7.0", features = ["max_level_trace", "release_max_level_debug"] }
 slog-async = "2.7.0"
 slog-bunyan = "2.4.0"
 slog-scope = "4.4.0"
+sqlite = "0.28"
 tar = "0.4.38"
 thiserror = "1.0.31"
 tokio = { version = "1.17.0", features = ["full"] }

mithril-aggregator/Cargo.toml

@@ -1,5 +1,6 @@
 use clap::{Parser, Subcommand};
 use config::{builder::DefaultState, ConfigBuilder, Map, Source, Value, ValueKind};
+use semver::{Version, VersionReq};
 use slog::Level;
 use slog_scope::debug;
 use sqlite::Connection;
@@ -42,19 +43,20 @@ fn check_database_version(connection: &Connection) -> Result<bool, Box<dyn Error
     provider.create_table_if_not_exists()?;
     let maybe_option = provider.get_database_version()?;
 
-    let _database_version = match maybe_option {
+    let version = match maybe_option {
         None => {
             let provider = VersionUpdatedProvider::new(connection);
             let version = DatabaseVersion {
-                database_version: DATABASE_SCHEMATIC_VERSION.to_string(),
+                database_version: Version::parse(DATABASE_SCHEMATIC_VERSION)?,
                 application_type: ApplicationNodeType::new("aggregator")?,
             };
             provider.save(version)?
         }
         Some(version) => version,
     };
+    let req = VersionReq::parse("~0.1").unwrap();
 
-    Ok(true)
+    Ok(req.matches(&version.database_version))
 }
 
 fn setup_genesis_dependencies(

mithril-aggregator/src/command_args.rs

@@ -28,14 +28,15 @@ nom = "7.1"
 rand-chacha-dalek-compat = { package = "rand_chacha", version = "0.2" }
 rand_chacha = "0.3.1"
 rand_core   = "0.6.3"
+semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_bytes = "0.11.7"
 serde_cbor = "0.11.2"
 serde_json = "1.0"
 serde_yaml = "0.9.10"
 sha2 = "0.10.2"
 slog = { version = "2.7.0", features = ["max_level_trace", "release_max_level_debug"] }
-sqlite = "0.27.0"
+sqlite = "0.28"
 thiserror = "1.0.31"
 tokio = { version = "1.17.0", features = ["full"] }
 walkdir = "2"

mithril-common/Cargo.toml

@@ -1,5 +1,6 @@
 use std::{collections::HashMap, error::Error, fmt::Display};
 
+use semver::Version;
 use sqlite::{Connection, Row, Value};
 
 use crate::sqlite::{HydrationError, Projection, ProjectionField, Provider, SqLiteEntity};
@@ -38,7 +39,7 @@ impl Display for ApplicationNodeType {
 #[derive(Debug, PartialEq, Eq)]
 pub struct DatabaseVersion {
     /// Semver of the database structure.
-    pub database_version: String,
+    pub database_version: Version,
 
     /// Name of the application.
     pub application_type: ApplicationNodeType,
@@ -47,7 +48,8 @@ pub struct DatabaseVersion {
 impl SqLiteEntity for DatabaseVersion {
     fn hydrate(row: Row) -> Result<Self, HydrationError> {
         Ok(Self {
-            database_version: row.get::<String, _>(0),
+            database_version: Version::parse(&row.get::<String, _>(0))
+                .map_err(|e| HydrationError::InvalidData(format!("{}", e)))?,
             application_type: ApplicationNodeType::new(&row.get::<String, _>(1))
                 .map_err(|e| HydrationError::InvalidData(format!("{}", e)))?,
         })
@@ -172,7 +174,7 @@ impl<'conn> VersionUpdatedProvider<'conn> {
     pub fn save(&self, version: DatabaseVersion) -> Result<DatabaseVersion, Box<dyn Error>> {
         let params = [
             Value::String(format!("{}", version.application_type)),
-            Value::String(version.database_version),
+            Value::String(version.database_version.to_string()),
         ];
         let entity = self
             .find(None, &params)?
@@ -249,8 +251,8 @@ where true
 
         assert_eq!(
             r#"
-insert into db_version values (?, ?)
-  on conflict on (application_type) do update set version = excluded.version
+insert into db_version (application_type, version) values (?, ?)
+  on conflict (application_type) do update set version = excluded.version
 returning db_version.version as db_version, db_version.application_type as application_type
 "#,
             provider.get_definition(None)

mithril-common/src/database/db_version.rs

@@ -102,7 +102,7 @@ mod tests {
         }
 
         fn set_field(&mut self, field: ProjectionField) {
-            let _ = self.fields.push(field);
+            self.fields.push(field);
         }
     }
 

mithril-common/src/sqlite/projection.rs

@@ -26,7 +26,7 @@ pub trait Provider<'conn> {
         let cursor = self
             .get_connection()
             .prepare(&sql)
-            .map_err(|e| format!("error=`{:?}, SQL=`{}`", e, &sql.replace("\n", " ").trim()))?
+            .map_err(|e| format!("error=`{:?}, SQL=`{}`", e, &sql.replace('\n', " ").trim()))?
             .into_cursor()
             .bind(params)?;
         let iterator = EntityCursor::new(cursor);
@@ -42,7 +42,6 @@ pub trait Provider<'conn> {
 #[cfg(test)]
 mod tests {
     use super::super::{entity::HydrationError, ProjectionField, SqLiteEntity};
-
     use super::*;
 
     #[derive(Debug, PartialEq)]
@@ -74,7 +73,7 @@ mod tests {
         }
 
         fn set_field(&mut self, field: ProjectionField) {
-            let _ = self.fields.push(field);
+            self.fields.push(field);
         }
     }
 
@@ -179,8 +178,8 @@ returning {projection}
                 "
             drop table if exists provider_test;
             create table provider_test(text_data text not null primary key, real_data real not null, integer_data integer not null, maybe_null integer);
-            insert into provider_test(text_data, real_data, integer_data, maybe_null) values ('row 1', 3.14, -52, null);
-            insert into provider_test(text_data, real_data, integer_data, maybe_null) values ('row 2', 2.72, 1789, 0);
+            insert into provider_test(text_data, real_data, integer_data, maybe_null) values ('row 1', 1.23, -52, null);
+            insert into provider_test(text_data, real_data, integer_data, maybe_null) values ('row 2', 2.34, 1789, 0);
             ",
             )
             .unwrap();
@@ -198,7 +197,7 @@ returning {projection}
         assert_eq!(
             TestEntity {
                 text_data: "row 1".to_string(),
-                real_data: 3.14,
+                real_data: 1.23,
                 integer_data: -52,
                 maybe_null: None
             },
@@ -210,7 +209,7 @@ returning {projection}
         assert_eq!(
             TestEntity {
                 text_data: "row 2".to_string(),
-                real_data: 2.72,
+                real_data: 2.34,
                 integer_data: 1789,
                 maybe_null: Some(0)
             },
@@ -232,7 +231,7 @@ returning {projection}
         assert_eq!(
             TestEntity {
                 text_data: "row 2".to_string(),
-                real_data: 2.72,
+                real_data: 2.34,
                 integer_data: 1789,
                 maybe_null: Some(0)
             },
@@ -245,18 +244,15 @@ returning {projection}
     pub fn test_parameters() {
         let provider = TestEntityProvider::new(init_database());
         let mut cursor = provider
-            .find(
-                Some("text_data like ?"),
-                &[Value::String("%1".to_string())].to_vec(),
-            )
+            .find(Some("text_data like ?"), &[Value::String("%1".to_string())])
             .unwrap();
         let entity = cursor
             .next()
             .expect("there shoud be one result, none returned");
         assert_eq!(
             TestEntity {
                 text_data: "row 1".to_string(),
-                real_data: 3.14,
+                real_data: 1.23,
                 integer_data: -52,
                 maybe_null: None
             },

mithril-common/src/sqlite/provider.rs

@@ -101,9 +101,10 @@ where
         sql: String,
         key: &K,
     ) -> Result<Statement> {
-        let statement = connection
+        let mut statement = connection
             .prepare(sql)
-            .map_err(|e| AdapterError::InitializationError(e.into()))?
+            .map_err(|e| AdapterError::InitializationError(e.into()))?;
+        statement
             .bind::<&str>(1, self.get_hash_from_key(key)?.as_str())
             .map_err(|e| AdapterError::InitializationError(e.into()))?;
 
@@ -165,11 +166,14 @@ where
         })?;
         let mut statement = connection
             .prepare(sql)
-            .map_err(|e| AdapterError::InitializationError(e.into()))?
+            .map_err(|e| AdapterError::InitializationError(e.into()))?;
+        statement
             .bind::<&str>(1, self.get_hash_from_key(key)?.as_str())
-            .map_err(|e| AdapterError::InitializationError(e.into()))?
+            .map_err(|e| AdapterError::InitializationError(e.into()))?;
+        statement
             .bind::<&str>(2, self.serialize_key(key)?.as_str())
-            .map_err(|e| AdapterError::InitializationError(e.into()))?
+            .map_err(|e| AdapterError::InitializationError(e.into()))?;
+        statement
             .bind::<&str>(3, value.as_str())
             .map_err(|e| AdapterError::InitializationError(e.into()))?;
         let _ = statement
@@ -215,12 +219,13 @@ where
             "select cast(key as text) as key, cast(value as text) as value from {} order by ROWID desc limit ?1",
             self.table
         );
-        let cursor = connection
+        let mut statement = connection
             .prepare(sql)
-            .map_err(|e| AdapterError::InitializationError(e.into()))?
+            .map_err(|e| AdapterError::InitializationError(e.into()))?;
+        statement
             .bind::<i64>(1, how_many as i64)
-            .map_err(|e| AdapterError::InitializationError(e.into()))?
-            .into_cursor();
+            .map_err(|e| AdapterError::InitializationError(e.into()))?;
+        let cursor = statement.into_cursor();
 
         let results = cursor
             .map(|row| {