Updating Cargo.toml files with rust-version

njord/Cargo.toml

@@ -8,7 +8,7 @@ license = "BSD-3-Clause"
 documentation = "https://docs.rs/njord/latest/njord/"
 repository = "https://github.com/mjovanc/njord"
 readme = "crates-io.md"
-rustc = "1.74.0"
+rust-version = "1.74.0"
 
 [dependencies]
 njord_derive = { version = "0.1.0", optional = true, path = "../njord_derive" }

njord/src/sqlite/mod.rs

@@ -1,3 +1,4 @@
+use std::fs;
 use std::path::{Path, PathBuf};
 
 use rusqlite::{Connection, Error};
@@ -17,8 +18,13 @@ pub fn open(db_name: &str) -> Result<Connection, Error> {
         PathBuf::from("../target")
     });
     let db_file_path = target_dir.join(db_name);
+    let full_db_file_path = match fs::canonicalize(&db_file_path) {
+        Ok(path) => path,
+        Err(_e) => return Err(Error::ExecuteReturnedResults),
+    };
+    println!("db_file_path = {:?}", full_db_file_path);
 
-    let conn = Connection::open(db_file_path)?;
+    let conn = Connection::open(full_db_file_path)?;
 
     Ok(conn)
 }

njord_cli/Cargo.toml

@@ -8,7 +8,7 @@ license = "GPL-3.0"
 documentation = "https://docs.rs/njord/latest/njord/"
 repository = "https://github.com/mjovanc/njord"
 readme = "crates-io.md"
-rustc = "1.74.0"
+rust-version = "1.74.0"
 
 [[bin]]
 name = "njord"

njord_cli/src/migration.rs

@@ -66,7 +66,7 @@ pub fn run(env: Option<&String>, log_level: Option<&String>) {
     //TODO: this doesnt load since it looks in the wrong directory
     // need to update the open() function to look for either ../target or ./target dir
     // it should not be hardcoded here as well, we need a more elegant solution
-    let conn = sqlite::open("test_database.db");
+    let conn = sqlite::open("sqlite.db");
 
     match conn {
         Ok(conn) => {

njord_derive/Cargo.toml

@@ -8,7 +8,7 @@ license = "GPL-3.0"
 documentation = "https://docs.rs/njord/latest/njord/"
 repository = "https://github.com/mjovanc/njord"
 readme = "crates-io.md"
-rustc = "1.74.0"
+rust-version = "1.74.0"
 
 [lib]
 name = "njord_derive"