fix spec version in input schema

Author: Zoran Cvetkov

graph/src/components/store/entity_cache.rs

@@ -207,9 +207,13 @@ impl EntityCache {
         };
 
         // Always test the cache consistency in debug mode. The test only
-        // makes sense when we were actually asked to read from the store
+        // makes sense when we were actually asked to read from the store.
+        // We need to remove the VID as the one from the DB  might come from
+        // a legacy subgraph that has VID autoincremented while this trait
+        // always creates it in a new style.
         debug_assert!(match scope {
-            GetScope::Store => entity == self.store.get(key).unwrap().map(Arc::new),
+            GetScope::Store =>
+                remove_vid(entity.clone()) == remove_vid(self.store.get(key).unwrap().map(Arc::new)),
             GetScope::InBlock => true,
         });
 
@@ -549,3 +553,18 @@ impl EntityCache {
         })
     }
 }
+
+// Release build still needs this function althought it will never call it
+#[cfg(not(debug_assertions))]
+fn remove_vid(_: Option<Arc<Entity>>) -> Option<Entity> {
+    None
+}
+
+#[cfg(debug_assertions)]
+fn remove_vid(entity: Option<Arc<Entity>>) -> Option<Entity> {
+    entity.map(|e| {
+        let mut entity = (*e).clone();
+        entity.remove("vid");
+        entity
+    })
+}

store/postgres/src/deployment.rs

@@ -13,6 +13,7 @@ use diesel::{
     sql_query,
     sql_types::{Nullable, Text},
 };
+use graph::semver::Version;
 use graph::{
     blockchain::block_stream::FirehoseCursor, data::subgraph::schema::SubgraphError, env::ENV_VARS,
     schema::EntityType,
@@ -301,11 +302,13 @@ pub fn debug_fork(
 
 pub fn schema(conn: &mut PgConnection, site: &Site) -> Result<(InputSchema, bool), StoreError> {
     use subgraph_manifest as sm;
-    let (s, use_bytea_prefix) = sm::table
-        .select((sm::schema, sm::use_bytea_prefix))
+    let (s, spec_ver, use_bytea_prefix) = sm::table
+        .select((sm::schema, sm::spec_version, sm::use_bytea_prefix))
         .filter(sm::id.eq(site.id))
-        .first::<(String, bool)>(conn)?;
-    InputSchema::parse_latest(s.as_str(), site.deployment.clone())
+        .first::<(String, String, bool)>(conn)?;
+    let spec_version =
+        Version::parse(spec_ver.as_str()).map_err(|err| StoreError::Unknown(err.into()))?;
+    InputSchema::parse(&spec_version, s.as_str(), site.deployment.clone())
         .map_err(StoreError::Unknown)
         .map(|schema| (schema, use_bytea_prefix))
 }

store/postgres/src/relational/ddl.rs

@@ -117,11 +117,8 @@ impl Table {
         }
 
         // Currently the agregations entities don't have VIDs in insertion order
-        let vid_type = if self.object.is_object_type() {
-            "bigint"
-        } else {
-            "bigserial"
-        };
+        let new_vid_form = self.object.new_vid_form() && self.object.is_object_type();
+        let vid_type = if new_vid_form { "bigint" } else { "bigserial" };
 
         if self.immutable {
             writeln!(