snapshot

Author: DataEraserC

Cargo.toml

@@ -12,6 +12,8 @@ strip = true
 [workspace.dependencies]
 diesel = { version = "2.2.0", features = [
     "sqlite",
+    # "mysql",
+    # "postgres",
     "chrono",
     "returning_clauses_for_sqlite_3_35",
 ] }

file_classification_core/src/database.rs

@@ -1,9 +1,17 @@
-pub use diesel::{sqlite::SqliteConnection, Connection};
+pub use diesel::{Connection, QueryResult, sqlite::SqliteConnection};
 use dotenvy::dotenv;
 use std::env;
 
+// #[derive(diesel::MultiConnection)]
+// pub enum AnyConnection {
+// 	Postgresql(diesel::PgConnection),
+// 	Mysql(diesel::MysqlConnection),
+// 	Sqlite(diesel::SqliteConnection),
+// }
+
 pub fn establish_connection() -> SqliteConnection {
 	dotenv().ok();
+	// NOTE: from ./.env
 	let database_url = env::var("DATABASE_URL").expect("DATABASE_URL must be set");
 	SqliteConnection::establish(&database_url)
 		.unwrap_or_else(|_| panic!("Error connecting to {}", database_url))

file_classification_core/src/errors.rs

@@ -42,20 +42,26 @@ impl Display for AppError {
 			AppError::GroupNotFound => write!(f, "Group not found"),
 			AppError::CreateGroupFailed(msg) => write!(f, "Create group failed: {}", msg),
 			AppError::DeleteGroupFailed(msg) => write!(f, "Delete group failed: {}", msg),
+
 			AppError::FileNotFound => write!(f, "File not found"),
 			AppError::CreateFileFailed(msg) => write!(f, "Create file failed: {}", msg),
 			AppError::DeleteFileFailed(msg) => write!(f, "Delete file failed: {}", msg),
+
 			AppError::TagNotFound => write!(f, "Tag not found"),
 			AppError::CreateTagFailed(msg) => write!(f, "Create tag failed: {}", msg),
 			AppError::DeleteTagFailed(msg) => write!(f, "Delete tag failed: {}", msg),
+
 			AppError::GroupTagNotFound => write!(f, "GroupTag not found"),
 			AppError::CannotAssociateWithPrimary => write!(f, "Cannot associate with primary group"),
 			AppError::CreateGroupTagFailed(msg) => write!(f, "Create GroupTag failed: {}", msg),
 			AppError::DeleteGroupTagFailed(msg) => write!(f, "Delete GroupTag failed: {}", msg),
+
 			AppError::FileGroupNotFound => write!(f, "FileGroup not found"),
 			AppError::CreateFileGroupFailed(msg) => write!(f, "Create FileGroup failed: {}", msg),
 			AppError::DeleteFileGroupFailed(msg) => write!(f, "Delete FileGroup failed: {}", msg),
+
 			AppError::ValidationError(msg) => write!(f, "Validation error: {}", msg),
+
 			AppError::DieselError(e) => write!(f, "Database error: {}", e),
 			// other Errors...
 			_ => write!(f, "Unknown error occurred"),

nix/file_classification_cli.nix

@@ -4,6 +4,9 @@
   rev ? "unknown",
   date ? "19700101",
   sqlite,
+  mysql80,
+  postgresql,
+  pkg-config,
   lib,
   ...
 }: let
@@ -21,6 +24,8 @@ in
     inherit src;
     nativeBuildInputs = [sqlite];
     buildInputs = [sqlite];
+    # nativeBuildInputs = [pkg-config sqlite mysql80 postgresql];
+    # buildInputs = [pkg-config sqlite mysql80 postgresql];
     pname = manifest.name;
     version = manifest.version;
     cargoLock.lockFile = ../Cargo.lock;

nix/shell.nix

@@ -23,6 +23,8 @@ in
         pkgs.diesel-cli
 
         pkgs.bashInteractive
+
+        pkgs.pkg-config
       ]
       ++ (oa.nativeBuildInputs or []);