store: Change the way we determine the type for 'id' fields

We now take `ID` to be synonymous with `String` and allow any type as a
primary key

store/postgres/examples/layout.rs

@@ -2,11 +2,10 @@ extern crate clap;
 extern crate graph_store_postgres;
 
 use clap::App;
-use graphql_parser::parse_schema;
 use std::fs;
 use std::process::exit;
 
-use graph::prelude::SubgraphDeploymentId;
+use graph::prelude::{Schema, SubgraphDeploymentId};
 use graph_store_postgres::relational::{ColumnType, Layout};
 
 pub fn usage(msg: &str) -> ! {
@@ -136,11 +135,12 @@ pub fn main() {
     let db_schema = args.value_of("db_schema").unwrap_or("rel");
     let kind = args.value_of("generate").unwrap_or("ddl");
 
-    let schema = ensure(fs::read_to_string(schema), "Can not read schema file");
-    let schema = ensure(parse_schema(&schema), "Failed to parse schema");
     let subgraph = SubgraphDeploymentId::new("Qmasubgraph").unwrap();
+    let schema = ensure(fs::read_to_string(schema), "Can not read schema file");
+    let schema = ensure(Schema::parse(&schema, subgraph), "Failed to parse schema");
+
     let layout = ensure(
-        Layout::new(&schema, subgraph, db_schema),
+        Layout::new(&schema, db_schema),
         "Failed to construct Mapping",
     );
     match kind {

store/postgres/src/entities.rs

@@ -792,13 +792,9 @@ impl Connection {
         self.conn.batch_execute(&*query)?;
 
         match *GRAPH_STORAGE_SCHEME {
-            v::Relational => Layout::create_relational_schema(
-                &self.conn,
-                &schema_name,
-                schema.id.clone(),
-                &schema.document,
-            )
-            .map(|_| ()),
+            v::Relational => {
+                Layout::create_relational_schema(&self.conn, schema, schema_name).map(|_| ())
+            }
             v::Split => create_split_schema(&self.conn, &schema_name),
         }
     }
@@ -1291,7 +1287,7 @@ impl Storage {
             }
             V::Relational => {
                 let subgraph_schema = store.input_schema(subgraph)?;
-                let layout = Layout::new(&subgraph_schema.document, subgraph.clone(), schema.name)?;
+                let layout = Layout::new(subgraph_schema.as_ref(), &schema.name)?;
                 Storage::Relational(layout)
             }
         };