Update snapshots now more queries are inlined

graphile · Feb 28, 2025 · e26ae9b · e26ae9b
1 parent 9570419
commit e26ae9b
Show file tree

Hide file tree

Showing 72 changed files with 2,675 additions and 2,400 deletions.
diff --git a/...ataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-6.mermaid b/...ataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-6.mermaid
@@ -12,42 +12,44 @@ graph TD
     PgSelect8[["PgSelect[8∈0] ➊<br />ᐸforumsᐳ"]]:::plan
     Object11{{"Object[11∈0] ➊<br />ᐸ{pgSettings,withPgClient}ᐳ"}}:::plan
     Lambda12[["Lambda[12∈0] ➊<br />ᐸincludeArchivedConditionᐳ"]]:::unbatchedplan
-    Object11 & Lambda12 --> PgSelect8
+    PgSelectInlineApply55["PgSelectInlineApply[55∈0] ➊"]:::plan
+    Object11 & Lambda12 & PgSelectInlineApply55 --> PgSelect8
+    Lambda25[["Lambda[25∈0] ➊<br />ᐸincludeArchivedConditionᐳ"]]:::unbatchedplan
+    Lambda25 --> PgSelectInlineApply55
     Access9{{"Access[9∈0] ➊<br />ᐸ2.pgSettingsᐳ"}}:::plan
     Access10{{"Access[10∈0] ➊<br />ᐸ2.withPgClientᐳ"}}:::plan
     Access9 & Access10 --> Object11
     Connection23{{"Connection[23∈0] ➊<br />ᐸ19ᐳ"}}:::plan
     __Value2["__Value[2∈0] ➊<br />ᐸcontextᐳ"]:::plan
     __Value2 --> Access9
     __Value2 --> Access10
-    Constant55{{"Constant[55∈0] ➊<br />ᐸ'EXCLUSIVELY'ᐳ"}}:::plan
-    Constant55 --> Lambda12
+    Constant59{{"Constant[59∈0] ➊<br />ᐸ'EXCLUSIVELY'ᐳ"}}:::plan
+    Constant59 --> Lambda12
     PgSelectRows13[["PgSelectRows[13∈0] ➊"]]:::plan
     PgSelect8 --> PgSelectRows13
-    Lambda25[["Lambda[25∈0] ➊<br />ᐸincludeArchivedConditionᐳ"]]:::unbatchedplan
-    Constant56{{"Constant[56∈0] ➊<br />ᐸ'INHERIT'ᐳ"}}:::plan
-    Constant56 --> Lambda25
+    Constant60{{"Constant[60∈0] ➊<br />ᐸ'INHERIT'ᐳ"}}:::plan
+    Constant60 --> Lambda25
     __Value4["__Value[4∈0] ➊<br />ᐸrootValueᐳ"]:::plan
     __Item14[/"__Item[14∈1]<br />ᐸ13ᐳ"\]:::itemplan
     PgSelectRows13 ==> __Item14
     PgSelectSingle15{{"PgSelectSingle[15∈1]<br />ᐸforumsᐳ"}}:::plan
     __Item14 --> PgSelectSingle15
     PgClassExpression16{{"PgClassExpression[16∈2]<br />ᐸ__forums__.”name”ᐳ"}}:::plan
     PgSelectSingle15 --> PgClassExpression16
-    PgSelect26[["PgSelect[26∈3]<br />ᐸmessagesᐳ"]]:::plan
-    PgClassExpression18{{"PgClassExpression[18∈3]<br />ᐸ__forums__.”id”ᐳ"}}:::plan
-    PgClassExpression24{{"PgClassExpression[24∈3]<br />ᐸ__forums__...chived_at”ᐳ"}}:::plan
-    Object11 & PgClassExpression18 & PgClassExpression24 & Lambda25 & Connection23 --> PgSelect26
-    PgSelectSingle15 --> PgClassExpression18
-    PgSelectSingle15 --> PgClassExpression24
+    List57{{"List[57∈3]<br />ᐸ14,56ᐳ"}}:::plan
+    Access56{{"Access[56∈3] ➊<br />ᐸ8.m.subqueryDetailsFor26ᐳ"}}:::plan
+    __Item14 & Access56 --> List57
     PgSelectRows27[["PgSelectRows[27∈3]"]]:::plan
-    PgSelect26 --> PgSelectRows27
+    Lambda58{{"Lambda[58∈3]"}}:::plan
+    Lambda58 --> PgSelectRows27
+    PgSelect8 --> Access56
+    List57 --> Lambda58
     __Item28[/"__Item[28∈4]<br />ᐸ27ᐳ"\]:::itemplan
     PgSelectRows27 ==> __Item28
     PgSelectSingle29{{"PgSelectSingle[29∈4]<br />ᐸmessagesᐳ"}}:::plan
     __Item28 --> PgSelectSingle29
-    Access43{{"Access[43∈4]<br />ᐸ26.cursorDetailsᐳ"}}:::plan
-    PgSelect26 --> Access43
+    Access43{{"Access[43∈4]<br />ᐸ58.cursorDetailsᐳ"}}:::plan
+    Lambda58 --> Access43
     PgCursor44{{"PgCursor[44∈5]"}}:::plan
     PgSelectSingle29 & Access43 --> PgCursor44
     PgClassExpression30{{"PgClassExpression[30∈5]<br />ᐸ__messages__.”body”ᐳ"}}:::plan
@@ -82,19 +84,19 @@ graph TD
     %% define steps
 
     subgraph "Buckets for queries/conditions/archived-forum-inherited-messages.defer-6"
-    Bucket0("Bucket 0 (root)<br /><br />1: <br />ᐳ: 6, 9, 10, 55, 56, 11, 23<br />2: Lambda[12], Lambda[25]<br />3: PgSelect[8]<br />4: PgSelectRows[13]"):::bucket
+    Bucket0("Bucket 0 (root)<br /><br />1: <br />ᐳ: 6, 9, 10, 59, 60, 11, 23<br />2: Lambda[12], Lambda[25]<br />3: PgSelectInlineApply[55]<br />4: PgSelect[8]<br />5: PgSelectRows[13]"):::bucket
     classDef bucket0 stroke:#696969
-    class Bucket0,__Value2,__Value4,PgSelect8,Access9,Access10,Object11,Lambda12,PgSelectRows13,Connection23,Lambda25,Constant55,Constant56 bucket0
-    Bucket1("Bucket 1 (listItem)<br />Deps: 11, 25, 23, 6<br /><br />ROOT __Item{1}ᐸ13ᐳ[14]"):::bucket
+    class Bucket0,__Value2,__Value4,PgSelect8,Access9,Access10,Object11,Lambda12,PgSelectRows13,Connection23,Lambda25,PgSelectInlineApply55,Constant59,Constant60 bucket0
+    Bucket1("Bucket 1 (listItem)<br />Deps: 8, 23, 11<br /><br />ROOT __Item{1}ᐸ13ᐳ[14]"):::bucket
     classDef bucket1 stroke:#00bfff
     class Bucket1,__Item14,PgSelectSingle15 bucket1
-    Bucket2("Bucket 2 (nullableBoundary)<br />Deps: 15, 11, 25, 23, 6<br /><br />ROOT PgSelectSingle{1}ᐸforumsᐳ[15]"):::bucket
+    Bucket2("Bucket 2 (nullableBoundary)<br />Deps: 15, 8, 14, 23, 11<br /><br />ROOT PgSelectSingle{1}ᐸforumsᐳ[15]"):::bucket
     classDef bucket2 stroke:#7f007f
     class Bucket2,PgClassExpression16 bucket2
-    Bucket3("Bucket 3 (nullableBoundary)<br />Deps: 15, 11, 25, 23, 6<br /><br />ROOT Connectionᐸ19ᐳ[23]<br />1: <br />ᐳ: 18, 24<br />2: PgSelect[26]<br />3: PgSelectRows[27]"):::bucket
+    Bucket3("Bucket 3 (nullableBoundary)<br />Deps: 8, 14, 23, 11<br /><br />ROOT Connectionᐸ19ᐳ[23]<br />1: <br />ᐳ: Access[56], List[57], Lambda[58]<br />2: PgSelectRows[27]"):::bucket
     classDef bucket3 stroke:#ffa500
-    class Bucket3,PgClassExpression18,PgClassExpression24,PgSelect26,PgSelectRows27 bucket3
-    Bucket4("Bucket 4 (listItem)<br />Deps: 26, 11<br /><br />ROOT __Item{4}ᐸ27ᐳ[28]"):::bucket
+    class Bucket3,PgSelectRows27,Access56,List57,Lambda58 bucket3
+    Bucket4("Bucket 4 (listItem)<br />Deps: 58, 11<br /><br />ROOT __Item{4}ᐸ27ᐳ[28]"):::bucket
     classDef bucket4 stroke:#0000ff
     class Bucket4,__Item28,PgSelectSingle29,Access43 bucket4
     Bucket5("Bucket 5 (nullableBoundary)<br />Deps: 29, 43, 11<br /><br />ROOT PgSelectSingle{4}ᐸmessagesᐳ[29]"):::bucket

diff --git a/...st/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-6.sql b/...st/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-6.sql
@@ -1,7 +1,20 @@
 select
   __forums__."name" as "0",
-  __forums__."id" as "1",
-  to_char(__forums__."archived_at", 'YYYY-MM-DD"T"HH24:MI:SS.USTZH:TZM'::text) as "2"
+  array(
+    select array[
+      __messages__."body",
+      __messages__."author_id",
+      __messages__."id"
+    ]::text[]
+    from app_public.messages as __messages__
+    where
+      (
+        __messages__."forum_id" = __forums__."id"
+      ) and (
+        (__messages__.archived_at is null) = (__forums__."archived_at" is null)
+      )
+    order by __messages__."id" asc
+  )::text as "1"
 from app_public.forums as __forums__
 where
   (
@@ -11,19 +24,6 @@ where
   )
 order by __forums__."id" asc;
 
-select
-  __messages__."body" as "0",
-  __messages__."author_id" as "1",
-  __messages__."id" as "2"
-from app_public.messages as __messages__
-where
-  (
-    __messages__."forum_id" = $1::"uuid"
-  ) and (
-    (__messages__.archived_at is null) = ($2::"timestamptz" is null)
-  )
-order by __messages__."id" asc;
-
 select __users_result__.*
 from (select ids.ordinality - 1 as idx, (ids.value->>0)::"uuid" as "id0" from json_array_elements($1::json) with ordinality as ids) as __users_identifiers__,
 lateral (

diff --git a/...taplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-2.mermaid b/...taplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-2.mermaid
@@ -12,21 +12,23 @@ graph TD
     PgSelect8[["PgSelect[8∈0] ➊<br />ᐸforumsᐳ"]]:::plan
     Object11{{"Object[11∈0] ➊<br />ᐸ{pgSettings,withPgClient}ᐳ"}}:::plan
     Lambda12[["Lambda[12∈0] ➊<br />ᐸincludeArchivedConditionᐳ"]]:::unbatchedplan
-    Object11 & Lambda12 --> PgSelect8
+    PgSelectInlineApply88["PgSelectInlineApply[88∈0] ➊"]:::plan
+    Object11 & Lambda12 & PgSelectInlineApply88 --> PgSelect8
+    Lambda25[["Lambda[25∈0] ➊<br />ᐸincludeArchivedConditionᐳ"]]:::unbatchedplan
+    Lambda25 --> PgSelectInlineApply88
     Access9{{"Access[9∈0] ➊<br />ᐸ2.pgSettingsᐳ"}}:::plan
     Access10{{"Access[10∈0] ➊<br />ᐸ2.withPgClientᐳ"}}:::plan
     Access9 & Access10 --> Object11
     Connection23{{"Connection[23∈0] ➊<br />ᐸ19ᐳ"}}:::plan
     __Value2["__Value[2∈0] ➊<br />ᐸcontextᐳ"]:::plan
     __Value2 --> Access9
     __Value2 --> Access10
-    Constant88{{"Constant[88∈0] ➊<br />ᐸ'EXCLUSIVELY'ᐳ"}}:::plan
-    Constant88 --> Lambda12
+    Constant92{{"Constant[92∈0] ➊<br />ᐸ'EXCLUSIVELY'ᐳ"}}:::plan
+    Constant92 --> Lambda12
     PgSelectRows13[["PgSelectRows[13∈0] ➊"]]:::plan
     PgSelect8 --> PgSelectRows13
-    Lambda25[["Lambda[25∈0] ➊<br />ᐸincludeArchivedConditionᐳ"]]:::unbatchedplan
-    Constant89{{"Constant[89∈0] ➊<br />ᐸ'INHERIT'ᐳ"}}:::plan
-    Constant89 --> Lambda25
+    Constant93{{"Constant[93∈0] ➊<br />ᐸ'INHERIT'ᐳ"}}:::plan
+    Constant93 --> Lambda25
     __Value4["__Value[4∈0] ➊<br />ᐸrootValueᐳ"]:::plan
     Constant26{{"Constant[26∈0] ➊<br />ᐸ[HIDDEN]ᐳ"}}:::plan
     Constant27{{"Constant[27∈0] ➊<br />ᐸtrueᐳ"}}:::plan
@@ -47,15 +49,16 @@ graph TD
     PgSelect43[["PgSelect[43∈3@s]<br />ᐸmessagesᐳ"]]:::plan
     PgSelectInlineApply82["PgSelectInlineApply[82∈3] ➊"]:::plan
     Object11 & PgClassExpression18 & PgClassExpression24 & Lambda25 & Connection23 & PgSelectInlineApply82 --> PgSelect43
-    PgSelect60[["PgSelect[60∈3]<br />ᐸmessages+1ᐳ"]]:::plan
-    Object11 & PgClassExpression18 & PgClassExpression24 & Lambda25 & Connection23 --> PgSelect60
     PgSelect71[["PgSelect[71∈3]<br />ᐸmessages(aggregate)ᐳ"]]:::plan
     Object11 & PgClassExpression18 & PgClassExpression24 & Lambda25 & Connection23 --> PgSelect71
     Object69{{"Object[69∈3]<br />ᐸ{first,last,offset,hasMore}ᐳ"}}:::plan
-    Access63{{"Access[63∈3]<br />ᐸ60.hasMoreᐳ"}}:::plan
+    Access63{{"Access[63∈3]<br />ᐸ91.hasMoreᐳ"}}:::plan
     Access63 --> Object69
     Object64{{"Object[64∈3]<br />ᐸ{first,last,hasMore}ᐳ"}}:::plan
     Access63 --> Object64
+    List90{{"List[90∈3]<br />ᐸ14,89ᐳ"}}:::plan
+    Access89{{"Access[89∈3] ➊<br />ᐸ8.m.subqueryDetailsFor60ᐳ"}}:::plan
+    __Item14 & Access89 --> List90
     PgSelectSingle15 --> PgClassExpression18
     PgSelectSingle15 --> PgClassExpression24
     PgSelectRows29[["PgSelectRows[29∈3@s]"]]:::plan
@@ -64,7 +67,8 @@ graph TD
     PgSelect43 --> PgSelectRows44
     PgPageInfo61{{"PgPageInfo[61∈3] ➊"}}:::plan
     Connection23 --> PgPageInfo61
-    PgSelect60 --> Access63
+    Lambda91{{"Lambda[91∈3]"}}:::plan
+    Lambda91 --> Access63
     Lambda65{{"Lambda[65∈3]<br />ᐸhasNextPageCbᐳ"}}:::plan
     Object64 --> Lambda65
     Lambda70{{"Lambda[70∈3]<br />ᐸhasPreviousPageCbᐳ"}}:::plan
@@ -77,6 +81,8 @@ graph TD
     First72 --> PgSelectSingle74
     PgClassExpression75{{"PgClassExpression[75∈3]<br />ᐸcount(*)ᐳ"}}:::plan
     PgSelectSingle74 --> PgClassExpression75
+    PgSelect8 --> Access89
+    List90 --> Lambda91
     __Item30[/"__Item[30∈4]<br />ᐸ29ᐳ"\]:::itemplan
     PgSelectRows29 ==> __Item30
     PgSelectSingle31{{"PgSelectSingle[31∈4]<br />ᐸmessagesᐳ"}}:::plan
@@ -129,18 +135,18 @@ graph TD
     %% define steps
 
     subgraph "Buckets for queries/conditions/archived-forum-inherited-messages.stream-2"
-    Bucket0("Bucket 0 (root)<br /><br />1: <br />ᐳ: 6, 9, 10, 26, 27, 77, 78, 83, 88, 89, 11, 23<br />2: Lambda[12], Lambda[25]<br />3: PgSelect[8]<br />4: PgSelectRows[13]"):::bucket
+    Bucket0("Bucket 0 (root)<br /><br />1: <br />ᐳ: 6, 9, 10, 26, 27, 77, 78, 83, 92, 93, 11, 23<br />2: Lambda[12], Lambda[25]<br />3: PgSelectInlineApply[88]<br />4: PgSelect[8]<br />5: PgSelectRows[13]"):::bucket
     classDef bucket0 stroke:#696969
-    class Bucket0,__Value2,__Value4,PgSelect8,Access9,Access10,Object11,Lambda12,PgSelectRows13,Connection23,Lambda25,Constant26,Constant27,Constant77,Constant78,Constant83,Constant88,Constant89 bucket0
-    Bucket1("Bucket 1 (listItem)<br />Deps: 11, 25, 23, 6, 26, 27, 77, 78, 83<br /><br />ROOT __Item{1}ᐸ13ᐳ[14]"):::bucket
+    class Bucket0,__Value2,__Value4,PgSelect8,Access9,Access10,Object11,Lambda12,PgSelectRows13,Connection23,Lambda25,Constant26,Constant27,Constant77,Constant78,Constant83,PgSelectInlineApply88,Constant92,Constant93 bucket0
+    Bucket1("Bucket 1 (listItem)<br />Deps: 11, 25, 23, 6, 8, 26, 27, 77, 78, 83<br /><br />ROOT __Item{1}ᐸ13ᐳ[14]"):::bucket
     classDef bucket1 stroke:#00bfff
     class Bucket1,__Item14,PgSelectSingle15 bucket1
-    Bucket2("Bucket 2 (nullableBoundary)<br />Deps: 15, 11, 25, 23, 6, 26, 27, 77, 78, 83<br /><br />ROOT PgSelectSingle{1}ᐸforumsᐳ[15]"):::bucket
+    Bucket2("Bucket 2 (nullableBoundary)<br />Deps: 15, 11, 25, 23, 6, 8, 14, 26, 27, 77, 78, 83<br /><br />ROOT PgSelectSingle{1}ᐸforumsᐳ[15]"):::bucket
     classDef bucket2 stroke:#7f007f
     class Bucket2,PgClassExpression16 bucket2
-    Bucket3("Bucket 3 (nullableBoundary)<br />Deps: 15, 11, 25, 23, 6, 26, 27, 77, 78, 83<br /><br />ROOT Connectionᐸ19ᐳ[23]<br />1: 76, 82<br />ᐳ: 18, 24, 61<br />2: 28, 43, 60, 71<br />ᐳ: 63, 64, 65, 69, 70<br />3: 29, 44, 73<br />ᐳ: 72, 74, 75"):::bucket
+    Bucket3("Bucket 3 (nullableBoundary)<br />Deps: 15, 11, 25, 23, 6, 8, 14, 26, 27, 77, 78, 83<br /><br />ROOT Connectionᐸ19ᐳ[23]<br />1: 76, 82<br />ᐳ: 18, 24, 61, 89, 90, 91, 63, 64, 65, 69, 70<br />2: 28, 43, 71<br />3: 29, 44, 73<br />ᐳ: 72, 74, 75"):::bucket
     classDef bucket3 stroke:#ffa500
-    class Bucket3,PgClassExpression18,PgClassExpression24,PgSelect28,PgSelectRows29,PgSelect43,PgSelectRows44,PgSelect60,PgPageInfo61,Access63,Object64,Lambda65,Object69,Lambda70,PgSelect71,First72,PgSelectRows73,PgSelectSingle74,PgClassExpression75,PgSelectInlineApply76,PgSelectInlineApply82 bucket3
+    class Bucket3,PgClassExpression18,PgClassExpression24,PgSelect28,PgSelectRows29,PgSelect43,PgSelectRows44,PgPageInfo61,Access63,Object64,Lambda65,Object69,Lambda70,PgSelect71,First72,PgSelectRows73,PgSelectSingle74,PgClassExpression75,PgSelectInlineApply76,PgSelectInlineApply82,Access89,List90,Lambda91 bucket3
     Bucket4("Bucket 4 (listItem)<br />Deps: 77, 78<br /><br />ROOT __Item{4}ᐸ29ᐳ[30]"):::bucket
     classDef bucket4 stroke:#0000ff
     class Bucket4,__Item30,PgSelectSingle31 bucket4

diff --git a/...t/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-2.sql b/...t/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-2.sql
@@ -1,7 +1,18 @@
 select
   __forums__."name" as "0",
   __forums__."id" as "1",
-  to_char(__forums__."archived_at", 'YYYY-MM-DD"T"HH24:MI:SS.USTZH:TZM'::text) as "2"
+  to_char(__forums__."archived_at", 'YYYY-MM-DD"T"HH24:MI:SS.USTZH:TZM'::text) as "2",
+  array(
+    select array[null]::text[]
+    from app_public.messages as __messages__
+    where
+      (
+        __messages__."forum_id" = __forums__."id"
+      ) and (
+        (__messages__.archived_at is null) = (__forums__."archived_at" is null)
+      )
+    order by __messages__."id" asc
+  )::text as "3"
 from app_public.forums as __forums__
 where
   (
@@ -74,16 +85,6 @@ close __SNAPSHOT_CURSOR_1__
 
 commit; /*fake*/
 
-select /* NOTHING?! */
-from app_public.messages as __messages__
-where
-  (
-    __messages__."forum_id" = $1::"uuid"
-  ) and (
-    (__messages__.archived_at is null) = ($2::"timestamptz" is null)
-  )
-order by __messages__."id" asc;
-
 select
   (count(*))::text as "0"
 from app_public.messages as __messages__

diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/basics.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/basics.mermaid
@@ -12,36 +12,38 @@ graph TD
     PgSelect8[["PgSelect[8∈0] ➊<br />ᐸforumsᐳ"]]:::plan
     Object11{{"Object[11∈0] ➊<br />ᐸ{pgSettings,withPgClient}ᐳ"}}:::plan
     Lambda12[["Lambda[12∈0] ➊<br />ᐸincludeArchivedConditionᐳ"]]:::unbatchedplan
-    Object11 & Lambda12 --> PgSelect8
+    PgSelectInlineApply30["PgSelectInlineApply[30∈0] ➊"]:::plan
+    Object11 & Lambda12 & PgSelectInlineApply30 --> PgSelect8
     Access9{{"Access[9∈0] ➊<br />ᐸ2.pgSettingsᐳ"}}:::plan
     Access10{{"Access[10∈0] ➊<br />ᐸ2.withPgClientᐳ"}}:::plan
     Access9 & Access10 --> Object11
+    Constant35{{"Constant[35∈0] ➊<br />ᐸ2ᐳ"}}:::plan
+    Lambda25[["Lambda[25∈0] ➊<br />ᐸincludeArchivedConditionᐳ"]]:::unbatchedplan
+    Constant35 & Lambda25 --> PgSelectInlineApply30
     __Value2["__Value[2∈0] ➊<br />ᐸcontextᐳ"]:::plan
     __Value2 --> Access9
     __Value2 --> Access10
-    Constant30{{"Constant[30∈0] ➊<br />ᐸ'YES'ᐳ"}}:::plan
-    Constant30 --> Lambda12
+    Constant34{{"Constant[34∈0] ➊<br />ᐸ'YES'ᐳ"}}:::plan
+    Constant34 --> Lambda12
     PgSelectRows13[["PgSelectRows[13∈0] ➊"]]:::plan
     PgSelect8 --> PgSelectRows13
-    Lambda25[["Lambda[25∈0] ➊<br />ᐸincludeArchivedConditionᐳ"]]:::unbatchedplan
     Constant18{{"Constant[18∈0] ➊<br />ᐸ'INHERIT'ᐳ"}}:::plan
     Constant18 --> Lambda25
     __Value4["__Value[4∈0] ➊<br />ᐸrootValueᐳ"]:::plan
-    Constant31{{"Constant[31∈0] ➊<br />ᐸ2ᐳ"}}:::plan
     __Item14[/"__Item[14∈1]<br />ᐸ13ᐳ"\]:::itemplan
     PgSelectRows13 ==> __Item14
     PgSelectSingle15{{"PgSelectSingle[15∈1]<br />ᐸforumsᐳ"}}:::plan
     __Item14 --> PgSelectSingle15
-    PgSelect20[["PgSelect[20∈2]<br />ᐸmessagesᐳ"]]:::plan
-    PgClassExpression19{{"PgClassExpression[19∈2]<br />ᐸ__forums__.”id”ᐳ"}}:::plan
-    PgClassExpression24{{"PgClassExpression[24∈2]<br />ᐸ__forums__...chived_at”ᐳ"}}:::plan
-    Object11 & PgClassExpression19 & Constant31 & PgClassExpression24 & Lambda25 --> PgSelect20
+    List32{{"List[32∈2]<br />ᐸ14,31ᐳ"}}:::plan
+    Access31{{"Access[31∈2] ➊<br />ᐸ8.m.subqueryDetailsFor20ᐳ"}}:::plan
+    __Item14 & Access31 --> List32
     PgClassExpression16{{"PgClassExpression[16∈2]<br />ᐸ__forums__.”name”ᐳ"}}:::plan
     PgSelectSingle15 --> PgClassExpression16
-    PgSelectSingle15 --> PgClassExpression19
-    PgSelectSingle15 --> PgClassExpression24
     PgSelectRows26[["PgSelectRows[26∈2]"]]:::plan
-    PgSelect20 --> PgSelectRows26
+    Lambda33{{"Lambda[33∈2]"}}:::plan
+    Lambda33 --> PgSelectRows26
+    PgSelect8 --> Access31
+    List32 --> Lambda33
     __Item27[/"__Item[27∈3]<br />ᐸ26ᐳ"\]:::itemplan
     PgSelectRows26 ==> __Item27
     PgSelectSingle28{{"PgSelectSingle[28∈3]<br />ᐸmessagesᐳ"}}:::plan
@@ -52,15 +54,15 @@ graph TD
     %% define steps
 
     subgraph "Buckets for queries/conditions/basics"
-    Bucket0("Bucket 0 (root)<br /><br />1: <br />ᐳ: 6, 9, 10, 18, 30, 31, 11<br />2: Lambda[12], Lambda[25]<br />3: PgSelect[8]<br />4: PgSelectRows[13]"):::bucket
+    Bucket0("Bucket 0 (root)<br /><br />1: <br />ᐳ: 6, 9, 10, 18, 34, 35, 11<br />2: Lambda[12], Lambda[25]<br />3: PgSelectInlineApply[30]<br />4: PgSelect[8]<br />5: PgSelectRows[13]"):::bucket
     classDef bucket0 stroke:#696969
-    class Bucket0,__Value2,__Value4,PgSelect8,Access9,Access10,Object11,Lambda12,PgSelectRows13,Constant18,Lambda25,Constant30,Constant31 bucket0
-    Bucket1("Bucket 1 (listItem)<br />Deps: 11, 31, 25<br /><br />ROOT __Item{1}ᐸ13ᐳ[14]"):::bucket
+    class Bucket0,__Value2,__Value4,PgSelect8,Access9,Access10,Object11,Lambda12,PgSelectRows13,Constant18,Lambda25,PgSelectInlineApply30,Constant34,Constant35 bucket0
+    Bucket1("Bucket 1 (listItem)<br />Deps: 8<br /><br />ROOT __Item{1}ᐸ13ᐳ[14]"):::bucket
     classDef bucket1 stroke:#00bfff
     class Bucket1,__Item14,PgSelectSingle15 bucket1
-    Bucket2("Bucket 2 (nullableBoundary)<br />Deps: 15, 11, 31, 25<br /><br />ROOT PgSelectSingle{1}ᐸforumsᐳ[15]<br />1: <br />ᐳ: 16, 19, 24<br />2: PgSelect[20]<br />3: PgSelectRows[26]"):::bucket
+    Bucket2("Bucket 2 (nullableBoundary)<br />Deps: 15, 8, 14<br /><br />ROOT PgSelectSingle{1}ᐸforumsᐳ[15]<br />1: <br />ᐳ: 16, 31, 32, 33<br />2: PgSelectRows[26]"):::bucket
     classDef bucket2 stroke:#7f007f
-    class Bucket2,PgClassExpression16,PgClassExpression19,PgSelect20,PgClassExpression24,PgSelectRows26 bucket2
+    class Bucket2,PgClassExpression16,PgSelectRows26,Access31,List32,Lambda33 bucket2
     Bucket3("Bucket 3 (listItem)<br /><br />ROOT __Item{3}ᐸ26ᐳ[27]"):::bucket
     classDef bucket3 stroke:#ffa500
     class Bucket3,__Item27,PgSelectSingle28 bucket3