jinaga-server 2.3.1 → 2.3.3

package/test/postgres/postgresReadSpec.ts

@@ -74,7 +74,9 @@ describe("Postgres read", () => {
 
         const sql = composer.getSqlQueries().sqlQuery.sql;
         expect(sql).toEqual(
-            `SELECT f2.hash as hash2, f2.fact_id as id2, f2.data as data2 ` +
+            `SELECT ` +
+                `f1.hash as hash1, f1.fact_id as id1, f1.data as data1, ` +
+                `f2.hash as hash2, f2.fact_id as id2, f2.data as data2 ` +
             `FROM public.fact f1 ` +
             `JOIN public.edge e1 ` +
                 `ON e1.predecessor_fact_id = f1.fact_id ` +
@@ -103,7 +105,9 @@ describe("Postgres read", () => {
         const tree = composer.getSqlQueries();
         const sql = tree.sqlQuery.sql;
         expect(sql).toEqual(
-            `SELECT f3.hash as hash3, f3.fact_id as id3, f3.data as data3 ` +
+            `SELECT ` +
+                `f1.hash as hash1, f1.fact_id as id1, f1.data as data1, ` +
+                `f3.hash as hash3, f3.fact_id as id3, f3.data as data3 ` +
             `FROM public.fact f1 ` +
             `JOIN public.edge e1 ` +
                 `ON e1.predecessor_fact_id = f1.fact_id ` +
@@ -152,7 +156,9 @@ describe("Postgres read", () => {
         const tree = composer.getSqlQueries();
         const sql = tree.sqlQuery.sql;
         expect(sql).toEqual(
-            `SELECT f3.hash as hash3, f3.fact_id as id3, f3.data as data3 ` +
+            `SELECT ` +
+                `f1.hash as hash1, f1.fact_id as id1, f1.data as data1, ` +
+                `f3.hash as hash3, f3.fact_id as id3, f3.data as data3 ` +
             `FROM public.fact f1 ` +
             `JOIN public.edge e1 ` +
                 `ON e1.predecessor_fact_id = f1.fact_id ` +
@@ -184,6 +190,59 @@ describe("Postgres read", () => {
         ]);
     });
 
+    it("should read nested existential conditions", () => {
+        const { composer, factTypes, roleMap } = sqlFor(`
+            (company: Company) {
+                project: Project [
+                    project->company: Company = company
+                    !E {
+                        deleted: Project.Deleted [
+                            deleted->project: Project = project
+                            !E {
+                                restored: Project.Restored [
+                                    restored->deleted: Project.Deleted = deleted
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            } => project
+        `);
+
+        const tree = composer.getSqlQueries();
+        const sql = tree.sqlQuery.sql;
+        expect(sql).toEqual(
+            `SELECT ` +
+                `f1.hash as hash1, f1.fact_id as id1, f1.data as data1, ` +
+                `f2.hash as hash2, f2.fact_id as id2, f2.data as data2 ` +
+            `FROM public.fact f1 ` +
+            `JOIN public.edge e1 ` +
+                `ON e1.predecessor_fact_id = f1.fact_id ` +
+                `AND e1.role_id = $3 ` +
+            `JOIN public.fact f2 ` +
+                `ON f2.fact_id = e1.successor_fact_id ` +
+            `WHERE f1.fact_type_id = $1 AND f1.hash = $2 ` +
+            `AND NOT EXISTS (` +
+                `SELECT 1 ` +
+                `FROM public.edge e2 ` +
+                `JOIN public.fact f3 ` +
+                    `ON f3.fact_id = e2.successor_fact_id ` +
+                `WHERE e2.predecessor_fact_id = f2.fact_id ` +
+                    `AND e2.role_id = $4 ` +
+                `AND NOT EXISTS (` +
+                    `SELECT 1 ` +
+                    `FROM public.edge e3 ` +
+                    `JOIN public.fact f4 ` +
+                        `ON f4.fact_id = e3.successor_fact_id ` +
+                    `WHERE e3.predecessor_fact_id = f3.fact_id ` +
+                        `AND e3.role_id = $5` +
+                `)` +
+            `) ` +
+            `ORDER BY f2.fact_id ASC`
+        );
+        expect(tree.sqlQuery.parameters).toEqual
+    });
+
     it("should read complex specifications", () => {
         const { composer, factTypes, roleMap } = sqlFor(`
             (company: Company, user: Jinaga.User) {
@@ -234,6 +293,7 @@ describe("Postgres read", () => {
         const queries = composer.getSqlQueries();
         expect(queries.sqlQuery.sql).toEqual(
             `SELECT ` +
+                `f1.hash as hash1, f1.fact_id as id1, f1.data as data1, ` +
                 `f3.hash as hash3, f3.fact_id as id3, f3.data as data3, ` +
                 `f9.hash as hash9, f9.fact_id as id9, f9.data as data9 ` +
             `FROM public.fact f1 ` +

package/docs/registrations.sql

@@ -1,22 +0,0 @@
-SELECT F3.HASH AS HASH3,
-	F4.HASH AS HASH4,
-	F6.HASH AS HASH6,
-	sort(array[F3.FACT_ID, F4.FACT_ID, F6.FACT_ID], 'desc') as bookmark
-FROM PUBLIC.FACT F1
-JOIN PUBLIC.EDGE E1 ON E1.PREDECESSOR_FACT_ID = F1.FACT_ID
-AND E1.ROLE_ID = 44
-JOIN PUBLIC.FACT F3 ON F3.FACT_ID = E1.SUCCESSOR_FACT_ID
-JOIN PUBLIC.EDGE E2 ON E2.PREDECESSOR_FACT_ID = F3.FACT_ID
-AND e2.ROLE_ID = 46
-JOIN PUBLIC.FACT F4 ON F4.FACT_ID = E2.SUCCESSOR_FACT_ID
-JOIN PUBLIC.EDGE E4 ON E4.PREDECESSOR_FACT_ID = F4.FACT_ID
-AND E4.ROLE_ID = 18
-JOIN PUBLIC.FACT F6 ON F6.FACT_ID = E4.SUCCESSOR_FACT_ID
-JOIN PUBLIC.EDGE E5 ON E5.SUCCESSOR_FACT_ID = F6.FACT_ID
-AND E5.ROLE_ID = 23
-JOIN PUBLIC.FACT F2 ON F2.FACT_ID = E5.PREDECESSOR_FACT_ID
-WHERE F1.FACT_TYPE_ID = 35
-	AND F1.HASH = '5kIRDvVO/wP4v7G9vhDAPMVi2q0cXsZtp9YuyAjan7yyDUhFFPiwwNnzTor6jFdkC11CYnDmoZueMAqxF9MPTQ=='
-	AND F2.FACT_TYPE_ID = 24
-	AND F2.HASH = '0WWlFbZH+gMoP3QGXO7/mf6hIQC/2iN7wd0peEQKFVvnJMp3gTVvi4eXfVd3DSa81MSzAVp7zVxXIiRnJTF0Kw=='
-ORDER BY bookmark ASC

package/docs/sql/example.sql

@@ -1,49 +0,0 @@
-     SELECT f4.hash AS hash4, f4.fact_id AS id4, f4.data AS data4
-          , f7.hash AS hash7, f7.fact_id AS id7, f7.data AS data7
-          , f9.hash AS hash9, f9.fact_id AS id9, f9.data AS data9
-       FROM public.fact f1
-       JOIN public.edge e1
-         ON e1.predecessor_fact_id = f1.fact_id
-        AND e1.role_id = $3
-       JOIN public.fact f3
-         ON f3.fact_id = e1.successor_fact_id
-       JOIN public.edge e2
-         ON e2.predecessor_fact_id = f3.fact_id
-        AND e2.role_id = $4
-       JOIN public.fact f4
-         ON f4.fact_id = e2.successor_fact_id
-       JOIN public.edge e5
-         ON e5.predecessor_fact_id = f4.fact_id
-        AND e5.role_id = $7
-       JOIN public.fact f7
-         ON f7.fact_id = e5.successor_fact_id
-       JOIN public.edge e6
-         ON e6.successor_fact_id = f7.fact_id
-        AND e6.role_id = $10
-       JOIN public.fact f2
-         ON f2.fact_id = e6.predecessor_fact_id
-       JOIN public.edge e8
-         ON e8.predecessor_fact_id = f4.fact_id
-        AND e8.role_id = $12
-       JOIN public.fact f9
-         ON f9.fact_id = e8.successor_fact_id
-      WHERE 1=1
-       AND f1.fact_type_id = $1
-        AND f1.hash = $2
-        AND f2.fact_type_id = $8
-        AND f2.hash = $9
-        AND NOT EXISTS (SELECT 1
-                          FROM public.edge e3
-                          JOIN public.fact f5
-                            ON f5.fact_id = e3.successor_fact_id
-                         WHERE 1=1
-                           AND e3.predecessor_fact_id = f4.fact_id
-                           AND e3.role_id = $5)
-        AND NOT EXISTS (SELECT 1
-                          FROM public.edge e7
-                          JOIN public.fact f8
-                            ON f8.fact_id = e7.successor_fact_id
-                         WHERE 1=1
-                           AND e7.predecessor_fact_id = f7.fact_id
-                           AND e7.role_id = $11)
-   ORDER BY f4.fact_id ASC, f7.fact_id ASC, f9.fact_id ASC

package/docs/sql-generator.gv

@@ -1,25 +0,0 @@
-digraph {
-    subgraph cluster_states {
-        color=transparent
-        PredecessorType -> PredecessorJoin [label="Predecessor\nemit edge"]
-        PredecessorJoin -> PredecessorType [label="Type"]
-        PredecessorType -> SuccessorJoin [label="Successor" constraint=false]
-
-        SuccessorType -> SuccessorJoin [label="Successor"]
-        SuccessorJoin -> SuccessorType [label="Type\nemit edge"]
-        SuccessorType -> PredecessorJoin [label="Predecessor\nemit fact\nemit edge" constraint=false]
-    }
-
-    subgraph cluster_terminal {
-        color=transparent
-        success
-        error
-    }
-
-    SuccessorJoin -> error [label="end"]
-    SuccessorType -> success [label="end\nemit fact"]
-    PredecessorType -> success [label="end\nemit fact"]
-    PredecessorJoin -> success [label="end\nemit fact"]
-
-    // {rank=same; SuccessorType; success }
-}