From 71838b21cc5b01fbd185c4fd6a0927d9474357e7 Mon Sep 17 00:00:00 2001 From: Phil Denhoff Date: Mon, 28 Oct 2024 23:49:22 -0700 Subject: [PATCH] chore: Drop deprecated `sql_function!` in favour of `define_sql_function!` --- src-tauri/libcalibre/Cargo.toml | 4 ++-- src-tauri/libcalibre/src/persistence.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src-tauri/libcalibre/Cargo.toml b/src-tauri/libcalibre/Cargo.toml index 762365a..f2bf40b 100644 --- a/src-tauri/libcalibre/Cargo.toml +++ b/src-tauri/libcalibre/Cargo.toml @@ -7,8 +7,8 @@ edition = "2021" [dependencies] chrono = { version = "0.4.31", features = ["serde"] } -diesel = { version = "2.1.0", features = ["sqlite", "chrono", "returning_clauses_for_sqlite_3_35"] } -diesel_migrations = { version = "2.1.0", features = ["sqlite"] } +diesel = { version = "2.2.4", features = ["sqlite", "chrono", "returning_clauses_for_sqlite_3_35"] } +diesel_migrations = { version = "2.2.0", features = ["sqlite"] } epub = "2.1.1" mobi = "0.8.0" regex = "1.10.2" diff --git a/src-tauri/libcalibre/src/persistence.rs b/src-tauri/libcalibre/src/persistence.rs index ed5ac4a..dc7110f 100644 --- a/src-tauri/libcalibre/src/persistence.rs +++ b/src-tauri/libcalibre/src/persistence.rs @@ -40,14 +40,14 @@ pub fn sort_book_title(title: String) -> String { pub fn establish_connection(db_path: &str) -> Result { // Setup custom SQL functions. Required because Calibre does this. // See: https://github.com/kovidgoyal/calibre/blob/7f3ccb333d906f5867636dd0dc4700b495e5ae6f/src/calibre/library/database.py#L55-L70 - sql_function!(fn title_sort(title: Text) -> Text); - sql_function!(fn uuid4() -> Text); + define_sql_function!(fn title_sort(title: Text) -> Text); + define_sql_function!(fn uuid4() -> Text); let mut connection = diesel::SqliteConnection::establish(db_path).or(Err(()))?; // Register SQL function implementations. Ignore any errors. - let _ = title_sort::register_impl(&mut connection, sort_book_title); - let _ = uuid4::register_impl(&connection, || uuid::Uuid::new_v4().to_string()); + let _ = title_sort_utils::register_impl(&mut connection, sort_book_title); + let _ = uuid4_utils::register_impl(&connection, || uuid::Uuid::new_v4().to_string()); Ok(connection) }