store: Metadata updates must overwrite and not just amend

lutter · lutter · commit 91d8e54bce0a · 2020-03-06T11:55:37.000-08:00
diff --git a/store/postgres/src/entities.rs b/store/postgres/src/entities.rs
@@ -507,6 +507,9 @@ impl Connection {
         }
     }
 
+    /// Overwrite an entity with a new version. The `history_event` indicates
+    /// at which block the new version becomes valid if it is given. If it is
+    /// `None`, the entity is treated as unversioned
     pub(crate) fn update(
         &self,
         key: &EntityKey,
@@ -522,7 +525,7 @@ impl Connection {
                     layout.update(&self.conn, key, entity, block_number(&history_event))
                 }
                 None => layout
-                    .update_unversioned(&self.conn, key, &entity)
+                    .overwrite_unversioned(&self.conn, key, entity)
                     .map(|_| ()),
             },
         }
@@ -537,7 +540,7 @@ impl Connection {
     ) -> Result<usize, StoreError> {
         match &*self.metadata {
             Storage::Json(json) => json.update_metadata(&self.conn, key, entity),
-            Storage::Relational(layout) => layout.update_unversioned(&self.conn, key, entity),
+            Storage::Relational(layout) => layout.update_metadata(&self.conn, key, entity),
         }
     }
 
diff --git a/store/postgres/src/relational.rs b/store/postgres/src/relational.rs
@@ -25,7 +25,7 @@ use graph::data::schema::SCHEMA_TYPE_NAME;
 use graph::prelude::{
     format_err, trace, BlockNumber, Entity, EntityChange, EntityChangeOperation, EntityCollection,
     EntityFilter, EntityKey, EntityOrder, EntityRange, Logger, QueryExecutionError, StoreError,
-    StoreEvent, SubgraphDeploymentId, ValueType,
+    StoreEvent, SubgraphDeploymentId, Value, ValueType,
 };
 
 use crate::block_range::{BLOCK_RANGE_COLUMN, BLOCK_UNVERSIONED};
@@ -472,7 +472,7 @@ impl Layout {
         Ok(())
     }
 
-    pub fn update_unversioned(
+    pub fn update_metadata(
         &self,
         conn: &PgConnection,
         key: &EntityKey,
@@ -483,6 +483,24 @@ impl Layout {
         Ok(query.execute(conn)?)
     }
 
+    pub fn overwrite_unversioned(
+        &self,
+        conn: &PgConnection,
+        key: &EntityKey,
+        mut entity: Entity,
+    ) -> Result<usize, StoreError> {
+        let table = self.table_for_entity(&key.entity_type)?;
+        // Set any attributes not mentioned in the entity to
+        // their default (NULL)
+        for column in table.columns.iter() {
+            if !entity.contains_key(&column.field) {
+                entity.insert(column.field.clone(), Value::Null);
+            }
+        }
+        let query = UpdateQuery::new(table, key, &entity)?;
+        Ok(query.execute(conn)?)
+    }
+
     pub fn delete(
         &self,
         conn: &PgConnection,

Original file line number	Diff line number	Diff line change
`@@ -507,6 +507,9 @@ impl Connection {`
`507`	`507`	`}`
`508`	`508`	`}`
`509`	`509`
	`510`	+ /// Overwrite an entity with a new version. The `history_event` indicates
	`511`	`+ /// at which block the new version becomes valid if it is given. If it is`
	`512`	+ /// `None`, the entity is treated as unversioned
`510`	`513`	`pub(crate) fn update(`
`511`	`514`	`&self,`
`512`	`515`	`key: &EntityKey,`
`@@ -522,7 +525,7 @@ impl Connection {`
`522`	`525`	`layout.update(&self.conn, key, entity, block_number(&history_event))`
`523`	`526`	`}`
`524`	`527`	`None => layout`
`525`		`- .update_unversioned(&self.conn, key, &entity)`
	`528`	`+ .overwrite_unversioned(&self.conn, key, entity)`
`526`	`529`	`.map(\|_\| ()),`
`527`	`530`	`},`
`528`	`531`	`}`
`@@ -537,7 +540,7 @@ impl Connection {`
`537`	`540`	`) -> Result<usize, StoreError> {`
`538`	`541`	`match &*self.metadata {`
`539`	`542`	`Storage::Json(json) => json.update_metadata(&self.conn, key, entity),`
`540`		`- Storage::Relational(layout) => layout.update_unversioned(&self.conn, key, entity),`
	`543`	`+ Storage::Relational(layout) => layout.update_metadata(&self.conn, key, entity),`
`541`	`544`	`}`
`542`	`545`	`}`
`543`	`546`