Forráskód Böngészése

Change delete query return type.

Kestrel 1 éve
szülő
commit
bce11af19b
3 módosított fájl, 7 hozzáadás és 10 törlés
  1. 1 2
      microrm/src/db.rs
  2. 5 7
      microrm/src/query.rs
  3. 1 1
      microrm/src/schema.rs

+ 1 - 2
microrm/src/db.rs

@@ -79,8 +79,7 @@ impl Connection {
                     .prepare(sql.as_str())
                     .map_err(|e| DBError::from(e).sqlite_to_query(sql.as_str()))?;
 
-                println!("built SQL query: {sql}");
-                log::trace!("built SQL query: {sql}");
+                log::trace!("prepared new SQL query: {sql}");
 
                 let inserted = e.insert(CachedStatement {
                     sql: sql.clone(),

+ 5 - 7
microrm/src/query.rs

@@ -180,10 +180,10 @@ impl Query {
             }
         };
 
-        println!(
+        /*println!(
             "built SQL query: {} {} {} {} {} {} {}",
             root, columns_, from_, set_, join_, where_, trailing_
-        );
+        );*/
         // log::trace!("built SQL query: {} {} {}", root, set_, where_);
 
         format!(
@@ -441,9 +441,7 @@ pub trait Queryable {
         )
     }
     /// Delete all entities in the current context.
-    ///
-    /// Returns the number of entities deleted.
-    fn delete(self) -> DBResult<usize>
+    fn delete(self) -> DBResult<()>
     where
         Self: Sized,
     {
@@ -471,7 +469,7 @@ pub trait Queryable {
 
                 stmt.next()?;
 
-                Ok(stmt.read::<i64, _>(0)? as usize)
+                Ok(())
             },
         )
     }
@@ -558,7 +556,7 @@ impl<'a, AI: AssocInterface> Queryable for &'a AI {
         components::AssocQueryable::new(self).get()
     }
 
-    fn delete(self) -> DBResult<usize> {
+    fn delete(self) -> DBResult<()> {
         components::AssocQueryable::new(self).delete()
     }
 

+ 1 - 1
microrm/src/schema.rs

@@ -497,7 +497,7 @@ impl<'a, T: Entity> Queryable for &'a IDMap<T> {
         query::components::MapQueryable::new(self).get()
     }
 
-    fn delete(self) -> DBResult<usize> {
+    fn delete(self) -> DBResult<()> {
         query::components::MapQueryable::new(self).delete()
     }