store: Don't implement FromEntityData for Entity

Author: lutter

store/postgres/src/deployment_store.rs

@@ -769,9 +769,12 @@ impl DeploymentStore {
                             AttributeNames::All,
                         )]),
                     );
-                    let entities = store
-                        .execute_query::<Entity>(conn, site4, query)
-                        .map_err(anyhow::Error::from)?;
+                    let entities: Vec<_> = store
+                        .execute_query::<EntityVersion>(conn, site4, query)
+                        .map_err(anyhow::Error::from)?
+                        .into_iter()
+                        .map(|ev| ev.data)
+                        .collect();
 
                     Ok(Some(entities))
                 })
@@ -847,7 +850,8 @@ impl DeploymentStore {
         query: EntityQuery,
     ) -> Result<Vec<Entity>, QueryExecutionError> {
         let conn = self.get_conn()?;
-        self.execute_query(&conn, site, query)
+        self.execute_query::<EntityVersion>(&conn, site, query)
+            .map(|evs| evs.into_iter().map(|ev| ev.data).collect())
     }
 
     pub(crate) fn transact_block_operations(

store/postgres/src/relational_queries.rs

@@ -279,18 +279,6 @@ pub trait FromEntityData: Default {
     fn set_vid(&mut self, vid: Vid);
 }
 
-impl FromEntityData for Entity {
-    type Value = graph::prelude::Value;
-
-    fn insert_entity_data(&mut self, key: String, v: Self::Value) {
-        self.insert(key, v);
-    }
-
-    fn set_vid(&mut self, _vid: Vid) {
-        /* ignore */
-    }
-}
-
 impl FromEntityData for BTreeMap<String, r::Value> {
     type Value = r::Value;
 

store/postgres/tests/relational.rs

@@ -1,7 +1,7 @@
 //! Test mapping of GraphQL schema to a relational schema
 use diesel::connection::SimpleConnection as _;
 use diesel::pg::PgConnection;
-use graph::data::store::Vid;
+use graph::data::store::{EntityVersion, Vid};
 use graph::prelude::{
     o, slog, tokio, web3::types::H256, DeploymentHash, Entity, EntityCollection, EntityFilter,
     EntityKey, EntityOrder, EntityQuery, EntityRange, Logger, Schema, StopwatchMetrics, Value,
@@ -743,7 +743,7 @@ fn count_scalar_entities(conn: &PgConnection, layout: &Layout) -> usize {
     ]);
     let collection = EntityCollection::All(vec![(SCALAR.to_owned(), AttributeNames::All)]);
     layout
-        .query::<Entity>(
+        .query::<EntityVersion>(
             &*LOGGER,
             &conn,
             collection,
@@ -941,7 +941,7 @@ impl<'a> QueryChecker<'a> {
         let unordered = matches!(query.order, EntityOrder::Unordered);
         let entities = self
             .layout
-            .query::<Entity>(
+            .query::<EntityVersion>(
                 &*LOGGER,
                 self.conn,
                 query.collection,
@@ -955,7 +955,7 @@ impl<'a> QueryChecker<'a> {
 
         let mut entity_ids: Vec<_> = entities
             .into_iter()
-            .map(|entity| match entity.get("id") {
+            .map(|ev| match ev.data.get("id") {
                 Some(Value::String(id)) => id.to_owned(),
                 Some(_) => panic!("layout.query returned entity with non-string ID attribute"),
                 None => panic!("layout.query returned entity with no ID attribute"),
@@ -1536,7 +1536,7 @@ fn text_find(expected_entity_ids: Vec<&str>, filter: EntityFilter) {
         let query = query(vec!["Ferret"]).filter(filter).asc("id");
 
         let entities = layout
-            .query::<Entity>(
+            .query::<EntityVersion>(
                 &*LOGGER,
                 conn,
                 query.collection,
@@ -1550,7 +1550,7 @@ fn text_find(expected_entity_ids: Vec<&str>, filter: EntityFilter) {
 
         let entity_ids: Vec<_> = entities
             .into_iter()
-            .map(|entity| match entity.get("id") {
+            .map(|ev| match ev.data.get("id") {
                 Some(Value::String(id)) => id.to_owned(),
                 Some(_) => panic!("layout.query returned entity with non-string ID attribute"),
                 None => panic!("layout.query returned entity with no ID attribute"),

store/postgres/tests/relational_bytes.rs

@@ -1,7 +1,7 @@
 //! Test relational schemas that use `Bytes` to store ids
 use diesel::connection::SimpleConnection as _;
 use diesel::pg::PgConnection;
-use graph::data::store::Vid;
+use graph::data::store::{EntityVersion, Vid};
 use graph_mock::MockMetricsRegistry;
 use hex_literal::hex;
 use lazy_static::lazy_static;
@@ -416,7 +416,7 @@ fn make_thing_tree(conn: &PgConnection, layout: &Layout) -> (Entity, Entity, Ent
 fn query() {
     fn fetch(conn: &PgConnection, layout: &Layout, coll: EntityCollection) -> Vec<String> {
         layout
-            .query::<Entity>(
+            .query::<EntityVersion>(
                 &*LOGGER,
                 conn,
                 coll,
@@ -428,7 +428,7 @@ fn query() {
             )
             .expect("the query succeeds")
             .into_iter()
-            .map(|e| e.id().expect("entities have an id"))
+            .map(|ev| ev.data.id().expect("entities have an id"))
             .collect::<Vec<_>>()
     }