Cargo.lock

@@ -118,7 +118,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "squail"
-version = "0.1.2"
+version = "0.1.0"
 dependencies = [
  "rusqlite",
  "squail-macros",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "squail"
-version = "0.1.2"
+version = "0.1.1"
 edition = "2021"
 
 [dependencies]

macros/src/lib.rs

@@ -3,9 +3,7 @@ use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
 use syn::{parse_macro_input, Data, DeriveInput, Fields};
 
-// TODO: wrap functions in a trait? would probably use the other (main) crate
+// TODO: wrap functions in a trait? would probably use the other crate
-
-// TODO: own error enum (for update). also use the other (main) crate for this
 
 
 #[proc_macro_derive(Table)]
@@ -118,10 +116,10 @@ pub fn derive_table(input: TokenStream) -> TokenStream {
             match self.id {
                 None => self.insert(conn),
                 Some(id) => {
-                    match self.update(conn) {
+                    if !self.update(conn)? {
-                        Ok(_) => return Ok(id),
+                        return self.insert(conn);
-                        Err(_) => return self.insert(conn),
                     }
+                    Ok(id)
                 },
             }
         }
@@ -138,21 +136,19 @@ pub fn derive_table(input: TokenStream) -> TokenStream {
     let update_fn = quote! {
         /// Update a table row using the calling struct instance.
         ///
-        /// If `id` is `None`, this fails with `InvalidQuery`.
+        /// If the row does not yet exist, this fails.
-        /// If the row does not exist, this fails with `QueryReturnedNoRows`.
-        ///
         /// A version that inserts a new row instead also exists. See `update_or_insert`.
-        pub fn update(&self, conn: &rusqlite::Connection) -> rusqlite::Result<()>
+        ///
+        /// Result contains `true` if a row was updated.
+        pub fn update(&self, conn: &rusqlite::Connection) -> rusqlite::Result<bool>
             where #(#to_sql_trait_bounds),*
         {
             if self.id.is_none() {
-                return Err(rusqlite::Error::InvalidQuery)
+                // TODO: bad design, should probably fail instead
+                return Ok(false);
             }
             let updated_count = conn.execute(#update_sql, rusqlite::params![#(#field_accessors),*])?;
-            match updated_count {
+            Ok(updated_count > 0)
-                0 => Err(rusqlite::Error::QueryReturnedNoRows),
-                _ => Ok(()),
-            }
         }
     };
 

src/test/macros.rs

@@ -67,7 +67,8 @@ fn test_table_derive_macro() {
         .expect("After (mutable) insertion, id should not be None");
 
     larry.age += 1;
-    larry.update(&conn).expect("Updating should work");
+    let updated_something = larry.update(&conn).expect("Updating should work");
+    assert!(updated_something, "Should have updated a row");
 
     let larry_copy = Person::get_by_id(&conn, larry_id).expect("Querying a row should work");
     assert_eq!(