Change examples/tests to remove explicit calls to query

Author: knutwalker

lib/examples/concurrent_writes.rs

@@ -35,7 +35,7 @@ async fn main() {
 
 async fn work(i: u64, graph: Graph) -> (u64, u64, u64) {
     graph
-        .run(query(
+        .run(
             "
 CREATE
   (dan:Person {name: 'Dan'}),
@@ -77,12 +77,12 @@ CREATE
   (elsa)-[:BUYS {amount: 3}]->(chocolate),
   (elsa)-[:BUYS {amount: 3}]->(milk)
 ",
-        ))
+        )
         .await
         .unwrap();
 
     let node_count = graph
-        .execute(query("MATCH (n) RETURN count(n) AS count"))
+        .execute("MATCH (n) RETURN count(n) AS count")
         .await
         .unwrap()
         .column_into_stream::<u64>("count")
@@ -91,7 +91,7 @@ CREATE
         .unwrap();
 
     let rel_count = graph
-        .execute(query("MATCH ()-[r]->() RETURN count(r) AS count"))
+        .execute("MATCH ()-[r]->() RETURN count(r) AS count")
         .await
         .unwrap()
         .column_into_stream::<u64>("count")

lib/tests/node_property_parsing.rs

@@ -9,31 +9,25 @@ async fn node_property_parsing() {
     let graph = neo4j.graph();
 
     graph
-        .run(query(
+        .run(
             "CREATE
 (:Datetime {p1:DATETIME('2024-12-31T08:10:35')}),
 (:Point2D {a:Point ({x:2,y:3})}),
 (:Point3D {a:Point ({x:3,y:4,z:5})})
 ",
-        ))
+        )
         .await
         .unwrap();
 
-    let mut result = graph
-        .execute(query("MATCH (p:DateTime) RETURN p"))
-        .await
-        .unwrap();
+    let mut result = graph.execute("MATCH (p:DateTime) RETURN p").await.unwrap();
 
     while let Ok(Some(row)) = result.next().await {
         let node: Node = row.get("p").unwrap();
         let p1 = node.get::<DateTime<FixedOffset>>("p1").unwrap();
         assert_eq!(p1.timestamp(), 1735632635);
     }
 
-    let mut result = graph
-        .execute(query("MATCH (p:Point2D) RETURN p"))
-        .await
-        .unwrap();
+    let mut result = graph.execute("MATCH (p:Point2D) RETURN p").await.unwrap();
 
     while let Ok(Some(row)) = result.next().await {
         let node: Node = row.get("p").unwrap();
@@ -42,10 +36,7 @@ async fn node_property_parsing() {
         assert_eq!(p1.y(), 3.0);
     }
 
-    let mut result = graph
-        .execute(query("MATCH (p:Point3D) RETURN p"))
-        .await
-        .unwrap();
+    let mut result = graph.execute("MATCH (p:Point3D) RETURN p").await.unwrap();
 
     while let Ok(Some(row)) = result.next().await {
         let node: Node = row.get("p").unwrap();

lib/tests/use_default_db.rs

@@ -27,13 +27,11 @@ async fn use_default_db() {
 
     #[cfg(feature = "unstable-bolt-protocol-impl-v2")]
     let query_stream = graph
-        .execute_on("system", query("SHOW DEFAULT DATABASE"), Operation::Read)
+        .execute_on("system", "SHOW DEFAULT DATABASE", Operation::Read)
         .await;
 
     #[cfg(not(feature = "unstable-bolt-protocol-impl-v2"))]
-    let query_stream = graph
-        .execute_on("system", query("SHOW DEFAULT DATABASE"))
-        .await;
+    let query_stream = graph.execute_on("system", "SHOW DEFAULT DATABASE").await;
 
     let default_db = query_stream
         .unwrap()