wip dynamic labels

src/cypher_templates.rs

@@ -55,7 +55,6 @@ MERGE (from:Account {{address: tx.sender}})
 MERGE (to:Account {{address: tx.recipient}})
 
 // Dynamically set the relationship label using a subquery
-CALL {{
     WITH from, to, tx
     CALL {{
         WITH tx
@@ -66,6 +65,7 @@ CALL {{
             ELSE "Unknown" // Default for unexpected or missing values
         END AS dynamicLabel
     }}
+    WITH from, to, tx, dynamicLabel
     // Use dynamicLabel to create the relationship
     MERGE (from)-[rel:`${{dynamicLabel}}` {{tx_hash: tx.tx_hash}}]->(to)
     ON CREATE SET
@@ -82,7 +82,6 @@ CALL {{
         SET rel += tx.args
     )
     RETURN rel
-  }}
 
 // Handle cumulative TotalTx relationships if `tx.amount > 0`
 // FOREACH (_ IN CASE WHEN tx.amount > 0 THEN [1] ELSE [] END |

tests/test_load_tx.rs

@@ -3,7 +3,7 @@ use anyhow::Result;
 use diem_crypto::HashValue;
 
 use libra_forensic_db::{
-    cypher_templates::{write_batch_tx_string, write_batch_user_create},
+    cypher_templates::{alt_write_batch_tx_string, write_batch_user_create},
     extract_transactions::extract_current_transactions,
     load::try_load_one_archive,
     load_tx_cypher::tx_batch,
@@ -120,7 +120,7 @@ async fn insert_with_cypher_string() -> Result<()> {
 
     let list_str = WarehouseTxMaster::to_cypher_map(&list);
 
-    let cypher_string = write_batch_tx_string(&list_str);
+    let cypher_string = alt_write_batch_tx_string(&list_str);
 
     let c = start_neo4j_container();
     let port = c.get_host_port_ipv4(7687);