store: Asyncify Layout::create_relational_schema

Author: lutter

store/postgres/src/deployment_store.rs

@@ -226,7 +226,7 @@ impl DeploymentStore {
                         schema,
                         entities_with_causality_region.into_iter().collect(),
                         index_def,
-                    )?;
+                    ).await?;
                     // See if we are grafting and check that the graft is permissible
                     if let Some(base) = graft_base {
                         let errors = layout.can_copy_from(&base);

store/postgres/src/relational.rs

@@ -375,7 +375,7 @@ impl Layout {
         }
     }
 
-    pub fn create_relational_schema(
+    pub async fn create_relational_schema(
         conn: &mut PgConnection,
         site: Arc<Site>,
         schema: &InputSchema,

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

@@ -487,7 +487,7 @@ fn insert_pets(conn: &mut PgConnection, layout: &Layout) {
     insert_pet(conn, layout, &*CAT_TYPE, "garfield", "Garfield", 0, 1);
 }
 
-fn create_schema(conn: &mut PgConnection) -> Layout {
+async fn create_schema(conn: &mut PgConnection) -> Layout {
     let schema = InputSchema::parse_latest(THINGS_GQL, THINGS_SUBGRAPH_ID.clone()).unwrap();
     let site = make_dummy_site(
         THINGS_SUBGRAPH_ID.clone(),
@@ -498,6 +498,7 @@ fn create_schema(conn: &mut PgConnection) -> Layout {
     conn.batch_execute(&query).unwrap();
 
     Layout::create_relational_schema(conn, Arc::new(site), &schema, BTreeSet::new(), None)
+        .await
         .expect("Failed to create relational schema")
 }
 
@@ -549,7 +550,7 @@ where
         remove_schema(conn);
 
         // Create the database schema
-        let layout = create_schema(conn);
+        let layout = create_schema(conn).await;
 
         // Run test
         test(conn, &layout).await;

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

@@ -142,7 +142,7 @@ fn insert_thing(conn: &mut PgConnection, layout: &Layout, id: &str, name: &str,
     );
 }
 
-fn create_schema(conn: &mut PgConnection) -> Layout {
+async fn create_schema(conn: &mut PgConnection) -> Layout {
     let schema = InputSchema::parse_latest(THINGS_GQL, THINGS_SUBGRAPH_ID.clone()).unwrap();
 
     let query = format!("create schema {}", NAMESPACE.as_str());
@@ -154,6 +154,7 @@ fn create_schema(conn: &mut PgConnection) -> Layout {
         NETWORK_NAME.to_string(),
     );
     Layout::create_relational_schema(conn, Arc::new(site), &schema, BTreeSet::new(), None)
+        .await
         .expect("Failed to create relational schema")
 }
 
@@ -198,7 +199,7 @@ where
         remove_test_data(conn);
 
         // Seed database with test data
-        let layout = create_schema(conn);
+        let layout = create_schema(conn).await;
 
         // Run test
         test(conn, &layout).await;