Change examples/tests to use query macro where possible

Author: knutwalker

lib/tests/missing_properties.rs

@@ -10,7 +10,10 @@ async fn missing_properties() {
 
     let a_val = None::<String>;
     let mut result = graph
-        .execute(query("CREATE (ts:TestStruct {a: $a}) RETURN ts").param("a", a_val))
+        .execute(query!(
+            "CREATE (ts:TestStruct {{a: {a}}}) RETURN ts",
+            a = a_val
+        ))
         .await
         .unwrap();
     let row = result.next().await.unwrap().unwrap();

lib/tests/txn_change_db.rs

@@ -1,5 +1,5 @@
 use futures::TryStreamExt;
-use neo4rs::*;
+use neo4rs::query;
 use serde::Deserialize;
 
 mod container;
@@ -19,7 +19,7 @@ async fn txn_changes_db() {
                 return;
             }
 
-            std::panic::panic_any(e);
+            std::panic::panic_any(e.to_string());
         }
     };
     let graph = neo4j.graph();
@@ -46,18 +46,13 @@ async fn txn_changes_db() {
 
     let mut txn = graph.start_txn().await.unwrap();
     let mut databases = txn
-        .execute(
-            query(&format!(
-                concat!(
-                    "SHOW TRANSACTIONS YIELD * WHERE username = $username AND currentQuery ",
-                    "STARTS WITH $query AND toLower({status_field}) = $status RETURN database"
-                ),
-                status_field = status_field
-            ))
-            .param("username", "neo4j")
-            .param("query", "SHOW TRANSACTIONS YIELD ")
-            .param("status", "running"),
-        )
+        .execute(dbg!(query!(
+            "SHOW TRANSACTIONS YIELD * WHERE username = {username} AND currentQuery
+             STARTS WITH {query} AND toLower({status_field}) = {status} RETURN database",
+            username = "neo4j",
+            query = "SHOW TRANSACTIONS YIELD ",
+            status = "running",
+        )))
         .await
         .unwrap();
 

lib/tests/use_default_db.rs

@@ -54,16 +54,21 @@ async fn use_default_db() {
 
     let id = uuid::Uuid::new_v4();
     graph
-        .run(query("CREATE (:Node { uuid: $uuid })").param("uuid", id.to_string()))
+        .run(query!(
+            "CREATE (:Node {{ uuid: {uuid} }})",
+            uuid = id.to_string()
+        ))
         .await
         .unwrap();
 
     #[cfg(feature = "unstable-bolt-protocol-impl-v2")]
     let query_stream = graph
         .execute_on(
             dbname.as_str(),
-            query("MATCH (n:Node {uuid: $uuid}) RETURN count(n) AS result")
-                .param("uuid", id.to_string()),
+            query!(
+                "MATCH (n:Node {{uuid: {uuid}}}) RETURN count(n) AS result",
+                uuid = id.to_string()
+            ),
             Operation::Read,
         )
         .await;
@@ -72,8 +77,10 @@ async fn use_default_db() {
     let query_stream = graph
         .execute_on(
             dbname.as_str(),
-            query("MATCH (n:Node {uuid: $uuid}) RETURN count(n) AS result")
-                .param("uuid", id.to_string()),
+            query!(
+                "MATCH (n:Node {{uuid: {uuid}}}) RETURN count(n) AS result",
+                uuid = id.to_string()
+            ),
         )
         .await;