example:

example/Cargo.toml

@@ -11,10 +11,10 @@ path = "src/main.rs"
 
 [dependencies]
 
-#edgedb-query = "0.1.8"
+#edgedb-query = "0.2".
 edgedb-query = { path = "../edgedb-query"}
 
-#edgedb-query-derive = "0.1.9"
+#edgedb-query-derive = "0.2"
 edgedb-query-derive = { path = "../edgedb-query-derive"}
 
 anyhow = "1.0.58"

example/src/insert_person.rs

@@ -2,7 +2,7 @@
 #[cfg(test)]
 mod tests {
     use edgedb_query_derive::{file_query, insert_query};
-    use edgedb_query::{*, models::query_result::BasicResult};
+    use edgedb_query::*;
     use rstest::*;
 
 
@@ -55,9 +55,6 @@ mod tests {
             &q.args.unwrap()
         ).await;
 
-        match r {
-            Err(e) => println!("{:#?}", e),
-            _ => {}
-        }
+        if let Err(e) = r { println!("{:#?}", e) }
     }
 }

example/src/select_cities.rs

@@ -1,9 +1,9 @@
 
 #[cfg(test)]
 mod tests {
+    use edgedb_protocol::common::Cardinality;
     use edgedb_query_derive::{query_result, select_query};
     use rstest::*;
-    use serde::Deserialize;
     use edgedb_query::models::edge_query::{EdgeQuery, ToEdgeQuery};
 
     #[query_result]
@@ -13,7 +13,10 @@ mod tests {
     }
 
     #[select_query(table="City", result="City")]
-    pub struct SelectCity {}
+    pub struct SelectCity {
+        #[filter(operator="Is")]
+        pub name: String
+    }
 
 
     #[fixture]
@@ -28,16 +31,22 @@ mod tests {
     ) {
         let client: edgedb_tokio::Client = edgedb_client.await;
 
-        let select_query: EdgeQuery = SelectCity {}.to_edge_query();
+        let  select_query: EdgeQuery = SelectCity {
+            name: "Munich".to_owned()
+        }.to_edge_query_with_cardinality(Cardinality::One);
+
 
         let query_str = select_query.query.as_str();
 
         let args = &select_query.args.unwrap();
 
         println!("{query_str:#?}");
 
-        let cities: Vec<City> = client.query(query_str, args).await.unwrap();
+        let cities: City = client.query_required_single(query_str, args).await.unwrap();
+
+        //assert_eq!(3, cities.len());
+
+        //cities.iter().for_each(|c| println!("{c:#?}"))
 
-        assert_eq!(3, cities.len());
     }
 }

example/src/update_cities.rs

@@ -1,11 +1,11 @@
 
 #[cfg(test)]
 mod tests {
+    use edgedb_protocol::client_message::Cardinality;
     use edgedb_query_derive::{query_result, edgedb_sets, edgedb_filters, update_query, select_query};
-    use edgedb_query::{*, queries::filter::Filter, models::query_result::BasicResult};
+    use edgedb_query::{*, models::query_result::BasicResult, queries::set::Sets};
     use rstest::*;
     use edgedb_query::models::edge_query::{EdgeQuery, ToEdgeQuery};
-    use serde::Deserialize;
 
     #[query_result]
     pub struct City {
@@ -63,14 +63,21 @@ mod tests {
             filter: MyFilter {
                 city_name: "budapest".to_owned()
             }
-        }.to_edge_query();
+        }.to_edge_query_with_cardinality(Cardinality::One);
 
 
         let query_str = update_query.query.as_str();
 
         let args = &update_query.args.unwrap();
 
-        let result = client.query_json(query_str, args).await;
+        let result = client.query_required_single::<BasicResult, _>(query_str, args).await;
+
+
+        if let Ok(r) = result {
+            assert_ne!(r.id.to_string(), String::default());
+        } else {
+            unreachable!()
+        }
 
         let select_city: EdgeQuery = SelectCity {
             name_filter: MyFilter {
@@ -82,10 +89,7 @@ mod tests {
             let city: &City = cities.get(0).unwrap();
             assert_eq!(new_name, city.name);
         } else {
-            assert!(false)
+            unreachable!()
         };
-
-        println!("{:#?}", result);
-
     }
 }