Feature/table types

packages/schema/src/schema.rs

@@ -93,19 +93,11 @@ impl<'a> TypeInfo<'a> {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct Query<'a> {
     l: std::marker::PhantomData<&'a ()>,
 }
 
-impl<'a> Query<'a> {
-    pub fn new() -> Self {
-        Self {
-            l: std::marker::PhantomData {},
-        }
-    }
-}
-
 impl<'b> juniper::GraphQLTypeAsync<juniper::DefaultScalarValue> for Query<'b> {
     fn resolve_field_async<'a>(
         &'a self,
@@ -185,7 +177,7 @@ pub async fn build<'a>(config: &crate::Config) -> Schema<'a> {
     };
 
     juniper::RootNode::new_with_info(
-        Query::new(),
+        Query::default(),
         juniper::EmptyMutation::<crate::context::Context>::new(),
         juniper::EmptySubscription::<crate::context::Context>::new(),
         TypeInfo::new("Query".into(), fields),

tests/data.sql

@@ -0,0 +1,3 @@
+insert into t1 (id) values (1);
+insert into t2 (id, c1, c2) values (1, 2, 3);
+insert into t2 (id, c1, c2) values (2, 4, null);

tests/introspection.test.expected.graphql

@@ -1,4 +1,14 @@
 type Query {
-  t1: Int!
-  t2: Int!
+  t1: T1!
+  t2: T2!
+}
+
+type T1 {
+    id: Int!
+}
+
+type T2 {
+    id: Int!
+    c1: Int!
+    c2: Int!
 }

tests/run.sh

@@ -241,7 +241,11 @@ reset_database () {
     if [ -z "$keep_database" ]; then
         psql="PGPASSWORD=\"$PGQL_DB_PASSWORD\" psql -h \"$PGQL_DB_HOST\" -U \"$PGQL_DB_USER\" -w -v ON_ERROR_STOP=1 -q"
         echo "drop database if exists $PGQL_DB_NAME; create database $PGQL_DB_NAME" | eval "$psql"
-        cat ./schema.sql | envsubst | eval "$psql" -d "$PGQL_DB_NAME"
+        {
+            echo "begin;"
+            cat ./schema.sql ./data.sql
+            echo "commit;"
+        } | envsubst | eval "$psql" -d "$PGQL_DB_NAME"
     fi
 }
 

tests/schema.sql

@@ -1,2 +1,9 @@
-create table t1 (id int not null primary key);
-create table t2 (id int not null primary key);
+create table t1 (
+    id int not null primary key
+);
+
+create table t2 (
+    id int not null primary key,
+    c1 int not null,
+    c2 int
+);