compilation fixes

Author: Zoran Cvetkov

runtime/test/src/test.rs

@@ -477,17 +477,18 @@ async fn test_ipfs_block() {
 // The user_data value we use with calls to ipfs_map
 const USER_DATA: &str = "user_data";
 
-fn make_thing(id: &str, value: &str) -> (String, EntityModification) {
-    const DOCUMENT: &str = " type Thing @entity { id: String!, value: String!, extra: String }";
+fn make_thing(id: &str, value: &str, vid: i64) -> (String, EntityModification) {
+    const DOCUMENT: &str =
+        " type Thing @entity { id: String!, value: String!, extra: String, vid: Int8 }";
     lazy_static! {
         static ref SCHEMA: InputSchema = InputSchema::raw(DOCUMENT, "doesntmatter");
         static ref THING_TYPE: EntityType = SCHEMA.entity_type("Thing").unwrap();
     }
-    let data = entity! { SCHEMA => id: id, value: value, extra: USER_DATA };
+    let data = entity! { SCHEMA => id: id, value: value, extra: USER_DATA, vid:vid };
     let key = THING_TYPE.parse_key(id).unwrap();
     (
         format!("{{ \"id\": \"{}\", \"value\": \"{}\"}}", id, value),
-        EntityModification::insert(key, data, 0),
+        EntityModification::insert(key, data, 0, vid),
     )
 }
 
@@ -553,8 +554,8 @@ async fn test_ipfs_map(api_version: Version, json_error_msg: &str) {
     let subgraph_id = "ipfsMap";
 
     // Try it with two valid objects
-    let (str1, thing1) = make_thing("one", "eins");
-    let (str2, thing2) = make_thing("two", "zwei");
+    let (str1, thing1) = make_thing("one", "eins", 0);
+    let (str2, thing2) = make_thing("two", "zwei", 0);
     let ops = run_ipfs_map(
         subgraph_id,
         format!("{}\n{}", str1, str2),
@@ -1001,8 +1002,8 @@ async fn test_entity_store(api_version: Version) {
 
     let schema = store.input_schema(&deployment.hash).unwrap();
 
-    let alex = entity! { schema => id: "alex", name: "Alex" };
-    let steve = entity! { schema => id: "steve", name: "Steve" };
+    let alex = entity! { schema => id: "alex", name: "Alex", vid: 0};
+    let steve = entity! { schema => id: "steve", name: "Steve", vid: 1};
     let user_type = schema.entity_type("User").unwrap();
     test_store::insert_entities(
         &deployment,

store/test-store/tests/graph/entity_cache.rs

@@ -221,8 +221,8 @@ fn insert_modifications() {
     assert_eq!(
         sort_by_entity_key(result.unwrap().modifications),
         sort_by_entity_key(vec![
-            EntityModification::insert(mogwai_key, mogwai_data, 0),
-            EntityModification::insert(sigurros_key, sigurros_data, 0)
+            EntityModification::insert(mogwai_key, mogwai_data, 0, 0),
+            EntityModification::insert(sigurros_key, sigurros_data, 0, 0)
         ])
     );
 }
@@ -265,8 +265,8 @@ fn overwrite_modifications() {
     assert_eq!(
         sort_by_entity_key(result.unwrap().modifications),
         sort_by_entity_key(vec![
-            EntityModification::overwrite(mogwai_key, mogwai_data, 0),
-            EntityModification::overwrite(sigurros_key, sigurros_data, 0)
+            EntityModification::overwrite(mogwai_key, mogwai_data, 0, 0),
+            EntityModification::overwrite(sigurros_key, sigurros_data, 0, 0)
         ])
     );
 }
@@ -304,6 +304,7 @@ fn consecutive_modifications() {
         sort_by_entity_key(vec![EntityModification::overwrite(
             update_key,
             entity! { SCHEMA => id: "mogwai", name: "Mogwai", founded: 1995 },
+            0,
             0
         )])
     );

store/test-store/tests/postgres/relational.rs

@@ -891,6 +891,7 @@ fn conflicting_entity() {
                             data: fred,
                             block: 2,
                             end: None,
+                            vid: 0,
                         },
                         2,
                     )

store/test-store/tests/postgres/relational_bytes.rs

@@ -84,7 +84,7 @@ pub fn row_group_update(
     let mut group = RowGroup::new(entity_type.clone(), false);
     for (key, data) in data {
         group
-            .push(EntityModification::overwrite(key, data, block), block)
+            .push(EntityModification::overwrite(key, data, block, 0), block)
             .unwrap();
     }
     group
@@ -98,7 +98,7 @@ pub fn row_group_insert(
     let mut group = RowGroup::new(entity_type.clone(), false);
     for (key, data) in data {
         group
-            .push(EntityModification::insert(key, data, block), block)
+            .push(EntityModification::insert(key, data, block, 0), block)
             .unwrap();
     }
     group

store/test-store/tests/postgres/store.rs

@@ -1509,7 +1509,7 @@ fn handle_large_string_with_index() {
 
         let key = USER_TYPE.parse_key(id).unwrap();
 
-        EntityModification::insert(key, data, block)
+        EntityModification::insert(key, data, block, 0)
     }
 
     run_test(|store, writable, deployment| async move {
@@ -1608,7 +1608,7 @@ fn handle_large_bytea_with_index() {
 
         let key = USER_TYPE.parse_key(id).unwrap();
 
-        EntityModification::insert(key, data, block)
+        EntityModification::insert(key, data, block, 0)
     }
 
     run_test(|store, writable, deployment| async move {