Merge pull request #134 from wa5i/bugfix

fix: test case errors in mysql backend.

Author: wa5i

.github/workflows/rust.yml

@@ -100,6 +100,12 @@ jobs:
         my-cnf: |
           skip-ssl
           port=3306
+    - name: Set macOS Environment Variables
+      if: runner.os == 'macOS'
+      env:
+        MACOSX_DEPLOYMENT_TARGET: "11.0"
+      run: |
+          export MACOSX_DEPLOYMENT_TARGET=11.0
     - name: install diesel_cli
       run: cargo install diesel_cli --no-default-features --features mysql
     - name: init database
@@ -109,7 +115,7 @@ jobs:
     - name: ulimit -n
       run: ulimit -n 65535
     - name: Run tests
-      run: cargo test --verbose
+      run: cargo test --features storage_mysql --verbose
     - name: Build crate doc
       run: cargo doc --no-deps
 
@@ -177,6 +183,6 @@ jobs:
     - name: Build
       run: cargo build --features storage_mysql --verbose
     - name: Run tests
-      run: cargo test --verbose
+      run: cargo test --features storage_mysql --verbose
     - name: Build crate doc
       run: cargo doc --no-deps

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
     "rust-analyzer.linkedProjects": [
         "Cargo.toml"
-    ]
+    ],
+    "rust-analyzer.cargo.features": ["storage_mysql"]
 }

src/storage/mysql/mod.rs

@@ -55,16 +55,17 @@ fn establish_mysql_connection(conf: &HashMap<String, Value>) -> Result<MysqlDbPo
 
 #[cfg(test)]
 mod test {
-    use std::collections::HashMap;
+    use std::{collections::HashMap, env};
 
     use super::*;
 
     #[test]
     fn test_establish_mysql_connection() {
+        let mysql_pwd = env::var("CARGO_TEST_MYSQL_PASSWORD").unwrap_or("password".into());
         let mut conf: HashMap<String, Value> = HashMap::new();
         conf.insert("address".to_string(), Value::String("127.0.0.1:3306".to_string()));
         conf.insert("username".to_string(), Value::String("root".to_string()));
-        conf.insert("password".to_string(), Value::String("password".to_string()));
+        conf.insert("password".to_string(), Value::String(mysql_pwd));
 
         let pool = establish_mysql_connection(&conf);
 

src/storage/mysql/mysql_backend.rs

@@ -126,27 +126,42 @@ impl MysqlBackend {
 #[cfg(test)]
 mod test {
 
-    use std::collections::HashMap;
+    use std::{collections::HashMap, env};
 
+    use diesel::{prelude::*, MysqlConnection};
     use serde_json::Value;
 
     use super::MysqlBackend;
-    use crate::storage::test::{test_backend, test_backend_list_prefix};
+
+    use crate::errors::RvError;
+    use crate::storage::test::{test_backend_curd, test_backend_list_prefix};
+
+    fn mysql_table_clear(backend: &MysqlBackend) -> Result<(), RvError> {
+        let conn: &mut MysqlConnection = &mut backend.pool.lock().unwrap().get().unwrap();
+
+        match diesel::sql_query("TRUNCATE TABLE vault").execute(conn) {
+            Ok(_) => return Ok(()),
+            Err(e) => return Err(RvError::ErrDatabaseExecuteEntry { source: (e) }),
+        }
+    }
 
     #[test]
     fn test_mysql_backend() {
+        let mysql_pwd = env::var("CARGO_TEST_MYSQL_PASSWORD").unwrap_or("password".into());
         let mut conf: HashMap<String, Value> = HashMap::new();
         conf.insert("address".to_string(), Value::String("127.0.0.1:3306".to_string()));
         conf.insert("username".to_string(), Value::String("root".to_string()));
-        conf.insert("password".to_string(), Value::String("password".to_string()));
+        conf.insert("password".to_string(), Value::String(mysql_pwd));
 
         let backend = MysqlBackend::new(&conf);
 
         assert!(backend.is_ok());
 
         let backend = backend.unwrap();
 
-        test_backend(&backend);
+        assert!(mysql_table_clear(&backend).is_ok());
+
+        test_backend_curd(&backend);
         test_backend_list_prefix(&backend);
     }
 }