tests for table relations & bugfix for not detecting child relations of view

src/PostgREST/PgStructure.hs

@@ -94,34 +94,49 @@ allTables = do
 allRelations :: H.Tx P.Postgres s [Relation]
 allRelations = do
   rels <- H.listEx $ [H.stmt|
-      WITH table_fk AS (
-          SELECT DISTINCT
-              tc.table_schema, tc.table_name, kcu.column_name,
-              ccu.table_name AS foreign_table_name,
-              ccu.column_name AS foreign_column_name
-          FROM information_schema.table_constraints AS tc
-          JOIN information_schema.key_column_usage AS kcu on tc.constraint_name = kcu.constraint_name
-          JOIN information_schema.constraint_column_usage AS ccu on ccu.constraint_name = tc.constraint_name
-          WHERE   constraint_type = 'FOREIGN KEY'
-              AND tc.table_schema NOT IN ('pg_catalog', 'information_schema')
-          ORDER BY tc.table_schema, tc.table_name, kcu.column_name
-      )
-      SELECT * FROM table_fk
-      UNION
-      (
-          SELECT DISTINCT
-              vcu.table_schema, vcu.view_name AS table_name, vcu.column_name,
-              table_fk.foreign_table_name,
-              table_fk.foreign_column_name
-          FROM information_schema.view_column_usage as vcu
-          JOIN table_fk ON
-              table_fk.table_schema = vcu.view_schema AND
-              table_fk.table_name = vcu.table_name AND
-              table_fk.column_name = vcu.column_name
-          WHERE vcu.view_schema NOT IN ('pg_catalog', 'information_schema')
-          ORDER BY vcu.table_schema, vcu.view_name, vcu.column_name
-      )
-
+    WITH table_fk AS (
+        SELECT
+            tc.table_schema, tc.table_name, kcu.column_name,
+            ccu.table_name AS foreign_table_name,
+            ccu.column_name AS foreign_column_name
+        FROM information_schema.table_constraints AS tc
+        JOIN information_schema.key_column_usage AS kcu on tc.constraint_name = kcu.constraint_name
+        JOIN information_schema.constraint_column_usage AS ccu on ccu.constraint_name = tc.constraint_name
+        WHERE   constraint_type = 'FOREIGN KEY'
+            AND tc.table_schema NOT IN ('pg_catalog', 'information_schema')
+        ORDER BY tc.table_schema, tc.table_name, kcu.column_name
+    )
+    SELECT * FROM table_fk
+    UNION
+    (
+        SELECT
+            vcu.table_schema, vcu.view_name AS table_name, vcu.column_name,
+            table_fk.foreign_table_name,
+            table_fk.foreign_column_name
+        FROM information_schema.view_column_usage as vcu
+        JOIN table_fk ON
+            table_fk.table_schema = vcu.view_schema AND
+            table_fk.table_name = vcu.table_name AND
+            table_fk.column_name = vcu.column_name
+        WHERE vcu.view_schema NOT IN ('pg_catalog', 'information_schema')
+        ORDER BY vcu.table_schema, vcu.view_name, vcu.column_name
+    )
+    UNION
+    (
+        SELECT
+            vcu.view_schema as table_schema,
+            table_fk.table_name,
+            table_fk.column_name,
+            vcu.view_name as foreign_table_name,
+            vcu.column_name as foreign_column_name
+        FROM information_schema.view_column_usage as vcu
+        JOIN table_fk ON
+            table_fk.table_schema = vcu.view_schema AND
+            table_fk.foreign_table_name = vcu.table_name AND
+            table_fk.foreign_column_name = vcu.column_name
+        WHERE vcu.view_schema NOT IN ('pg_catalog', 'information_schema')
+        ORDER BY vcu.table_schema, vcu.view_name, vcu.column_name
+    )
   |]
   let simpleRelations = foldr (addParentRelation.relationFromRow) [] rels
   let links = filter ((==2).length) $ groupWith groupFn $ filter ( (==Child). relType) simpleRelations