diff --git a/.changeset/many-hotels-relax.md b/.changeset/many-hotels-relax.md new file mode 100644 index 0000000000..e978849bc3 --- /dev/null +++ b/.changeset/many-hotels-relax.md @@ -0,0 +1,7 @@ +--- +"postgraphile": patch +"@dataplan/pg": patch +"grafast": patch +--- + +Refactoring of unary logic. diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-1.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-1.deopt.mermaid index 177f0a8508..53bd303d8e 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-1.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-1.deopt.mermaid @@ -81,25 +81,25 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (defer)
Deps: 14, 28, 16"):::bucket + Bucket3("Bucket 3 (defer)
Deps: 16, 14, 28"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29 bucket3 - Bucket4("Bucket 4 (nullableBoundary)
Deps: 14, 28, 23, 29

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket4("Bucket 4 (nullableBoundary)
Deps: 14, 23, 29, 28

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgSelect30 bucket4 Bucket5("Bucket 5 (listItem)
Deps: 14

ROOT __Item{5}ᐸ30ᐳ[31]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,__Item31,PgSelectSingle32 bucket5 - Bucket6("Bucket 6 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket6("Bucket 6 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression33,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket6 Bucket7("Bucket 7 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{6}ᐸusersᐳ[40]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgClassExpression41,PgClassExpression42 bucket7 - Bucket8("Bucket 8 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]
1:
ᐳ: 46, 48, 49, 47, 45
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket + Bucket8("Bucket 8 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]
1:
ᐳ: 46, 48, 49, 47, 45
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,PgCursor45,PgClassExpression46,List47,PgClassExpression48,PgClassExpression49,PgSelect50,First54,PgSelectSingle55 bucket8 Bucket9("Bucket 9 (nullableBoundary)
Deps: 55

ROOT PgSelectSingle{8}ᐸusersᐳ[55]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-1.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-1.mermaid index ccd3582cf3..ce70dc70db 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-1.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-1.mermaid @@ -73,13 +73,13 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (defer)
Deps: 14, 28, 16"):::bucket + Bucket3("Bucket 3 (defer)
Deps: 16, 14, 28"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29 bucket3 - Bucket4("Bucket 4 (nullableBoundary)
Deps: 14, 28, 23, 29

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket4("Bucket 4 (nullableBoundary)
Deps: 14, 23, 29, 28

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgSelect30 bucket4 Bucket5("Bucket 5 (listItem)
ROOT __Item{5}ᐸ30ᐳ[31]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-2.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-2.deopt.mermaid index 03fac044db..ff52bf5c1e 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-2.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-2.deopt.mermaid @@ -81,25 +81,25 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28, 14

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 14, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 14

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 14, 16

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 28, 14

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29 bucket3 - Bucket4("Bucket 4 (defer)
Deps: 14, 28, 23, 29"):::bucket + Bucket4("Bucket 4 (defer)
Deps: 14, 23, 29, 28"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgSelect30 bucket4 Bucket5("Bucket 5 (listItem)
Deps: 14

ROOT __Item{5}ᐸ30ᐳ[31]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,__Item31,PgSelectSingle32 bucket5 - Bucket6("Bucket 6 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket6("Bucket 6 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression33,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket6 Bucket7("Bucket 7 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{6}ᐸusersᐳ[40]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgClassExpression41,PgClassExpression42 bucket7 - Bucket8("Bucket 8 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]
1:
ᐳ: 46, 48, 49, 47, 45
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket + Bucket8("Bucket 8 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]
1:
ᐳ: 46, 48, 49, 47, 45
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,PgCursor45,PgClassExpression46,List47,PgClassExpression48,PgClassExpression49,PgSelect50,First54,PgSelectSingle55 bucket8 Bucket9("Bucket 9 (nullableBoundary)
Deps: 55

ROOT PgSelectSingle{8}ᐸusersᐳ[55]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-2.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-2.mermaid index bc0c7e2fe3..ee59227a3d 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-2.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-2.mermaid @@ -73,13 +73,13 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28, 14

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 14, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 14

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 14, 16

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 28, 14

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29 bucket3 - Bucket4("Bucket 4 (defer)
Deps: 14, 28, 23, 29"):::bucket + Bucket4("Bucket 4 (defer)
Deps: 14, 23, 29, 28"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgSelect30 bucket4 Bucket5("Bucket 5 (listItem)
ROOT __Item{5}ᐸ30ᐳ[31]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-3.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-3.deopt.mermaid index a3bd03cb3e..f334ce4e42 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-3.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-3.deopt.mermaid @@ -87,31 +87,31 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28, 14

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 14, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 14

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17,PgClassExpression23,PgClassExpression29 bucket2 Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 14, 23, 29

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3 bucket3 - Bucket4("Bucket 4 (defer)
Deps: 14, 28, 23, 29"):::bucket + Bucket4("Bucket 4 (defer)
Deps: 14, 23, 29, 28"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgSelect30 bucket4 Bucket5("Bucket 5 (listItem)
Deps: 14

ROOT __Item{5}ᐸ30ᐳ[31]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,__Item31,PgSelectSingle32 bucket5 - Bucket6("Bucket 6 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket6("Bucket 6 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression33,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket6 Bucket7("Bucket 7 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{6}ᐸusersᐳ[40]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgClassExpression41,PgClassExpression42 bucket7 - Bucket8("Bucket 8 (defer)
Deps: 14, 28, 23, 29"):::bucket + Bucket8("Bucket 8 (defer)
Deps: 14, 23, 29, 28"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,PgSelect43 bucket8 Bucket9("Bucket 9 (listItem)
Deps: 14

ROOT __Item{9}ᐸ43ᐳ[44]"):::bucket classDef bucket9 stroke:#ff0000 class Bucket9,__Item44,PgSelectSingle45 bucket9 - Bucket10("Bucket 10 (nullableBoundary)
Deps: 14, 45

ROOT PgSelectSingle{9}ᐸmessagesᐳ[45]
1:
ᐳ: 47, 49, 50, 48, 46
2: PgSelect[51]
ᐳ: First[55], PgSelectSingle[56]"):::bucket + Bucket10("Bucket 10 (nullableBoundary)
Deps: 45, 14

ROOT PgSelectSingle{9}ᐸmessagesᐳ[45]
1:
ᐳ: 47, 49, 50, 48, 46
2: PgSelect[51]
ᐳ: First[55], PgSelectSingle[56]"):::bucket classDef bucket10 stroke:#ffff00 class Bucket10,PgCursor46,PgClassExpression47,List48,PgClassExpression49,PgClassExpression50,PgSelect51,First55,PgSelectSingle56 bucket10 Bucket11("Bucket 11 (nullableBoundary)
Deps: 56

ROOT PgSelectSingle{10}ᐸusersᐳ[56]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-3.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-3.mermaid index 609dcd144e..769d18eda0 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-3.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-3.mermaid @@ -79,13 +79,13 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28, 14

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 14, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 14

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17,PgClassExpression23,PgClassExpression29 bucket2 Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 14, 23, 29

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3 bucket3 - Bucket4("Bucket 4 (defer)
Deps: 14, 28, 23, 29"):::bucket + Bucket4("Bucket 4 (defer)
Deps: 14, 23, 29, 28"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgSelect30 bucket4 Bucket5("Bucket 5 (listItem)
ROOT __Item{5}ᐸ30ᐳ[31]"):::bucket @@ -97,7 +97,7 @@ graph TD Bucket7("Bucket 7 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{6}ᐸusersᐳ[40]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgClassExpression41,PgClassExpression42 bucket7 - Bucket8("Bucket 8 (defer)
Deps: 14, 28, 23, 29"):::bucket + Bucket8("Bucket 8 (defer)
Deps: 14, 23, 29, 28"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,PgSelect43 bucket8 Bucket9("Bucket 9 (listItem)
ROOT __Item{9}ᐸ43ᐳ[44]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-4.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-4.deopt.mermaid index 5fbf6806e2..01b4a4ecba 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-4.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-4.deopt.mermaid @@ -112,25 +112,25 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant59 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 59, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28, 59

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 59, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29, 58
2: PgSelect[30], PgSelect[73]
ᐳ: 62, 63, 65, 66, 68, 69, 71, 72, 74, 75, 76, 64, 70"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28, 59

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29, 58
2: PgSelect[30], PgSelect[73]
ᐳ: 62, 63, 65, 66, 68, 69, 71, 72, 74, 75, 76, 64, 70"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30,PgPageInfo58,First62,PgSelectSingle63,PgCursor64,PgClassExpression65,List66,Last68,PgSelectSingle69,PgCursor70,PgClassExpression71,List72,PgSelect73,First74,PgSelectSingle75,PgClassExpression76 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item31,PgSelectSingle32 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5 bucket5 - Bucket6("Bucket 6 (defer)
Deps: 14, 32

1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket6("Bucket 6 (defer)
Deps: 32, 14

1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression33,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket6 Bucket7("Bucket 7 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{6}ᐸusersᐳ[40]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgClassExpression41,PgClassExpression42 bucket7 - Bucket8("Bucket 8 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 46, 48, 49, 47, 45
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket + Bucket8("Bucket 8 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 46, 48, 49, 47, 45
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,PgCursor45,PgClassExpression46,List47,PgClassExpression48,PgClassExpression49,PgSelect50,First54,PgSelectSingle55 bucket8 Bucket9("Bucket 9 (nullableBoundary)
Deps: 55

ROOT PgSelectSingle{8}ᐸusersᐳ[55]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-4.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-4.mermaid index 99a5b19d62..a3311b3e5e 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-4.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-4.mermaid @@ -104,19 +104,19 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28, 14

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant59 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 14, 59, 16, 15

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 15, 14, 59

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 14, 59, 15

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 15, 14, 59

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgPageInfo58,First62,PgSelectSingle63,PgCursor64,PgClassExpression65,List66,Last68,PgSelectSingle69,PgCursor70,PgClassExpression71,List72,First74,PgSelectSingle75,PgClassExpression76,Access79,Access80 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ79ᐳ[31]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item31,PgSelectSingle32 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5 bucket5 - Bucket6("Bucket 6 (defer)
Deps: 14, 32

1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket6("Bucket 6 (defer)
Deps: 32, 14

1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression33,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket6 Bucket7("Bucket 7 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{6}ᐸusersᐳ[40]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-5.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-5.deopt.mermaid index 110d626a48..d364b61988 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-5.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-5.deopt.mermaid @@ -92,22 +92,22 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant59 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 59, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28, 59

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 59, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29, 58
2: PgSelect[30], PgSelect[61]
ᐳ: 62, 63, 64"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28, 59

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29, 58
2: PgSelect[30], PgSelect[61]
ᐳ: 62, 63, 64"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30,PgPageInfo58,PgSelect61,First62,PgSelectSingle63,PgClassExpression64 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item31,PgSelectSingle32 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression33,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket5 Bucket6("Bucket 6 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{5}ᐸusersᐳ[40]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression41,PgClassExpression42 bucket6 - Bucket7("Bucket 7 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 45, 46
2: PgSelect[47]
ᐳ: First[51], PgSelectSingle[52]"):::bucket + Bucket7("Bucket 7 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 45, 46
2: PgSelect[47]
ᐳ: First[51], PgSelectSingle[52]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgClassExpression45,PgClassExpression46,PgSelect47,First51,PgSelectSingle52 bucket7 Bucket8("Bucket 8 (nullableBoundary)
Deps: 52

ROOT PgSelectSingle{7}ᐸusersᐳ[52]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-5.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-5.mermaid index ae00e470f5..3626d2a6fd 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-5.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-5.mermaid @@ -80,10 +80,10 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant59 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 59, 16, 15

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 15, 59

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 59, 15

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 15, 59

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgPageInfo58,First62,PgSelectSingle63,PgClassExpression64,Access69,Access70 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ69ᐳ[31]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-6.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-6.deopt.mermaid index 93b9562f8c..89df7cf1ba 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-6.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-6.deopt.mermaid @@ -81,28 +81,28 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item31,PgSelectSingle32 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression33 bucket5 - Bucket6("Bucket 6 (defer)
Deps: 14, 32

1:
ᐳ: PgClassExpression[34]
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket6("Bucket 6 (defer)
Deps: 32, 14

1:
ᐳ: PgClassExpression[34]
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket6 Bucket7("Bucket 7 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{6}ᐸusersᐳ[40]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgClassExpression41,PgClassExpression42 bucket7 - Bucket8("Bucket 8 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]"):::bucket + Bucket8("Bucket 8 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,PgCursor45,PgClassExpression46,List47,PgClassExpression48 bucket8 - Bucket9("Bucket 9 (defer)
Deps: 14, 32

1:
ᐳ: PgClassExpression[49]
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket + Bucket9("Bucket 9 (defer)
Deps: 32, 14

1:
ᐳ: PgClassExpression[49]
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket classDef bucket9 stroke:#ff0000 class Bucket9,PgClassExpression49,PgSelect50,First54,PgSelectSingle55 bucket9 Bucket10("Bucket 10 (nullableBoundary)
Deps: 55

ROOT PgSelectSingle{9}ᐸusersᐳ[55]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-6.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-6.mermaid index 1d651d18d2..6d5ee0ef31 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-6.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-6.mermaid @@ -77,28 +77,28 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28, 14

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 14, 16, 15

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 15, 28, 14

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 14, 15

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 15, 28, 14

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,Access58 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ58ᐳ[31]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item31,PgSelectSingle32 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression33 bucket5 - Bucket6("Bucket 6 (defer)
Deps: 14, 32

1:
ᐳ: PgClassExpression[34]
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket6("Bucket 6 (defer)
Deps: 32, 14

1:
ᐳ: PgClassExpression[34]
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket6 Bucket7("Bucket 7 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{6}ᐸusersᐳ[40]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgClassExpression41,PgClassExpression42 bucket7 - Bucket8("Bucket 8 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]"):::bucket + Bucket8("Bucket 8 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,PgCursor45,PgClassExpression46,List47,PgClassExpression48 bucket8 - Bucket9("Bucket 9 (defer)
Deps: 14, 32

1:
ᐳ: PgClassExpression[49]
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket + Bucket9("Bucket 9 (defer)
Deps: 32, 14

1:
ᐳ: PgClassExpression[49]
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket classDef bucket9 stroke:#ff0000 class Bucket9,PgClassExpression49,PgSelect50,First54,PgSelectSingle55 bucket9 Bucket10("Bucket 10 (nullableBoundary)
Deps: 55

ROOT PgSelectSingle{9}ᐸusersᐳ[55]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-7.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-7.deopt.mermaid index c8bb894aac..b57c68a306 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-7.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-7.deopt.mermaid @@ -81,31 +81,31 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (defer)
Deps: 14, 28, 16"):::bucket + Bucket3("Bucket 3 (defer)
Deps: 16, 14, 28"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29 bucket3 - Bucket4("Bucket 4 (nullableBoundary)
Deps: 14, 28, 23, 29

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket4("Bucket 4 (nullableBoundary)
Deps: 14, 23, 29, 28

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgSelect30 bucket4 Bucket5("Bucket 5 (listItem)
Deps: 14

ROOT __Item{5}ᐸ30ᐳ[31]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,__Item31,PgSelectSingle32 bucket5 - Bucket6("Bucket 6 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]"):::bucket + Bucket6("Bucket 6 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression33 bucket6 - Bucket7("Bucket 7 (defer)
Deps: 14, 32

1:
ᐳ: PgClassExpression[34]
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket7("Bucket 7 (defer)
Deps: 32, 14

1:
ᐳ: PgClassExpression[34]
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket7 Bucket8("Bucket 8 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{7}ᐸusersᐳ[40]"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,PgClassExpression41,PgClassExpression42 bucket8 - Bucket9("Bucket 9 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]"):::bucket + Bucket9("Bucket 9 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]"):::bucket classDef bucket9 stroke:#ff0000 class Bucket9,PgCursor45,PgClassExpression46,List47,PgClassExpression48 bucket9 - Bucket10("Bucket 10 (defer)
Deps: 14, 32

1:
ᐳ: PgClassExpression[49]
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket + Bucket10("Bucket 10 (defer)
Deps: 32, 14

1:
ᐳ: PgClassExpression[49]
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket classDef bucket10 stroke:#ffff00 class Bucket10,PgClassExpression49,PgSelect50,First54,PgSelectSingle55 bucket10 Bucket11("Bucket 11 (nullableBoundary)
Deps: 55

ROOT PgSelectSingle{10}ᐸusersᐳ[55]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-7.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-7.mermaid index c8bb894aac..b57c68a306 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-7.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.defer-7.mermaid @@ -81,31 +81,31 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (defer)
Deps: 14, 28, 16"):::bucket + Bucket3("Bucket 3 (defer)
Deps: 16, 14, 28"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29 bucket3 - Bucket4("Bucket 4 (nullableBoundary)
Deps: 14, 28, 23, 29

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket4("Bucket 4 (nullableBoundary)
Deps: 14, 23, 29, 28

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgSelect30 bucket4 Bucket5("Bucket 5 (listItem)
Deps: 14

ROOT __Item{5}ᐸ30ᐳ[31]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,__Item31,PgSelectSingle32 bucket5 - Bucket6("Bucket 6 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]"):::bucket + Bucket6("Bucket 6 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression33 bucket6 - Bucket7("Bucket 7 (defer)
Deps: 14, 32

1:
ᐳ: PgClassExpression[34]
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket7("Bucket 7 (defer)
Deps: 32, 14

1:
ᐳ: PgClassExpression[34]
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket7 Bucket8("Bucket 8 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{7}ᐸusersᐳ[40]"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,PgClassExpression41,PgClassExpression42 bucket8 - Bucket9("Bucket 9 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]"):::bucket + Bucket9("Bucket 9 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{5}ᐸmessagesᐳ[32]"):::bucket classDef bucket9 stroke:#ff0000 class Bucket9,PgCursor45,PgClassExpression46,List47,PgClassExpression48 bucket9 - Bucket10("Bucket 10 (defer)
Deps: 14, 32

1:
ᐳ: PgClassExpression[49]
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket + Bucket10("Bucket 10 (defer)
Deps: 32, 14

1:
ᐳ: PgClassExpression[49]
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket classDef bucket10 stroke:#ffff00 class Bucket10,PgClassExpression49,PgSelect50,First54,PgSelectSingle55 bucket10 Bucket11("Bucket 11 (nullableBoundary)
Deps: 55

ROOT PgSelectSingle{10}ᐸusersᐳ[55]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.deopt.mermaid index 7af99f8413..e2f8f425bc 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.deopt.mermaid @@ -112,22 +112,22 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant59 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 59, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28, 59

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 59, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29, 58
2: PgSelect[30], PgSelect[73]
ᐳ: 62, 63, 65, 66, 68, 69, 71, 72, 74, 75, 76, 64, 70"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28, 59

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29, 58
2: PgSelect[30], PgSelect[73]
ᐳ: 62, 63, 65, 66, 68, 69, 71, 72, 74, 75, 76, 64, 70"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30,PgPageInfo58,First62,PgSelectSingle63,PgCursor64,PgClassExpression65,List66,Last68,PgSelectSingle69,PgCursor70,PgClassExpression71,List72,PgSelect73,First74,PgSelectSingle75,PgClassExpression76 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item31,PgSelectSingle32 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression33,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket5 Bucket6("Bucket 6 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{5}ᐸusersᐳ[40]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression41,PgClassExpression42 bucket6 - Bucket7("Bucket 7 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 46, 48, 49, 47, 45
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket + Bucket7("Bucket 7 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 46, 48, 49, 47, 45
2: PgSelect[50]
ᐳ: First[54], PgSelectSingle[55]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgCursor45,PgClassExpression46,List47,PgClassExpression48,PgClassExpression49,PgSelect50,First54,PgSelectSingle55 bucket7 Bucket8("Bucket 8 (nullableBoundary)
Deps: 55

ROOT PgSelectSingle{7}ᐸusersᐳ[55]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.mermaid index 1756ada378..6d9d833d9b 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.mermaid @@ -100,10 +100,10 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant59 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 59, 16, 15

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 15, 59

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 59, 15

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 15, 59

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgPageInfo58,First62,PgSelectSingle63,PgCursor64,PgClassExpression65,List66,Last68,PgSelectSingle69,PgCursor70,PgClassExpression71,List72,First74,PgSelectSingle75,PgClassExpression76,Access81,Access82 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ81ᐳ[31]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-1.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-1.deopt.mermaid index 6fb6422575..00b4e57aea 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-1.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-1.deopt.mermaid @@ -61,16 +61,16 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item31,PgSelectSingle32 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression33,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket5 Bucket6("Bucket 6 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{5}ᐸusersᐳ[40]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-1.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-1.mermaid index e7de05978b..56656d79c0 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-1.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-1.mermaid @@ -57,10 +57,10 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-2.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-2.deopt.mermaid index f49af80ba4..5130943311 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-2.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-2.deopt.mermaid @@ -98,16 +98,16 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant60 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 60, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28, 60

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 60, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29, 59
2: 30, 43, 62
ᐳ: 63, 64, 65"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28, 60

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29, 59
2: 30, 43, 62
ᐳ: 63, 64, 65"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30,PgSelect43,PgPageInfo59,PgSelect62,First63,PgSelectSingle64,PgClassExpression65 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item31,PgSelectSingle32 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression33,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket5 Bucket6("Bucket 6 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{5}ᐸusersᐳ[40]"):::bucket @@ -116,7 +116,7 @@ graph TD Bucket7("Bucket 7 (listItem)
Deps: 14

ROOT __Item{7}ᐸ43ᐳ[44]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,__Item44,PgSelectSingle45 bucket7 - Bucket8("Bucket 8 (nullableBoundary)
Deps: 14, 45

ROOT PgSelectSingle{7}ᐸmessagesᐳ[45]
1:
ᐳ: 47, 49, 50, 48, 46
2: PgSelect[51]
ᐳ: First[55], PgSelectSingle[56]"):::bucket + Bucket8("Bucket 8 (nullableBoundary)
Deps: 45, 14

ROOT PgSelectSingle{7}ᐸmessagesᐳ[45]
1:
ᐳ: 47, 49, 50, 48, 46
2: PgSelect[51]
ᐳ: First[55], PgSelectSingle[56]"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,PgCursor46,PgClassExpression47,List48,PgClassExpression49,PgClassExpression50,PgSelect51,First55,PgSelectSingle56 bucket8 Bucket9("Bucket 9 (nullableBoundary)
Deps: 56

ROOT PgSelectSingle{8}ᐸusersᐳ[56]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-2.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-2.mermaid index ca05b8ecc2..731bac3a0d 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-2.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-2.mermaid @@ -90,10 +90,10 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant60 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 60, 16, 15

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28, 15, 60

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 60, 16, 15

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29, 59, 70, 63, 64, 65
2: PgSelect[30], PgSelect[43]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28, 15, 60

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29, 59, 70, 63, 64, 65
2: PgSelect[30], PgSelect[43]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30,PgSelect43,PgPageInfo59,First63,PgSelectSingle64,PgClassExpression65,Access70 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-3.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-3.deopt.mermaid index fb068f02cd..bfb46081b9 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-3.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-3.deopt.mermaid @@ -61,16 +61,16 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item31,PgSelectSingle32 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression33,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket5 Bucket6("Bucket 6 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{5}ᐸusersᐳ[40]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-3.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-3.mermaid index 2f311f8c6b..06ef3a6a3d 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-3.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-3.mermaid @@ -57,10 +57,10 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-4.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-4.deopt.mermaid index 92f17a0176..6f4ac53f72 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-4.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-4.deopt.mermaid @@ -61,16 +61,16 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item31,PgSelectSingle32 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression33,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket5 Bucket6("Bucket 6 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{5}ᐸusersᐳ[40]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-4.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-4.mermaid index 95a1bb14ce..f7791349e7 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-4.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-4.mermaid @@ -57,10 +57,10 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-5.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-5.deopt.mermaid index da14fbb6ef..8cc72d315d 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-5.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-5.deopt.mermaid @@ -63,16 +63,16 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item31,PgSelectSingle32 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 32

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 32, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[32]
1:
ᐳ: 33, 34
2: PgSelect[35]
ᐳ: First[39], PgSelectSingle[40]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression33,PgClassExpression34,PgSelect35,First39,PgSelectSingle40 bucket5 Bucket6("Bucket 6 (nullableBoundary)
Deps: 40

ROOT PgSelectSingle{5}ᐸusersᐳ[40]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-5.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-5.mermaid index 8216a15c4c..6c674385f8 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-5.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/archived-forum-inherited-messages.stream-5.mermaid @@ -59,10 +59,10 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29
2: PgSelect[30]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgSelect30 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ30ᐳ[31]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/basics-with-author.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/basics-with-author.deopt.mermaid index a21d222f9b..40609c6c89 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/basics-with-author.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/basics-with-author.deopt.mermaid @@ -60,13 +60,13 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]
1:
ᐳ: 17, 22, 27
2: PgSelect[23]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]
1:
ᐳ: 17, 22, 27
2: PgSelect[23]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17,PgClassExpression22,PgSelect23,PgClassExpression27 bucket2 Bucket3("Bucket 3 (listItem)
Deps: 14

ROOT __Item{3}ᐸ23ᐳ[28]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,__Item28,PgSelectSingle29 bucket3 - Bucket4("Bucket 4 (nullableBoundary)
Deps: 14, 29

ROOT PgSelectSingle{3}ᐸmessagesᐳ[29]
1:
ᐳ: 30, 31
2: PgSelect[32]
ᐳ: First[36], PgSelectSingle[37]"):::bucket + Bucket4("Bucket 4 (nullableBoundary)
Deps: 29, 14

ROOT PgSelectSingle{3}ᐸmessagesᐳ[29]
1:
ᐳ: 30, 31
2: PgSelect[32]
ᐳ: First[36], PgSelectSingle[37]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgClassExpression30,PgClassExpression31,PgSelect32,First36,PgSelectSingle37 bucket4 Bucket5("Bucket 5 (nullableBoundary)
Deps: 37

ROOT PgSelectSingle{4}ᐸusersᐳ[37]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/basics.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/basics.deopt.mermaid index 69a5a16e2f..f8498da281 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/basics.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/basics.deopt.mermaid @@ -48,7 +48,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]
1:
ᐳ: 17, 22, 27
2: PgSelect[23]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]
1:
ᐳ: 17, 22, 27
2: PgSelect[23]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17,PgClassExpression22,PgSelect23,PgClassExpression27 bucket2 Bucket3("Bucket 3 (listItem)
ROOT __Item{3}ᐸ23ᐳ[28]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/complex-filter.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/complex-filter.deopt.mermaid index de95b311c9..a3b6986080 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/complex-filter.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/complex-filter.deopt.mermaid @@ -51,7 +51,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 19, 40

ROOT __Item{1}ᐸ16ᐳ[20]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item20,PgSelectSingle21 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 19, 40, 21

ROOT PgSelectSingle{1}ᐸforumsᐳ[21]
1:
ᐳ: 22, 30, 35
2: PgSelect[31]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 21, 19, 40

ROOT PgSelectSingle{1}ᐸforumsᐳ[21]
1:
ᐳ: 22, 30, 35
2: PgSelect[31]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression22,PgClassExpression30,PgSelect31,PgClassExpression35 bucket2 Bucket3("Bucket 3 (listItem)
ROOT __Item{3}ᐸ31ᐳ[36]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages-minimal.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages-minimal.deopt.mermaid index 88f25544ba..175131f23e 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages-minimal.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages-minimal.deopt.mermaid @@ -56,10 +56,10 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28, 14

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant38 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 14, 38, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 14, 38

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 14, 38, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29, 30
2: PgSelect[31], PgSelect[33]
ᐳ: 32, 34, 35, 36"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 28, 14, 38

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: 23, 29, 30
2: PgSelect[31], PgSelect[33]
ᐳ: 32, 34, 35, 36"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression29,PgPageInfo30,PgSelect31,Access32,PgSelect33,First34,PgSelectSingle35,PgClassExpression36 bucket3 Bucket0 --> Bucket1 diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages-minimal.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages-minimal.mermaid index dc4ffebc18..38124161c9 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages-minimal.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages-minimal.mermaid @@ -54,7 +54,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 16, 15

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 15

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2 bucket2 Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 15

ROOT Connectionᐸ24ᐳ[28]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages.deopt.mermaid index a86734f6e4..a9e87198e4 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages.deopt.mermaid @@ -117,22 +117,22 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 29

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant62,Constant80 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 80, 29, 62, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 80, 29, 62

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 80, 29, 62, 16

ROOT Connectionᐸ25ᐳ[29]
1:
ᐳ: 24, 30, 59
2: PgSelect[31], PgSelect[75]
ᐳ: 61, 64, 65, 67, 68, 70, 71, 73, 74, 76, 77, 78, 66, 72"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 80, 29, 62

ROOT Connectionᐸ25ᐳ[29]
1:
ᐳ: 24, 30, 59
2: PgSelect[31], PgSelect[75]
ᐳ: 61, 64, 65, 67, 68, 70, 71, 73, 74, 76, 77, 78, 66, 72"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression24,PgClassExpression30,PgSelect31,PgPageInfo59,Access61,First64,PgSelectSingle65,PgCursor66,PgClassExpression67,List68,Last70,PgSelectSingle71,PgCursor72,PgClassExpression73,List74,PgSelect75,First76,PgSelectSingle77,PgClassExpression78 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ31ᐳ[32]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item32,PgSelectSingle33 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 33

ROOT PgSelectSingle{4}ᐸmessagesᐳ[33]
1:
ᐳ: 34, 35
2: PgSelect[36]
ᐳ: First[40], PgSelectSingle[41]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 33, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[33]
1:
ᐳ: 34, 35
2: PgSelect[36]
ᐳ: First[40], PgSelectSingle[41]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression34,PgClassExpression35,PgSelect36,First40,PgSelectSingle41 bucket5 Bucket6("Bucket 6 (nullableBoundary)
Deps: 41

ROOT PgSelectSingle{5}ᐸusersᐳ[41]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression42,PgClassExpression43 bucket6 - Bucket7("Bucket 7 (nullableBoundary)
Deps: 14, 33

ROOT PgSelectSingle{4}ᐸmessagesᐳ[33]
1:
ᐳ: 47, 49, 50, 48, 46
2: PgSelect[51]
ᐳ: First[55], PgSelectSingle[56]"):::bucket + Bucket7("Bucket 7 (nullableBoundary)
Deps: 33, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[33]
1:
ᐳ: 47, 49, 50, 48, 46
2: PgSelect[51]
ᐳ: First[55], PgSelectSingle[56]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgCursor46,PgClassExpression47,List48,PgClassExpression49,PgClassExpression50,PgSelect51,First55,PgSelectSingle56 bucket7 Bucket8("Bucket 8 (nullableBoundary)
Deps: 56

ROOT PgSelectSingle{7}ᐸusersᐳ[56]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages.mermaid index 755455e8ed..b6a727a871 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/condition-featured-messages.mermaid @@ -107,10 +107,10 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 29

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant62 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 29, 62, 16, 15

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 29, 15, 62

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 29, 62, 15

ROOT Connectionᐸ25ᐳ[29]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 29, 15, 62

ROOT Connectionᐸ25ᐳ[29]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgPageInfo59,Access61,First64,PgSelectSingle65,PgCursor66,PgClassExpression67,List68,Last70,PgSelectSingle71,PgCursor72,PgClassExpression73,List74,First76,PgSelectSingle77,PgClassExpression78,Access83,Lambda84,Access85 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ84ᐳ[32]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/exclusively-archived-messages.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/exclusively-archived-messages.deopt.mermaid index b1ed770685..f0cd6126d2 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/exclusively-archived-messages.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/exclusively-archived-messages.deopt.mermaid @@ -114,22 +114,22 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant60 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 60, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28, 60

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 60, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: PgClassExpression[23], PgPageInfo[57]
2: PgSelect[29], PgSelect[73]
ᐳ: 59, 62, 63, 65, 66, 68, 69, 71, 72, 74, 75, 76, 64, 70"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28, 60

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: PgClassExpression[23], PgPageInfo[57]
2: PgSelect[29], PgSelect[73]
ᐳ: 59, 62, 63, 65, 66, 68, 69, 71, 72, 74, 75, 76, 64, 70"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgSelect29,PgPageInfo57,Access59,First62,PgSelectSingle63,PgCursor64,PgClassExpression65,List66,Last68,PgSelectSingle69,PgCursor70,PgClassExpression71,List72,PgSelect73,First74,PgSelectSingle75,PgClassExpression76 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ29ᐳ[30]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item30,PgSelectSingle31 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 31

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 32, 33
2: PgSelect[34]
ᐳ: First[38], PgSelectSingle[39]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 31, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 32, 33
2: PgSelect[34]
ᐳ: First[38], PgSelectSingle[39]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression32,PgClassExpression33,PgSelect34,First38,PgSelectSingle39 bucket5 Bucket6("Bucket 6 (nullableBoundary)
Deps: 39

ROOT PgSelectSingle{5}ᐸusersᐳ[39]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression40,PgClassExpression41 bucket6 - Bucket7("Bucket 7 (nullableBoundary)
Deps: 14, 31

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 45, 47, 48, 46, 44
2: PgSelect[49]
ᐳ: First[53], PgSelectSingle[54]"):::bucket + Bucket7("Bucket 7 (nullableBoundary)
Deps: 31, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 45, 47, 48, 46, 44
2: PgSelect[49]
ᐳ: First[53], PgSelectSingle[54]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgCursor44,PgClassExpression45,List46,PgClassExpression47,PgClassExpression48,PgSelect49,First53,PgSelectSingle54 bucket7 Bucket8("Bucket 8 (nullableBoundary)
Deps: 54

ROOT PgSelectSingle{7}ᐸusersᐳ[54]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/exclusively-archived-messages.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/exclusively-archived-messages.mermaid index 3ae7e82480..cb082823ee 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/exclusively-archived-messages.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/exclusively-archived-messages.mermaid @@ -106,10 +106,10 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant60 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 60, 16, 15

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 15, 60

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 60, 15

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 15, 60

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgPageInfo57,Access59,First62,PgSelectSingle63,PgCursor64,PgClassExpression65,List66,Last68,PgSelectSingle69,PgCursor70,PgClassExpression71,List72,First74,PgSelectSingle75,PgClassExpression76,Access81,Lambda82,Access83 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ82ᐳ[30]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/conditions/include-all-archived.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/conditions/include-all-archived.deopt.mermaid index 0f0ebfa3f2..fd46906a23 100644 --- a/grafast/dataplan-pg/__tests__/queries/conditions/include-all-archived.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/conditions/include-all-archived.deopt.mermaid @@ -58,13 +58,13 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]
1:
ᐳ: 17, 22
2: PgSelect[23]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]
1:
ᐳ: 17, 22
2: PgSelect[23]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17,PgClassExpression22,PgSelect23 bucket2 Bucket3("Bucket 3 (listItem)
Deps: 14

ROOT __Item{3}ᐸ23ᐳ[27]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,__Item27,PgSelectSingle28 bucket3 - Bucket4("Bucket 4 (nullableBoundary)
Deps: 14, 28

ROOT PgSelectSingle{3}ᐸmessagesᐳ[28]
1:
ᐳ: 29, 30
2: PgSelect[31]
ᐳ: First[35], PgSelectSingle[36]"):::bucket + Bucket4("Bucket 4 (nullableBoundary)
Deps: 28, 14

ROOT PgSelectSingle{3}ᐸmessagesᐳ[28]
1:
ᐳ: 29, 30
2: PgSelect[31]
ᐳ: First[35], PgSelectSingle[36]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgClassExpression29,PgClassExpression30,PgSelect31,First35,PgSelectSingle36 bucket4 Bucket5("Bucket 5 (nullableBoundary)
Deps: 36

ROOT PgSelectSingle{4}ᐸusersᐳ[36]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/basics-limit3.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/basics-limit3.deopt.mermaid index 6c94018950..1642e4e562 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/basics-limit3.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/basics-limit3.deopt.mermaid @@ -93,7 +93,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 22

ROOT PgSelectSingle{2}ᐸmessagesᐳ[22]
1:
ᐳ: 24, 26, 27, 25, 23
2: PgSelect[28]
ᐳ: First[32], PgSelectSingle[33]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 18

ROOT PgSelectSingle{2}ᐸmessagesᐳ[22]
1:
ᐳ: 24, 26, 27, 25, 23
2: PgSelect[28]
ᐳ: First[32], PgSelectSingle[33]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor23,PgClassExpression24,List25,PgClassExpression26,PgClassExpression27,PgSelect28,First32,PgSelectSingle33 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 33

ROOT PgSelectSingle{3}ᐸusersᐳ[33]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/basics.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/basics.deopt.mermaid index 431a8f5fcc..5f45e5ea93 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/basics.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/basics.deopt.mermaid @@ -89,7 +89,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 22

ROOT PgSelectSingle{2}ᐸmessagesᐳ[22]
1:
ᐳ: 24, 26, 27, 25, 23
2: PgSelect[28]
ᐳ: First[32], PgSelectSingle[33]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 18

ROOT PgSelectSingle{2}ᐸmessagesᐳ[22]
1:
ᐳ: 24, 26, 27, 25, 23
2: PgSelect[28]
ᐳ: First[32], PgSelectSingle[33]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor23,PgClassExpression24,List25,PgClassExpression26,PgClassExpression27,PgSelect28,First32,PgSelectSingle33 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 33

ROOT PgSelectSingle{3}ᐸusersᐳ[33]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/empty.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/empty.deopt.mermaid index 354411f9e9..65b93fa524 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/empty.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/empty.deopt.mermaid @@ -40,7 +40,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant31 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 31, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 31

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 31

ROOT Connectionᐸ24ᐳ[28]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/empty.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/empty.mermaid index 354411f9e9..65b93fa524 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/empty.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/empty.mermaid @@ -40,7 +40,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant31 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 31, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 31

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 31

ROOT Connectionᐸ24ᐳ[28]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/order.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/order.deopt.mermaid index b319283d29..cb09da322d 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/order.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/order.deopt.mermaid @@ -105,7 +105,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 20

ROOT __Item{2}ᐸ22ᐳ[23]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item23,PgSelectSingle24 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 20, 24

ROOT PgSelectSingle{2}ᐸmessagesᐳ[24]
1:
ᐳ: 26, 27, 28, 30, 31, 29, 25
2: PgSelect[32]
ᐳ: First[36], PgSelectSingle[37]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 24, 20

ROOT PgSelectSingle{2}ᐸmessagesᐳ[24]
1:
ᐳ: 26, 27, 28, 30, 31, 29, 25
2: PgSelect[32]
ᐳ: First[36], PgSelectSingle[37]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor25,PgClassExpression26,PgClassExpression27,PgClassExpression28,List29,PgClassExpression30,PgClassExpression31,PgSelect32,First36,PgSelectSingle37 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 37

ROOT PgSelectSingle{3}ᐸusersᐳ[37]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/pagination-after.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/pagination-after.deopt.mermaid index d68cf4d3ba..530cc94517 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/pagination-after.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/pagination-after.deopt.mermaid @@ -100,7 +100,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ21ᐳ[24]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item24,PgSelectSingle25 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 25

ROOT PgSelectSingle{2}ᐸmessagesᐳ[25]
1:
ᐳ: 27, 29, 30, 28, 26
2: PgSelect[31]
ᐳ: First[35], PgSelectSingle[36]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 25, 18

ROOT PgSelectSingle{2}ᐸmessagesᐳ[25]
1:
ᐳ: 27, 29, 30, 28, 26
2: PgSelect[31]
ᐳ: First[35], PgSelectSingle[36]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor26,PgClassExpression27,List28,PgClassExpression29,PgClassExpression30,PgSelect31,First35,PgSelectSingle36 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 36

ROOT PgSelectSingle{3}ᐸusersᐳ[36]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/pagination-before-end-last.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/pagination-before-end-last.deopt.mermaid index 6dca7c2bd3..54b43d30e2 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/pagination-before-end-last.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/pagination-before-end-last.deopt.mermaid @@ -100,7 +100,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ21ᐳ[24]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item24,PgSelectSingle25 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 25

ROOT PgSelectSingle{2}ᐸmessagesᐳ[25]
1:
ᐳ: 27, 29, 30, 28, 26
2: PgSelect[31]
ᐳ: First[35], PgSelectSingle[36]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 25, 18

ROOT PgSelectSingle{2}ᐸmessagesᐳ[25]
1:
ᐳ: 27, 29, 30, 28, 26
2: PgSelect[31]
ᐳ: First[35], PgSelectSingle[36]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor26,PgClassExpression27,List28,PgClassExpression29,PgClassExpression30,PgSelect31,First35,PgSelectSingle36 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 36

ROOT PgSelectSingle{3}ᐸusersᐳ[36]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/pagination-before-end.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/pagination-before-end.deopt.mermaid index 91f3cbd90e..fa48902c2e 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/pagination-before-end.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/pagination-before-end.deopt.mermaid @@ -100,7 +100,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ21ᐳ[24]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item24,PgSelectSingle25 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 25

ROOT PgSelectSingle{2}ᐸmessagesᐳ[25]
1:
ᐳ: 27, 29, 30, 28, 26
2: PgSelect[31]
ᐳ: First[35], PgSelectSingle[36]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 25, 18

ROOT PgSelectSingle{2}ᐸmessagesᐳ[25]
1:
ᐳ: 27, 29, 30, 28, 26
2: PgSelect[31]
ᐳ: First[35], PgSelectSingle[36]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor26,PgClassExpression27,List28,PgClassExpression29,PgClassExpression30,PgSelect31,First35,PgSelectSingle36 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 36

ROOT PgSelectSingle{3}ᐸusersᐳ[36]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/pagination-before-last.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/pagination-before-last.deopt.mermaid index b78ecbcec1..e563994af5 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/pagination-before-last.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/pagination-before-last.deopt.mermaid @@ -100,7 +100,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ21ᐳ[24]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item24,PgSelectSingle25 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 25

ROOT PgSelectSingle{2}ᐸmessagesᐳ[25]
1:
ᐳ: 27, 29, 30, 28, 26
2: PgSelect[31]
ᐳ: First[35], PgSelectSingle[36]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 25, 18

ROOT PgSelectSingle{2}ᐸmessagesᐳ[25]
1:
ᐳ: 27, 29, 30, 28, 26
2: PgSelect[31]
ᐳ: First[35], PgSelectSingle[36]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor26,PgClassExpression27,List28,PgClassExpression29,PgClassExpression30,PgSelect31,First35,PgSelectSingle36 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 36

ROOT PgSelectSingle{3}ᐸusersᐳ[36]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/pagination-before.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/pagination-before.deopt.mermaid index b104bf23fa..2a24a375cc 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/pagination-before.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/pagination-before.deopt.mermaid @@ -100,7 +100,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ21ᐳ[24]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item24,PgSelectSingle25 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 25

ROOT PgSelectSingle{2}ᐸmessagesᐳ[25]
1:
ᐳ: 27, 29, 30, 28, 26
2: PgSelect[31]
ᐳ: First[35], PgSelectSingle[36]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 25, 18

ROOT PgSelectSingle{2}ᐸmessagesᐳ[25]
1:
ᐳ: 27, 29, 30, 28, 26
2: PgSelect[31]
ᐳ: First[35], PgSelectSingle[36]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor26,PgClassExpression27,List28,PgClassExpression29,PgClassExpression30,PgSelect31,First35,PgSelectSingle36 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 36

ROOT PgSelectSingle{3}ᐸusersᐳ[36]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards-nodes-only.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards-nodes-only.deopt.mermaid index 8c2f4ef729..1dceac4779 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards-nodes-only.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards-nodes-only.deopt.mermaid @@ -94,16 +94,16 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant43 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 43, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28, 43

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 43, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: PgClassExpression[23], PgPageInfo[42]
2: PgSelect[29], PgSelect[58]
ᐳ: 45, 47, 48, 50, 51, 53, 54, 56, 57, 59, 60, 61, 49, 55"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28, 43

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: PgClassExpression[23], PgPageInfo[42]
2: PgSelect[29], PgSelect[58]
ᐳ: 45, 47, 48, 50, 51, 53, 54, 56, 57, 59, 60, 61, 49, 55"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgSelect29,PgPageInfo42,Access45,First47,PgSelectSingle48,PgCursor49,PgClassExpression50,List51,Last53,PgSelectSingle54,PgCursor55,PgClassExpression56,List57,PgSelect58,First59,PgSelectSingle60,PgClassExpression61 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ29ᐳ[30]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item30,PgSelectSingle31 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 31

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 32, 33
2: PgSelect[34]
ᐳ: First[38], PgSelectSingle[39]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 31, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 32, 33
2: PgSelect[34]
ᐳ: First[38], PgSelectSingle[39]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression32,PgClassExpression33,PgSelect34,First38,PgSelectSingle39 bucket5 Bucket6("Bucket 6 (nullableBoundary)
Deps: 39

ROOT PgSelectSingle{5}ᐸusersᐳ[39]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards-nodes-only.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards-nodes-only.mermaid index 2d8831b74e..d636303603 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards-nodes-only.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards-nodes-only.mermaid @@ -90,10 +90,10 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant43 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 43, 16, 15

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 15, 43

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 43, 15

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 15, 43

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgPageInfo42,Access45,First47,PgSelectSingle48,PgCursor49,PgClassExpression50,List51,Last53,PgSelectSingle54,PgCursor55,PgClassExpression56,List57,First59,PgSelectSingle60,PgClassExpression61,Access64,Lambda65,Access66 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ65ᐳ[30]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards.deopt.mermaid index 1b6f28f56e..a89a66165d 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards.deopt.mermaid @@ -114,22 +114,22 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant58 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 58, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28, 58

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 58, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: PgClassExpression[23], PgPageInfo[57]
2: PgSelect[29], PgSelect[73]
ᐳ: 60, 62, 63, 65, 66, 68, 69, 71, 72, 74, 75, 76, 64, 70"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28, 58

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: PgClassExpression[23], PgPageInfo[57]
2: PgSelect[29], PgSelect[73]
ᐳ: 60, 62, 63, 65, 66, 68, 69, 71, 72, 74, 75, 76, 64, 70"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgSelect29,PgPageInfo57,Access60,First62,PgSelectSingle63,PgCursor64,PgClassExpression65,List66,Last68,PgSelectSingle69,PgCursor70,PgClassExpression71,List72,PgSelect73,First74,PgSelectSingle75,PgClassExpression76 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ29ᐳ[30]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item30,PgSelectSingle31 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 31

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 32, 33
2: PgSelect[34]
ᐳ: First[38], PgSelectSingle[39]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 31, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 32, 33
2: PgSelect[34]
ᐳ: First[38], PgSelectSingle[39]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression32,PgClassExpression33,PgSelect34,First38,PgSelectSingle39 bucket5 Bucket6("Bucket 6 (nullableBoundary)
Deps: 39

ROOT PgSelectSingle{5}ᐸusersᐳ[39]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression40,PgClassExpression41 bucket6 - Bucket7("Bucket 7 (nullableBoundary)
Deps: 14, 31

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 45, 47, 48, 46, 44
2: PgSelect[49]
ᐳ: First[53], PgSelectSingle[54]"):::bucket + Bucket7("Bucket 7 (nullableBoundary)
Deps: 31, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 45, 47, 48, 46, 44
2: PgSelect[49]
ᐳ: First[53], PgSelectSingle[54]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgCursor44,PgClassExpression45,List46,PgClassExpression47,PgClassExpression48,PgSelect49,First53,PgSelectSingle54 bucket7 Bucket8("Bucket 8 (nullableBoundary)
Deps: 54

ROOT PgSelectSingle{7}ᐸusersᐳ[54]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards.mermaid index 4a3d97bf68..44d1b372d0 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined-backwards.mermaid @@ -106,10 +106,10 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant58 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 58, 16, 15

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 15, 58

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 58, 15

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 15, 58

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgPageInfo57,Access60,First62,PgSelectSingle63,PgCursor64,PgClassExpression65,List66,Last68,PgSelectSingle69,PgCursor70,PgClassExpression71,List72,First74,PgSelectSingle75,PgClassExpression76,Access81,Lambda82,Access83 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ82ᐳ[30]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined.deopt.mermaid index 474a5b25e5..2dbc687fc6 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined.deopt.mermaid @@ -114,22 +114,22 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14, 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant60 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 28, 60, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14, 28, 60

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 14, 28, 60, 16

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: PgClassExpression[23], PgPageInfo[57]
2: PgSelect[29], PgSelect[73]
ᐳ: 59, 62, 63, 65, 66, 68, 69, 71, 72, 74, 75, 76, 64, 70"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 16, 14, 28, 60

ROOT Connectionᐸ24ᐳ[28]
1:
ᐳ: PgClassExpression[23], PgPageInfo[57]
2: PgSelect[29], PgSelect[73]
ᐳ: 59, 62, 63, 65, 66, 68, 69, 71, 72, 74, 75, 76, 64, 70"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgSelect29,PgPageInfo57,Access59,First62,PgSelectSingle63,PgCursor64,PgClassExpression65,List66,Last68,PgSelectSingle69,PgCursor70,PgClassExpression71,List72,PgSelect73,First74,PgSelectSingle75,PgClassExpression76 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 14

ROOT __Item{4}ᐸ29ᐳ[30]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item30,PgSelectSingle31 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 14, 31

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 32, 33
2: PgSelect[34]
ᐳ: First[38], PgSelectSingle[39]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 31, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 32, 33
2: PgSelect[34]
ᐳ: First[38], PgSelectSingle[39]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression32,PgClassExpression33,PgSelect34,First38,PgSelectSingle39 bucket5 Bucket6("Bucket 6 (nullableBoundary)
Deps: 39

ROOT PgSelectSingle{5}ᐸusersᐳ[39]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression40,PgClassExpression41 bucket6 - Bucket7("Bucket 7 (nullableBoundary)
Deps: 14, 31

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 45, 47, 48, 46, 44
2: PgSelect[49]
ᐳ: First[53], PgSelectSingle[54]"):::bucket + Bucket7("Bucket 7 (nullableBoundary)
Deps: 31, 14

ROOT PgSelectSingle{4}ᐸmessagesᐳ[31]
1:
ᐳ: 45, 47, 48, 46, 44
2: PgSelect[49]
ᐳ: First[53], PgSelectSingle[54]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgCursor44,PgClassExpression45,List46,PgClassExpression47,PgClassExpression48,PgSelect49,First53,PgSelectSingle54 bucket7 Bucket8("Bucket 8 (nullableBoundary)
Deps: 54

ROOT PgSelectSingle{7}ᐸusersᐳ[54]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined.mermaid b/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined.mermaid index 0364cfc98b..406b35f4f6 100644 --- a/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/connections/pagination-when-inlined.mermaid @@ -106,10 +106,10 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 28

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16,Constant60 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 28, 60, 16, 15

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 28, 15, 60

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 60, 15

ROOT Connectionᐸ24ᐳ[28]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 28, 15, 60

ROOT Connectionᐸ24ᐳ[28]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgPageInfo57,Access59,First62,PgSelectSingle63,PgCursor64,PgClassExpression65,List66,Last68,PgSelectSingle69,PgCursor70,PgClassExpression71,List72,First74,PgSelectSingle75,PgClassExpression76,Access81,Lambda82,Access83 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ82ᐳ[30]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-list-set.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-list-set.deopt.mermaid index 6715cf3ac6..a140e52f18 100644 --- a/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-list-set.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-list-set.deopt.mermaid @@ -56,7 +56,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]
1:
ᐳ: PgClassExpression[17]
2: PgSelect[18]
3: __ListTransform[22]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]
1:
ᐳ: PgClassExpression[17]
2: PgSelect[18]
3: __ListTransform[22]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17,PgSelect18,__ListTransform22 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgClassExpression{3}ᐸ__forums_m..._set_idx__ᐳ[25]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.defer.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.defer.deopt.mermaid index 19e36c9def..701e949b9e 100644 --- a/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.defer.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.defer.deopt.mermaid @@ -72,7 +72,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17,PgClassExpression26 bucket2 Bucket3("Bucket 3 (defer)
Deps: 14, 16, 26

1: PgSelect[18]
2: __ListTransform[22]
3: __ListTransform[29]
ᐳ: Lambda[33]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.defer.mermaid b/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.defer.mermaid index 19e36c9def..701e949b9e 100644 --- a/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.defer.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.defer.mermaid @@ -72,7 +72,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 14

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 14, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 14

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17,PgClassExpression26 bucket2 Bucket3("Bucket 3 (defer)
Deps: 14, 16, 26

1: PgSelect[18]
2: __ListTransform[22]
3: __ListTransform[29]
ᐳ: Lambda[33]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.deopt.mermaid index 5dcab04f6c..f2c124ca42 100644 --- a/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.deopt.mermaid @@ -72,7 +72,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 18

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 18, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]
1:
ᐳ: 17, 26
2: __ListTransform[22]
3: __ListTransform[29]
ᐳ: Lambda[33]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 18

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]
1:
ᐳ: 17, 26
2: __ListTransform[22]
3: __ListTransform[29]
ᐳ: Lambda[33]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17,__ListTransform22,PgClassExpression26,__ListTransform29,Lambda33 bucket2 Bucket3("Bucket 3 (subroutine)
Deps: 26

ROOT Lambda{3}[28]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.mermaid b/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.mermaid index 5dcab04f6c..f2c124ca42 100644 --- a/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/functions/computed-column-forums-messages-with-many-transforms.mermaid @@ -72,7 +72,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 18

ROOT __Item{1}ᐸ11ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgSelectSingle16 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 18, 16

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]
1:
ᐳ: 17, 26
2: __ListTransform[22]
3: __ListTransform[29]
ᐳ: Lambda[33]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 16, 18

ROOT PgSelectSingle{1}ᐸforumsᐳ[16]
1:
ᐳ: 17, 26
2: __ListTransform[22]
3: __ListTransform[29]
ᐳ: Lambda[33]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression17,__ListTransform22,PgClassExpression26,__ListTransform29,Lambda33 bucket2 Bucket3("Bucket 3 (subroutine)
Deps: 26

ROOT Lambda{3}[28]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics-with-fragments.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics-with-fragments.deopt.mermaid index 763cf28964..25f5ab3103 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics-with-fragments.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics-with-fragments.deopt.mermaid @@ -116,7 +116,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,PgClassExpression14,PgSelect15,__ListTransform19 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸrelational_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics-with-fragments.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics-with-fragments.mermaid index 8ada9f937e..8e80680982 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics-with-fragments.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics-with-fragments.mermaid @@ -114,7 +114,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12, 11

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[110]
2: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 11, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[110]
2: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,__ListTransform19,Access110 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸrelational_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics.deopt.mermaid index 5fd112396d..9b2a71b8b1 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics.deopt.mermaid @@ -98,7 +98,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,PgClassExpression14,PgSelect15,__ListTransform19 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸrelational_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics.mermaid index 3de9077ad3..109be5619a 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/basics.mermaid @@ -96,7 +96,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12, 11

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[101]
2: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 11, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[101]
2: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,__ListTransform19,Access101 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸrelational_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more-fragments.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more-fragments.deopt.mermaid index ea6f789d76..ed6d06c1b7 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more-fragments.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more-fragments.deopt.mermaid @@ -210,7 +210,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,PgClassExpression14,PgSelect15,__ListTransform19 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸrelational_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more-fragments.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more-fragments.mermaid index 46e54e6018..da8da3193b 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more-fragments.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more-fragments.mermaid @@ -208,7 +208,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12, 11

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[815]
2: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 11, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[815]
2: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,__ListTransform19,Access815 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸrelational_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more.deopt.mermaid index e181525ff4..db40fcd35f 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more.deopt.mermaid @@ -174,7 +174,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,PgClassExpression14,PgSelect15,__ListTransform19 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸrelational_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more.mermaid index 2199febcb9..3cca4ed98f 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested-more.mermaid @@ -172,7 +172,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12, 11

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[761]
2: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 11, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[761]
2: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,__ListTransform19,Access761 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸrelational_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested.deopt.mermaid index 47b91408a8..aceaa9102a 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested.deopt.mermaid @@ -134,7 +134,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,PgClassExpression14,PgSelect15,__ListTransform19 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸrelational_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested.mermaid index 8f5e9eaae5..9d06e302e4 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-relational/nested.mermaid @@ -132,7 +132,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12, 11

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[371]
2: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 11, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[371]
2: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,__ListTransform19,Access371 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸrelational_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/basics-with-fragments.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/basics-with-fragments.deopt.mermaid index be9973868a..076066db82 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/basics-with-fragments.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/basics-with-fragments.deopt.mermaid @@ -78,7 +78,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,PgClassExpression14,PgSelect15,__ListTransform19 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸsingle_table_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/basics.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/basics.deopt.mermaid index a4ec73acfe..d0c1744ae9 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/basics.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/basics.deopt.mermaid @@ -70,7 +70,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,PgClassExpression14,PgSelect15,__ListTransform19 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸsingle_table_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more-fragments.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more-fragments.deopt.mermaid index 75bb7bf6b6..c7765e8612 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more-fragments.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more-fragments.deopt.mermaid @@ -132,7 +132,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,PgClassExpression14,PgSelect15,__ListTransform19 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸsingle_table_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more-fragments.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more-fragments.mermaid index 679aaa3ef3..5d58a8280f 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more-fragments.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more-fragments.mermaid @@ -130,7 +130,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12, 11

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[611]
2: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 11, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[611]
2: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,__ListTransform19,Access611 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸsingle_table_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more.deopt.mermaid index 437f3c6a92..400ec7e8ec 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more.deopt.mermaid @@ -116,7 +116,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,PgClassExpression14,PgSelect15,__ListTransform19 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸsingle_table_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more.mermaid index c196204b05..32d1a61fd6 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested-more.mermaid @@ -114,7 +114,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12, 11

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[557]
2: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 11, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[557]
2: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,__ListTransform19,Access557 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸsingle_table_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested.deopt.mermaid index f6c31fbb6e..18eae09095 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested.deopt.mermaid @@ -76,7 +76,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: 13, 14
2: PgSelect[15]
3: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,PgClassExpression14,PgSelect15,__ListTransform19 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸsingle_table_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested.mermaid index 9add3107ea..f528d69a4a 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-single-table/nested.mermaid @@ -74,7 +74,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 10

ROOT __Item{1}ᐸ7ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,PgSelectSingle12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 10, 12, 11

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[167]
2: __ListTransform[19]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 11, 10

ROOT PgSelectSingle{1}ᐸpeopleᐳ[12]
1:
ᐳ: PgClassExpression[13], Access[167]
2: __ListTransform[19]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,PgClassExpression13,__ListTransform19,Access167 bucket2 Bucket3("Bucket 3 (subroutine)
ROOT PgSelectSingle{3}ᐸsingle_table_itemsᐳ[21]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilities.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilities.deopt.mermaid index 6e7332ed3c..b8ccac0259 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilities.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilities.deopt.mermaid @@ -73,7 +73,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 12

ROOT __Item{1}ᐸ9ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgUnionAllSingle16,Access17 bucket1 - Bucket2("Bucket 2 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 12, 17, 16
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[18], JSONParse[31]
ᐳ: Access[19], Access[32]
2: PgSelect[20], PgSelect[33]
ᐳ: 24, 25, 26, 27, 28, 29, 37, 38, 39, 40, 41, 42"):::bucket + Bucket2("Bucket 2 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 17, 12, 16
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[18], JSONParse[31]
ᐳ: Access[19], Access[32]
2: PgSelect[20], PgSelect[33]
ᐳ: 24, 25, 26, 27, 28, 29, 37, 38, 39, 40, 41, 42"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,JSONParse18,Access19,PgSelect20,First24,PgSelectSingle25,PgClassExpression26,PgClassExpression27,PgClassExpression28,PgClassExpression29,JSONParse31,Access32,PgSelect33,First37,PgSelectSingle38,PgClassExpression39,PgClassExpression40,PgClassExpression41,PgClassExpression42 bucket2 Bucket0 --> Bucket1 diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilities.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilities.mermaid index 6e7332ed3c..b8ccac0259 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilities.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilities.mermaid @@ -73,7 +73,7 @@ graph TD Bucket1("Bucket 1 (listItem)
Deps: 12

ROOT __Item{1}ᐸ9ᐳ[15]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item15,PgUnionAllSingle16,Access17 bucket1 - Bucket2("Bucket 2 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 12, 17, 16
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[18], JSONParse[31]
ᐳ: Access[19], Access[32]
2: PgSelect[20], PgSelect[33]
ᐳ: 24, 25, 26, 27, 28, 29, 37, 38, 39, 40, 41, 42"):::bucket + Bucket2("Bucket 2 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 17, 12, 16
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[18], JSONParse[31]
ᐳ: Access[19], Access[32]
2: PgSelect[20], PgSelect[33]
ᐳ: 24, 25, 26, 27, 28, 29, 37, 38, 39, 40, 41, 42"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,JSONParse18,Access19,PgSelect20,First24,PgSelectSingle25,PgClassExpression26,PgClassExpression27,PgClassExpression28,PgClassExpression29,JSONParse31,Access32,PgSelect33,First37,PgSelectSingle38,PgClassExpression39,PgClassExpression40,PgClassExpression41,PgClassExpression42 bucket2 Bucket0 --> Bucket1 diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.after1.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.after1.deopt.mermaid index 026d1ec32a..08fa268a31 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.after1.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.after1.deopt.mermaid @@ -101,10 +101,10 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ21ᐳ[22]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item22,PgUnionAllSingle23 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 23

ROOT PgUnionAllSingle{2}[23]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 23, 18

ROOT PgUnionAllSingle{2}[23]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor24,Access31,Access32,Access33,List34 bucket3 - Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 33, 23
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[36], JSONParse[49]
ᐳ: Access[37], Access[50]
2: PgSelect[38], PgSelect[51]
ᐳ: 42, 43, 44, 45, 46, 47, 55, 56, 57, 58, 59, 60"):::bucket + Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 33, 18, 23
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[36], JSONParse[49]
ᐳ: Access[37], Access[50]
2: PgSelect[38], PgSelect[51]
ᐳ: 42, 43, 44, 45, 46, 47, 55, 56, 57, 58, 59, 60"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,JSONParse36,Access37,PgSelect38,First42,PgSelectSingle43,PgClassExpression44,PgClassExpression45,PgClassExpression46,PgClassExpression47,JSONParse49,Access50,PgSelect51,First55,PgSelectSingle56,PgClassExpression57,PgClassExpression58,PgClassExpression59,PgClassExpression60 bucket4 Bucket0 --> Bucket1 diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.after1.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.after1.mermaid index 026d1ec32a..08fa268a31 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.after1.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.after1.mermaid @@ -101,10 +101,10 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ21ᐳ[22]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item22,PgUnionAllSingle23 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 23

ROOT PgUnionAllSingle{2}[23]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 23, 18

ROOT PgUnionAllSingle{2}[23]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor24,Access31,Access32,Access33,List34 bucket3 - Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 33, 23
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[36], JSONParse[49]
ᐳ: Access[37], Access[50]
2: PgSelect[38], PgSelect[51]
ᐳ: 42, 43, 44, 45, 46, 47, 55, 56, 57, 58, 59, 60"):::bucket + Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 33, 18, 23
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[36], JSONParse[49]
ᐳ: Access[37], Access[50]
2: PgSelect[38], PgSelect[51]
ᐳ: 42, 43, 44, 45, 46, 47, 55, 56, 57, 58, 59, 60"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,JSONParse36,Access37,PgSelect38,First42,PgSelectSingle43,PgClassExpression44,PgClassExpression45,PgClassExpression46,PgClassExpression47,JSONParse49,Access50,PgSelect51,First55,PgSelectSingle56,PgClassExpression57,PgClassExpression58,PgClassExpression59,PgClassExpression60 bucket4 Bucket0 --> Bucket1 diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.before1.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.before1.deopt.mermaid index 5d3cb7f881..11342f4dd2 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.before1.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.before1.deopt.mermaid @@ -101,10 +101,10 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ21ᐳ[22]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item22,PgUnionAllSingle23 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 23

ROOT PgUnionAllSingle{2}[23]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 23, 18

ROOT PgUnionAllSingle{2}[23]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor24,Access31,Access32,Access33,List34 bucket3 - Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 33, 23
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[36], JSONParse[49]
ᐳ: Access[37], Access[50]
2: PgSelect[38], PgSelect[51]
ᐳ: 42, 43, 44, 45, 46, 47, 55, 56, 57, 58, 59, 60"):::bucket + Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 33, 18, 23
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[36], JSONParse[49]
ᐳ: Access[37], Access[50]
2: PgSelect[38], PgSelect[51]
ᐳ: 42, 43, 44, 45, 46, 47, 55, 56, 57, 58, 59, 60"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,JSONParse36,Access37,PgSelect38,First42,PgSelectSingle43,PgClassExpression44,PgClassExpression45,PgClassExpression46,PgClassExpression47,JSONParse49,Access50,PgSelect51,First55,PgSelectSingle56,PgClassExpression57,PgClassExpression58,PgClassExpression59,PgClassExpression60 bucket4 Bucket0 --> Bucket1 diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.before1.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.before1.mermaid index 5d3cb7f881..11342f4dd2 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.before1.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.before1.mermaid @@ -101,10 +101,10 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ21ᐳ[22]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item22,PgUnionAllSingle23 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 23

ROOT PgUnionAllSingle{2}[23]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 23, 18

ROOT PgUnionAllSingle{2}[23]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor24,Access31,Access32,Access33,List34 bucket3 - Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 33, 23
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[36], JSONParse[49]
ᐳ: Access[37], Access[50]
2: PgSelect[38], PgSelect[51]
ᐳ: 42, 43, 44, 45, 46, 47, 55, 56, 57, 58, 59, 60"):::bucket + Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 33, 18, 23
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[36], JSONParse[49]
ᐳ: Access[37], Access[50]
2: PgSelect[38], PgSelect[51]
ᐳ: 42, 43, 44, 45, 46, 47, 55, 56, 57, 58, 59, 60"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,JSONParse36,Access37,PgSelect38,First42,PgSelectSingle43,PgClassExpression44,PgClassExpression45,PgClassExpression46,PgClassExpression47,JSONParse49,Access50,PgSelect51,First55,PgSelectSingle56,PgClassExpression57,PgClassExpression58,PgClassExpression59,PgClassExpression60 bucket4 Bucket0 --> Bucket1 diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.deopt.mermaid index 764c6160a4..e96dfa379d 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.deopt.mermaid @@ -84,10 +84,10 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgUnionAllSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 22

ROOT PgUnionAllSingle{2}[22]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 18

ROOT PgUnionAllSingle{2}[22]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor23,Access24,Access25,Access26,List27 bucket3 - Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 26, 22
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[29], JSONParse[42]
ᐳ: Access[30], Access[43]
2: PgSelect[31], PgSelect[44]
ᐳ: 35, 36, 37, 38, 39, 40, 48, 49, 50, 51, 52, 53"):::bucket + Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 26, 18, 22
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[29], JSONParse[42]
ᐳ: Access[30], Access[43]
2: PgSelect[31], PgSelect[44]
ᐳ: 35, 36, 37, 38, 39, 40, 48, 49, 50, 51, 52, 53"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,JSONParse29,Access30,PgSelect31,First35,PgSelectSingle36,PgClassExpression37,PgClassExpression38,PgClassExpression39,PgClassExpression40,JSONParse42,Access43,PgSelect44,First48,PgSelectSingle49,PgClassExpression50,PgClassExpression51,PgClassExpression52,PgClassExpression53 bucket4 Bucket0 --> Bucket1 diff --git a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.mermaid b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.mermaid index 764c6160a4..e96dfa379d 100644 --- a/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/interfaces-via-union-all/vulnerabilitiesConnection.mermaid @@ -84,10 +84,10 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgUnionAllSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 22

ROOT PgUnionAllSingle{2}[22]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 18

ROOT PgUnionAllSingle{2}[22]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor23,Access24,Access25,Access26,List27 bucket3 - Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 26, 22
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[29], JSONParse[42]
ᐳ: Access[30], Access[43]
2: PgSelect[31], PgSelect[44]
ᐳ: 35, 36, 37, 38, 39, 40, 48, 49, 50, 51, 52, 53"):::bucket + Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 26, 18, 22
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[29], JSONParse[42]
ᐳ: Access[30], Access[43]
2: PgSelect[31], PgSelect[44]
ᐳ: 35, 36, 37, 38, 39, 40, 48, 49, 50, 51, 52, 53"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,JSONParse29,Access30,PgSelect31,First35,PgSelectSingle36,PgClassExpression37,PgClassExpression38,PgClassExpression39,PgClassExpression40,JSONParse42,Access43,PgSelect44,First48,PgSelectSingle49,PgClassExpression50,PgClassExpression51,PgClassExpression52,PgClassExpression53 bucket4 Bucket0 --> Bucket1 diff --git a/grafast/dataplan-pg/__tests__/queries/unions-table/bookmarks.deopt.mermaid b/grafast/dataplan-pg/__tests__/queries/unions-table/bookmarks.deopt.mermaid index 5a252f4390..f43f3a7501 100644 --- a/grafast/dataplan-pg/__tests__/queries/unions-table/bookmarks.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/unions-table/bookmarks.deopt.mermaid @@ -132,7 +132,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 11

ROOT __Item{2}ᐸ86ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 11, 22

ROOT PgSelectSingle{2}ᐸperson_bookmarksᐳ[22]
1:
ᐳ: 23, 24, 32, 33, 34, 35, 36, 37
2: PgSelect[25]
ᐳ: First[29], PgSelectSingle[30]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 11

ROOT PgSelectSingle{2}ᐸperson_bookmarksᐳ[22]
1:
ᐳ: 23, 24, 32, 33, 34, 35, 36, 37
2: PgSelect[25]
ᐳ: First[29], PgSelectSingle[30]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression24,PgSelect25,First29,PgSelectSingle30,PgClassExpression32,PgClassExpression33,PgClassExpression34,PgClassExpression35,List36,PgPolymorphic37 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 30

ROOT PgSelectSingle{3}ᐸpeopleᐳ[30]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/queries/unions-table/bookmarks.mermaid b/grafast/dataplan-pg/__tests__/queries/unions-table/bookmarks.mermaid index bfe0d31283..2479f7c491 100644 --- a/grafast/dataplan-pg/__tests__/queries/unions-table/bookmarks.mermaid +++ b/grafast/dataplan-pg/__tests__/queries/unions-table/bookmarks.mermaid @@ -116,7 +116,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 11

ROOT __Item{2}ᐸ94ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 11, 22

ROOT PgSelectSingle{2}ᐸperson_bookmarksᐳ[22]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 11

ROOT PgSelectSingle{2}ᐸperson_bookmarksᐳ[22]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgSelectSingle30,PgClassExpression32,PgClassExpression33,PgClassExpression34,PgClassExpression35,List36,PgPolymorphic37,RemapKeys86 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 30

ROOT PgSelectSingle{3}ᐸpeopleᐳ[30]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-messages.deopt.mermaid b/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-messages.deopt.mermaid index ce8093c06b..05bb00438c 100644 --- a/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-messages.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-messages.deopt.mermaid @@ -82,10 +82,10 @@ graph TD Bucket1("Bucket 1 (subscription)
Deps: 20, 5

ROOT __Item{1}ᐸ10ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,JSONParse12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 20, 12

ROOT JSONParse{1}ᐸ11ᐳ[12]
1:
ᐳ: Access[14], Access[16], Lambda[15]
2: PgSelect[17]
ᐳ: First[21], PgSelectSingle[22]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 20

ROOT JSONParse{1}ᐸ11ᐳ[12]
1:
ᐳ: Access[14], Access[16], Lambda[15]
2: PgSelect[17]
ᐳ: First[21], PgSelectSingle[22]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,Access14,Lambda15,Access16,PgSelect17,First21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 20, 22

ROOT PgSelectSingle{2}ᐸmessagesᐳ[22]
1:
ᐳ: 23, 24, 25, 26, 27, 38
2: PgSelect[28], PgSelect[39]
ᐳ: 32, 33, 43, 44"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 20

ROOT PgSelectSingle{2}ᐸmessagesᐳ[22]
1:
ᐳ: 23, 24, 25, 26, 27, 38
2: PgSelect[28], PgSelect[39]
ᐳ: 32, 33, 43, 44"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression24,PgClassExpression25,PgClassExpression26,PgClassExpression27,PgSelect28,First32,PgSelectSingle33,PgClassExpression38,PgSelect39,First43,PgSelectSingle44 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 33, 27

ROOT PgSelectSingle{3}ᐸforumsᐳ[33]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-messages.mermaid b/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-messages.mermaid index 9ff9c690b8..e93fcb6cc2 100644 --- a/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-messages.mermaid +++ b/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-messages.mermaid @@ -76,7 +76,7 @@ graph TD Bucket1("Bucket 1 (subscription)
Deps: 3, 5

ROOT __Item{1}ᐸ10ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,JSONParse12,Access18,Access19,Object20 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 20, 12

ROOT JSONParse{1}ᐸ11ᐳ[12]
1:
ᐳ: Access[14], Access[16], Lambda[15]
2: PgSelect[17]
ᐳ: First[21], PgSelectSingle[22]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 20

ROOT JSONParse{1}ᐸ11ᐳ[12]
1:
ᐳ: Access[14], Access[16], Lambda[15]
2: PgSelect[17]
ᐳ: First[21], PgSelectSingle[22]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,Access14,Lambda15,Access16,PgSelect17,First21,PgSelectSingle22 bucket2 Bucket3("Bucket 3 (nullableBoundary)
Deps: 22

ROOT PgSelectSingle{2}ᐸmessagesᐳ[22]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-single-message-evolve.deopt.mermaid b/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-single-message-evolve.deopt.mermaid index e3b5631969..15ef1937a6 100644 --- a/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-single-message-evolve.deopt.mermaid +++ b/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-single-message-evolve.deopt.mermaid @@ -82,10 +82,10 @@ graph TD Bucket1("Bucket 1 (subscription)
Deps: 20, 5

ROOT __Item{1}ᐸ10ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,JSONParse12 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 20, 12

ROOT JSONParse{1}ᐸ11ᐳ[12]
1:
ᐳ: Access[14], Access[16], Lambda[15]
2: PgSelect[17]
ᐳ: First[21], PgSelectSingle[22]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 20

ROOT JSONParse{1}ᐸ11ᐳ[12]
1:
ᐳ: Access[14], Access[16], Lambda[15]
2: PgSelect[17]
ᐳ: First[21], PgSelectSingle[22]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,Access14,Lambda15,Access16,PgSelect17,First21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 20, 22

ROOT PgSelectSingle{2}ᐸmessagesᐳ[22]
1:
ᐳ: 23, 24, 25, 26, 27, 38
2: PgSelect[28], PgSelect[39]
ᐳ: 32, 33, 43, 44"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 20

ROOT PgSelectSingle{2}ᐸmessagesᐳ[22]
1:
ᐳ: 23, 24, 25, 26, 27, 38
2: PgSelect[28], PgSelect[39]
ᐳ: 32, 33, 43, 44"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression24,PgClassExpression25,PgClassExpression26,PgClassExpression27,PgSelect28,First32,PgSelectSingle33,PgClassExpression38,PgSelect39,First43,PgSelectSingle44 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 33, 27

ROOT PgSelectSingle{3}ᐸforumsᐳ[33]"):::bucket diff --git a/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-single-message-evolve.mermaid b/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-single-message-evolve.mermaid index d7079217c6..8092f33c8b 100644 --- a/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-single-message-evolve.mermaid +++ b/grafast/dataplan-pg/__tests__/subscriptions/basics/forum-single-message-evolve.mermaid @@ -76,7 +76,7 @@ graph TD Bucket1("Bucket 1 (subscription)
Deps: 3, 5

ROOT __Item{1}ᐸ10ᐳ[11]"):::bucket classDef bucket1 stroke:#00bfff class Bucket1,__Item11,JSONParse12,Access18,Access19,Object20 bucket1 - Bucket2("Bucket 2 (nullableBoundary)
Deps: 20, 12

ROOT JSONParse{1}ᐸ11ᐳ[12]
1:
ᐳ: Access[14], Access[16], Lambda[15]
2: PgSelect[17]
ᐳ: First[21], PgSelectSingle[22]"):::bucket + Bucket2("Bucket 2 (nullableBoundary)
Deps: 12, 20

ROOT JSONParse{1}ᐸ11ᐳ[12]
1:
ᐳ: Access[14], Access[16], Lambda[15]
2: PgSelect[17]
ᐳ: First[21], PgSelectSingle[22]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,Access14,Lambda15,Access16,PgSelect17,First21,PgSelectSingle22 bucket2 Bucket3("Bucket 3 (nullableBoundary)
Deps: 22

ROOT PgSelectSingle{2}ᐸmessagesᐳ[22]"):::bucket diff --git a/grafast/grafast/src/bucket.ts b/grafast/grafast/src/bucket.ts index 41105f1043..77102066b5 100644 --- a/grafast/grafast/src/bucket.ts +++ b/grafast/grafast/src/bucket.ts @@ -2,7 +2,7 @@ import type { LayerPlan } from "./engine/LayerPlan"; import type { MetaByMetaKey } from "./engine/OperationPlan"; -import type { ExecutionEventEmitter } from "./interfaces.js"; +import type { ExecutionEventEmitter, ExecutionValue } from "./interfaces.js"; /** * @internal @@ -82,18 +82,14 @@ export interface Bucket { metaByMetaKey: MetaByMetaKey; /** - * Every entry in the store is a list with the same length as the bucket has - * `size`. + * Every entry in the store is an execution value. If the execution value is a + * batch, then it represents a list with the same length the bucket has + * (`size`). * * The entry for '-1' is the request indexes, so we can associate the results * back to the request that triggered them. */ - store: Map; - - /** - * For "unary dependencies", we only need to store the value once per step id. - */ - unaryStore: Map; + store: Map; /** * Set this true when the bucket is fully executed. diff --git a/grafast/grafast/src/engine/LayerPlan.ts b/grafast/grafast/src/engine/LayerPlan.ts index d82a4e5bd9..f4eed27e6a 100644 --- a/grafast/grafast/src/engine/LayerPlan.ts +++ b/grafast/grafast/src/engine/LayerPlan.ts @@ -4,7 +4,6 @@ import te from "tamedevil"; import * as assert from "../assert.js"; import type { Bucket } from "../bucket.js"; -import { isDev } from "../dev.js"; import type { GrafastError } from "../error.js"; import { isGrafastError } from "../error.js"; import { inspect } from "../inspect.js"; @@ -14,8 +13,11 @@ import type { ModifierStep, UnbatchedExecutableStep, } from "../step"; -import { arrayOfLength } from "../utils.js"; -import { newBucket } from "./executeBucket.js"; +import { + batchExecutionValue, + newBucket, + unaryExecutionValue, +} from "./executeBucket.js"; import type { OperationPlan } from "./OperationPlan"; /* @@ -232,19 +234,11 @@ export class LayerPlan { /** * Which steps the results for which are available in a parent bucket need to * be "copied across" to this bucket because steps in this bucket still - * reference them? Batch steps only. + * reference them? * * @internal */ - public copyBatchStepIds: number[] = []; - /** - * Which steps the results for which are available in a parent bucket need to - * be "copied across" to this bucket because steps in this bucket still - * reference them? Unary steps only. - * - * @internal - */ - public copyUnaryStepIds: number[] = []; + public copyStepIds: number[] = []; /** @internal */ public children: LayerPlan[] = []; @@ -333,9 +327,7 @@ export class LayerPlan { this.reason.type === "polymorphic" ? `{${this.reason.typeNames.join(",")}}` : ""; - const deps = - (this.copyUnaryStepIds.length > 0 ? `/${this.copyUnaryStepIds}` : "") + - (this.copyBatchStepIds.length > 0 ? `%${this.copyBatchStepIds}` : ""); + const deps = this.copyStepIds.length > 0 ? `/${this.copyStepIds}` : ""; return `LayerPlan<${this.id}${chain}?${this.reason.type}${reasonExtra}!${ this.rootStep?.id ?? "x" }${deps}>`; @@ -373,18 +365,16 @@ export class LayerPlan { // this.reason.type === "nullableBoundary" || this.reason.type === "listItem" ) { - const u = this.copyUnaryStepIds.length; - const b = this.copyBatchStepIds.length; - const signature = `${this.reason.type[0]}_${u}_${b}`; - withNewBucketFactory(signature, u, b, this.reason.type, (fn) => { - this.newBucket = fn(this.copyUnaryStepIds, this.copyBatchStepIds); + const u = this.copyStepIds.length; + const signature = `${this.reason.type[0]}_${u}`; + withNewBucketFactory(signature, u, this.reason.type, (fn) => { + this.newBucket = fn(this.copyStepIds); }); } } public newBucket(parentBucket: Bucket): Bucket | null { - const { copyUnaryStepIds, copyBatchStepIds } = this; - const unaryStore = new Map(); + const { copyStepIds } = this; const store: Bucket["store"] = new Map(); const polymorphicPathList: (string | null)[] = this.reason.type === "mutationField" @@ -409,16 +399,13 @@ export class LayerPlan { const hasNoNullsOrErrors = false; if (this.rootStep._isUnary) { - const fieldValue = parentBucket.unaryStore.get(itemStepId); - if (fieldValue == null) { + const fieldValue = parentBucket.store.get(itemStepId)!; + if (fieldValue.value == null) { size = 0; } else { size = parentBucket.size; - unaryStore.set(itemStepId, fieldValue); - for (const stepId of copyUnaryStepIds) { - unaryStore.set(stepId, parentBucket.unaryStore.get(stepId)!); - } - for (const stepId of copyBatchStepIds) { + store.set(itemStepId, fieldValue); + for (const stepId of copyStepIds) { store.set(stepId, parentBucket.store.get(stepId)!); } for (let i = 0; i < size; i++) { @@ -437,10 +424,7 @@ export class LayerPlan { ); } store.set(itemStepId, nullableStepStore); - for (const stepId of copyUnaryStepIds) { - unaryStore.set(stepId, parentBucket.unaryStore.get(stepId)!); - } - for (const stepId of copyBatchStepIds) { + for (const stepId of copyStepIds) { store.set(stepId, parentBucket.store.get(stepId)!); } for ( @@ -456,14 +440,16 @@ export class LayerPlan { } } else { const itemStepIdList: any[] = []; - store.set(itemStepId, itemStepIdList); - - for (const stepId of copyUnaryStepIds) { - unaryStore.set(stepId, parentBucket.unaryStore.get(stepId)); - } - // Prepare store with an empty list for each copyPlanId - for (const stepId of copyBatchStepIds) { - store.set(stepId, []); + store.set(itemStepId, batchExecutionValue(itemStepIdList)); + + for (const stepId of copyStepIds) { + const ev = parentBucket.store.get(stepId)!; + if (ev.isBatch) { + // Prepare store with an empty list for each copyPlanId + store.set(stepId, batchExecutionValue([])); + } else { + store.set(stepId, ev); + } } const nullableStepStore = parentBucket.store.get(itemStepId); @@ -484,7 +470,7 @@ export class LayerPlan { originalIndex++ ) { const fieldValue: any[] | null | undefined | GrafastError = - nullableStepStore[originalIndex]; + nullableStepStore.at(originalIndex); if (fieldValue != null) { const newIndex = size++; map.set(originalIndex, newIndex); @@ -493,9 +479,13 @@ export class LayerPlan { polymorphicPathList[newIndex] = parentBucket.polymorphicPathList[originalIndex]; iterators[newIndex] = parentBucket.iterators[originalIndex]; - for (const stepId of copyBatchStepIds) { - store.get(stepId)![newIndex] = - parentBucket.store.get(stepId)![originalIndex]; + for (const stepId of copyStepIds) { + const ev = store.get(stepId)!; + if (ev.isBatch) { + (ev.entries as any[])[newIndex] = parentBucket.store + .get(stepId)! + .at(originalIndex); + } } } } @@ -505,12 +495,7 @@ export class LayerPlan { } case "listItem": { const listStepId = this.reason.parentStep.id; - const listStepStore = this.reason.parentStep._isUnary - ? arrayOfLength( - parentBucket.size, - parentBucket.unaryStore.get(listStepId), - ) - : parentBucket.store.get(listStepId); + const listStepStore = parentBucket.store.get(listStepId); if (!listStepStore) { throw new Error( `GrafastInternalError<314865b0-f7e8-4e81-b966-56e5a0de562e>: could not find entry '${listStepId}' (${parentBucket.layerPlan.operationPlan.dangerouslyGetStep( @@ -526,19 +511,26 @@ export class LayerPlan { } const itemStepId = this.rootStep.id; // Item steps are **NOT** unary - const itemStepIdList: any[] = []; + const itemStepIdList: any[] | null = this.rootStep._isUnary ? null : []; if (this.rootStep._isUnary) { // handled later + const list = listStepStore.at(0); + store.set( + itemStepId, + unaryExecutionValue(Array.isArray(list) ? list[0] : list), + ); } else { - store.set(itemStepId, itemStepIdList); + store.set(itemStepId, batchExecutionValue(itemStepIdList!)); } - for (const stepId of copyUnaryStepIds) { - unaryStore.set(stepId, parentBucket.unaryStore.get(stepId)); - } - // Prepare store with an empty list for each copyPlanId - for (const stepId of copyBatchStepIds) { - store.set(stepId, []); + for (const stepId of copyStepIds) { + const ev = parentBucket.store.get(stepId)!; + if (ev.isBatch) { + // Prepare store with an empty list for each copyPlanId + store.set(stepId, batchExecutionValue([])); + } else { + store.set(stepId, ev); + } } // We'll typically be creating more listItem bucket entries than we @@ -549,25 +541,27 @@ export class LayerPlan { originalIndex++ ) { const list: any[] | null | undefined | GrafastError = - listStepStore[originalIndex]; + listStepStore.at(originalIndex); if (Array.isArray(list)) { const newIndexes: number[] = []; map.set(originalIndex, newIndexes); for (let j = 0, l = list.length; j < l; j++) { const newIndex = size++; newIndexes.push(newIndex); - if (this.rootStep._isUnary) { - unaryStore.set(itemStepId, list[j]); - } else { + if (itemStepIdList !== null) { itemStepIdList[newIndex] = list[j]; } polymorphicPathList[newIndex] = parentBucket.polymorphicPathList[originalIndex]; iterators[newIndex] = parentBucket.iterators[originalIndex]; - for (const stepId of copyBatchStepIds) { - store.get(stepId)![newIndex] = - parentBucket.store.get(stepId)![originalIndex]; + for (const stepId of copyStepIds) { + const ev = store.get(stepId)!; + if (ev.isBatch) { + (ev.entries as any[])[newIndex] = parentBucket.store + .get(stepId)! + .at(originalIndex); + } } } } @@ -581,10 +575,7 @@ export class LayerPlan { for (let i = 0; i < parentBucket.size; i++) { map.set(i, i); } - for (const stepId of copyUnaryStepIds) { - unaryStore.set(stepId, parentBucket.unaryStore.get(stepId)!); - } - for (const stepId of copyBatchStepIds) { + for (const stepId of copyStepIds) { store.set(stepId, parentBucket.store.get(stepId)!); } @@ -592,12 +583,7 @@ export class LayerPlan { } case "polymorphic": { const polymorphicPlanId = this.reason.parentStep.id; - const polymorphicPlanStore = this.reason.parentStep._isUnary - ? arrayOfLength( - parentBucket.size, - parentBucket.unaryStore.get(polymorphicPlanId), - ) - : parentBucket.store.get(polymorphicPlanId); + const polymorphicPlanStore = parentBucket.store.get(polymorphicPlanId); if (!polymorphicPlanStore) { throw new Error( `GrafastInternalError: Entry for '${parentBucket.layerPlan.operationPlan.dangerouslyGetStep( @@ -610,12 +596,9 @@ export class LayerPlan { // they may end up being null, but that's okay) const targetTypeNames = this.reason.typeNames; - for (const stepId of copyUnaryStepIds) { - unaryStore.set(stepId, parentBucket.unaryStore.get(stepId)); - } - for (const stepId of copyBatchStepIds) { - store.set(stepId, []); - if (isDev && !parentBucket.store.has(stepId)) { + for (const stepId of copyStepIds) { + const ev = parentBucket.store.get(stepId); + if (!ev) { throw new Error( `GrafastInternalError<548f0d84-4556-4189-8655-fb16aa3345a6>: new bucket for ${this} wants to copy ${this.operationPlan.dangerouslyGetStep( stepId, @@ -624,6 +607,11 @@ export class LayerPlan { } doesn't contain that plan`, ); } + if (ev.isBatch) { + store.set(stepId, batchExecutionValue([])); + } else { + store.set(stepId, ev); + } } for ( @@ -631,7 +619,7 @@ export class LayerPlan { originalIndex < parentBucket.size; originalIndex++ ) { - const value = polymorphicPlanStore[originalIndex]; + const value = polymorphicPlanStore.at(originalIndex); if (value == null) { continue; } @@ -653,9 +641,13 @@ export class LayerPlan { polymorphicPathList[newIndex] = newPolymorphicPath; iterators[newIndex] = parentBucket.iterators[originalIndex]; - for (const planId of copyBatchStepIds) { - store.get(planId)![newIndex] = - parentBucket.store.get(planId)![originalIndex]; + for (const planId of copyStepIds) { + const ev = store.get(planId)!; + if (ev.isBatch) { + (ev.entries as any[])[newIndex] = parentBucket.store + .get(planId)! + .at(originalIndex); + } } } @@ -694,7 +686,6 @@ export class LayerPlan { layerPlan: this, size, store, - unaryStore, // PERF: not necessarily, if we don't copy the errors, we don't have the errors. hasErrors: parentBucket.hasErrors, polymorphicPathList, @@ -714,10 +705,7 @@ export class LayerPlan { } } -type Factory = ( - copyUnaryStepIds: number[], - copyBatchStepIds: number[], -) => typeof LayerPlan.prototype.newBucket; +type Factory = (copyStepIds: number[]) => typeof LayerPlan.prototype.newBucket; const makeNewBucketCache = new LRU({ maxLength: 1000, @@ -730,7 +718,10 @@ const te_parentBucketDotPolymorphicPathList = te`parentBucket.polymorphicPathLis const te_parentBucketDotIterators = te`parentBucket.iterators`; const te_emptyArray = te`[]`; const ref_newBucket = te.ref(newBucket, "newBucket"); -const ref_arrayOfLength = te.ref(arrayOfLength, "arrayOfLength"); +const ref_batchExecutionValue = te.ref( + batchExecutionValue, + "batchExecutionValue", +); function makeNewBucketExpression( signature: string, @@ -739,7 +730,6 @@ function makeNewBucketExpression( ): TE { const expr = te`\ (function ${te.identifier(`newBucket_${signature}`)}(parentBucket) { - const unaryStore = new Map(); const store = new Map(); const polymorphicPathList = ${ reasonType === "mutationField" @@ -760,7 +750,6 @@ ${inner} layerPlan: this, size, store, - unaryStore, // PERF: not necessarily, if we don't copy the errors, we don't have the errors. hasErrors: parentBucket.hasErrors, polymorphicPathList, @@ -780,8 +769,7 @@ ${inner} function newBucketFactoryInnerExpression( signature: string, - unaryCopyCount: number, - batchCopyCount: number, + copyCount: number, reasonType: "nullableBoundary" | "listItem", ) { if (reasonType === "nullableBoundary") { @@ -794,28 +782,22 @@ function newBucketFactoryInnerExpression( const blocks: TE[] = []; const copyBlocks: TE[] = []; - for (let i = 0; i < unaryCopyCount; i++) { - const te_i = te.lit(i); - blocks.push( - te`\ - unaryStore.set(copyUnaryStepIds[${te_i}], parentBucket.unaryStore.get(copyUnaryStepIds[${te_i}])); -`, - ); - } - for (let i = 0; i < batchCopyCount; i++) { + for (let i = 0; i < copyCount; i++) { const te_source = te.identifier(`source${i}`); const te_target = te.identifier(`target${i}`); const te_i = te.lit(i); blocks.push( te`\ - const ${te_source} = parentBucket.store.get(copyBatchStepIds[${te_i}]); - const ${te_target} = []; - store.set(copyBatchStepIds[${te_i}], ${te_target}); + const ${te_source} = parentBucket.store.get(copyStepIds[${te_i}]); + const ${te_target} = ${te_source}.isBatch ? ${ref_batchExecutionValue}([]) : ${te_source}; + store.set(copyStepIds[${te_i}], ${te_target}); `, ); copyBlocks.push( te`\ - ${te_target}[newIndex] = ${te_source}[originalIndex]; + if(${te_target}.isBatch) { + ${te_target}.entries[newIndex] = ${te_source}.at(originalIndex); + } `, ); } @@ -828,7 +810,7 @@ function newBucketFactoryInnerExpression( const nullableStepStore = parentBucket.store.get(itemStepId); const itemStepIdList = []; - store.set(itemStepId, itemStepIdList); + store.set(itemStepId, ${ref_batchExecutionValue}(itemStepIdList)); // Prepare store with an empty list for each copyPlanId ${te.join(blocks, "")} @@ -841,7 +823,7 @@ ${te.join(blocks, "")} originalIndex < parentBucket.size; originalIndex++ ) { - const fieldValue = nullableStepStore[originalIndex]; + const fieldValue = nullableStepStore.at(originalIndex); if (fieldValue != null) { const newIndex = size++; map.set(originalIndex, newIndex); @@ -857,27 +839,21 @@ ${te.join(copyBlocks, "")} } else if (reasonType === "listItem") { const blocks: TE[] = []; const copyBlocks: TE[] = []; - for (let i = 0; i < unaryCopyCount; i++) { - const te_i = te.lit(i); - blocks.push( - te`\ - unaryStore.set(copyUnaryStepIds[${te_i}], parentBucket.unaryStore.get(copyUnaryStepIds[${te_i}])); - `, - ); - } - for (let i = 0; i < batchCopyCount; i++) { + for (let i = 0; i < copyCount; i++) { const te_source = te.identifier(`source${i}`); const te_target = te.identifier(`target${i}`); const te_i = te.lit(i); blocks.push( te`\ - const ${te_source} = parentBucket.store.get(copyBatchStepIds[${te_i}]); - const ${te_target} = []; - store.set(copyBatchStepIds[${te_i}], ${te_target}); + const ${te_source} = parentBucket.store.get(copyStepIds[${te_i}]); + const ${te_target} = ${te_source}.isBatch ? ${ref_batchExecutionValue}([]) : ${te_source}; + store.set(copyStepIds[${te_i}], ${te_target}); `, ); copyBlocks.push(te`\ - ${te_target}[newIndex] = ${te_source}[originalIndex]; + if (${te_target}.isBatch) { + ${te_target}.entries[newIndex] = ${te_source}.at(originalIndex); + } `); } return makeNewBucketExpression( @@ -885,13 +861,10 @@ ${te.join(copyBlocks, "")} reasonType, te`\ const listStepId = this.reason.parentStep.id; - const listStepStore = - this.reason.parentStep._isUnary - ? ${ref_arrayOfLength}(parentBucket.size, parentBucket.unaryStore.get(listStepId)) - : parentBucket.store.get(listStepId); + const listStepStore = parentBucket.store.get(listStepId); const itemStepIdList = []; - store.set(this.rootStep.id, itemStepIdList); + store.set(this.rootStep.id, ${ref_batchExecutionValue}(itemStepIdList)); // Prepare store with an empty list for each copyPlanId ${te.join(blocks, "")} @@ -903,7 +876,7 @@ ${te.join(copyBlocks, "")} originalIndex < parentBucket.size; originalIndex++ ) { - const list = listStepStore[originalIndex]; + const list = listStepStore.at(originalIndex); if (Array.isArray(list)) { const newIndexes = []; map.set(originalIndex, newIndexes); @@ -929,8 +902,7 @@ ${te.join(copyBlocks, "")} function withNewBucketFactory( signature: string, - unaryCopyCount: number, - batchCopyCount: number, + copyCount: number, reasonType: "nullableBoundary" | "listItem", callback: (factory: Factory) => void, ) { @@ -949,15 +921,14 @@ function withNewBucketFactory( const executorExpression = newBucketFactoryInnerExpression( signature, - unaryCopyCount, - batchCopyCount, + copyCount, reasonType, ); const factoryExpression = te`\ function ${te.identifier( `layerPlanNewBucketFactory_${signature}`, - )}(copyUnaryStepIds, copyBatchStepIds) { + )}(copyStepIds) { return ${executorExpression}; }`; te.runInBatch(factoryExpression, (factory) => { diff --git a/grafast/grafast/src/engine/OperationPlan.ts b/grafast/grafast/src/engine/OperationPlan.ts index b80c0711c1..e4be9cedea 100644 --- a/grafast/grafast/src/engine/OperationPlan.ts +++ b/grafast/grafast/src/engine/OperationPlan.ts @@ -3079,10 +3079,7 @@ export class OperationPlan { let currentLayerPlan: LayerPlan | null = layerPlan; while (dep.layerPlan !== currentLayerPlan) { - if ( - currentLayerPlan.copyBatchStepIds.includes(dep.id) || - currentLayerPlan.copyUnaryStepIds.includes(dep.id) - ) { + if (currentLayerPlan.copyStepIds.includes(dep.id)) { break; } const targetStep = this.stepTracker.getStepById(dep.id); @@ -3095,10 +3092,8 @@ export class OperationPlan { } if (targetStep._isUnary) { targetStep._isUnaryLocked = true; - currentLayerPlan.copyUnaryStepIds.push(dep.id); - } else { - currentLayerPlan.copyBatchStepIds.push(dep.id); } + currentLayerPlan.copyStepIds.push(dep.id); currentLayerPlan = currentLayerPlan.parentLayerPlan; if (!currentLayerPlan) { throw new Error( @@ -3426,7 +3421,7 @@ export class OperationPlan { return { id: lp.id, reason: printBucketReason(lp.reason), - copyStepIds: [...lp.copyUnaryStepIds, ...lp.copyBatchStepIds], + copyStepIds: lp.copyStepIds, phases: lp.phases.map(printPhase), steps: lp.steps.map(printStep), children: lp.children.map(printBucket), diff --git a/grafast/grafast/src/engine/OutputPlan.ts b/grafast/grafast/src/engine/OutputPlan.ts index 18fecbef49..5bbc9f85b8 100644 --- a/grafast/grafast/src/engine/OutputPlan.ts +++ b/grafast/grafast/src/engine/OutputPlan.ts @@ -829,7 +829,7 @@ function makeExecutorExpression( mutablePath, bucket, bucketIndex, - rawBucketRootValue = this.rootStep._isUnary ? bucket.unaryStore.get(this.rootStep.id) : bucket.store.get(this.rootStep.id)[bucketIndex] + rawBucketRootValue = bucket.store.get(this.rootStep.id).at(bucketIndex) ) { const bucketRootValue = this.processRoot !== null ? this.processRoot(rawBucketRootValue) : rawBucketRootValue; ${preamble}\ diff --git a/grafast/grafast/src/engine/executeBucket.ts b/grafast/grafast/src/engine/executeBucket.ts index 2437d36714..0333672e86 100644 --- a/grafast/grafast/src/engine/executeBucket.ts +++ b/grafast/grafast/src/engine/executeBucket.ts @@ -105,7 +105,6 @@ export function executeBucket( metaByMetaKey, size, store, - unaryStore, layerPlan: { phases, children: childLayerPlans }, } = bucket; @@ -255,7 +254,10 @@ export function executeBucket( if (finishedStep._isUnary) { // Handled later } else { - bucket.store.set(finishedStep.id, arrayOfLength(size)); + bucket.store.set( + finishedStep.id, + batchExecutionValue(arrayOfLength(size)), + ); } } @@ -290,10 +292,10 @@ export function executeBucket( value === null ) { if (finishedStep._isUnary) { - bucket.unaryStore.set(finishedStep.id, value); + bucket.store.set(finishedStep.id, unaryExecutionValue(value)); } else { const finalResult = bucket.store.get(finishedStep.id)!; - finalResult[resultIndex] = value; + (finalResult.entries as any[])[resultIndex] = value; } return; } @@ -327,10 +329,10 @@ export function executeBucket( const arr: StreamMaybeMoreableArray = []; arr[$$streamMore] = iterator; if (finishedStep._isUnary) { - bucket.unaryStore.set(finishedStep.id, arr); + bucket.store.set(finishedStep.id, unaryExecutionValue(arr)); } else { const finalResult = bucket.store.get(finishedStep.id)!; - finalResult[resultIndex] = arr; + (finalResult.entries as any[])[resultIndex] = arr; } } else { // Evaluate the first initialCount entries, rest is streamed. @@ -365,19 +367,19 @@ export function executeBucket( } if (finishedStep._isUnary) { - bucket.unaryStore.set(finishedStep.id, arr); + bucket.store.set(finishedStep.id, unaryExecutionValue(arr)); } else { const finalResult = bucket.store.get(finishedStep.id)!; - finalResult[resultIndex] = arr; + (finalResult.entries as any[])[resultIndex] = arr; } } catch (e) { bucket.hasErrors = true; const error = newGrafastError(e, finishedStep.id); if (finishedStep._isUnary) { - bucket.unaryStore.set(finishedStep.id, error); + bucket.store.set(finishedStep.id, unaryExecutionValue(error)); } else { const finalResult = bucket.store.get(finishedStep.id)!; - finalResult[resultIndex] = error; + (finalResult.entries as any[])[resultIndex] = error; } } })(); @@ -392,27 +394,27 @@ export function executeBucket( proto === Object.prototype ) { if (finishedStep._isUnary) { - bucket.unaryStore.set(finishedStep.id, value); + bucket.store.set(finishedStep.id, unaryExecutionValue(value)); } else { const finalResult = bucket.store.get(finishedStep.id)!; - finalResult[resultIndex] = value; + (finalResult.entries as any[])[resultIndex] = value; } } else if (value instanceof Error) { const e = $$error in value ? value : newGrafastError(value, finishedStep.id); if (finishedStep._isUnary) { - bucket.unaryStore.set(finishedStep.id, e); + bucket.store.set(finishedStep.id, unaryExecutionValue(e)); } else { const finalResult = bucket.store.get(finishedStep.id)!; - finalResult[resultIndex] = e; + (finalResult.entries as any[])[resultIndex] = e; } bucket.hasErrors = true; } else { if (finishedStep._isUnary) { - bucket.unaryStore.set(finishedStep.id, value); + bucket.store.set(finishedStep.id, unaryExecutionValue(value)); } else { const finalResult = bucket.store.get(finishedStep.id)!; - finalResult[resultIndex] = value; + (finalResult.entries as any[])[resultIndex] = value; } } }; @@ -458,10 +460,10 @@ export function executeBucket( finishedStep.id, ); if (finishedStep._isUnary) { - bucket.unaryStore.set(finishedStep.id, error); + bucket.store.set(finishedStep.id, unaryExecutionValue(error)); } else { const storeEntry = bucket.store.get(finishedStep.id)!; - storeEntry[dataIndex] = error; + (storeEntry.entries as any[])[dataIndex] = error; } } } @@ -492,10 +494,10 @@ export function executeBucket( finishedStep.id, ); if (finishedStep._isUnary) { - bucket.unaryStore.set(finishedStep.id, error); + bucket.store.set(finishedStep.id, unaryExecutionValue(error)); } else { const storeEntry = bucket.store.get(finishedStep.id)!; - storeEntry[dataIndex] = error; + (storeEntry.entries as any[])[dataIndex] = error; } } }); @@ -539,7 +541,7 @@ export function executeBucket( if (step._isUnary) { // Handled later } else { - bucket.store.set(step.id, arrayOfLength(size)); + bucket.store.set(step.id, batchExecutionValue(arrayOfLength(size))); } } outerLoop: for (let dataIndex = 0; dataIndex < size; dataIndex++) { @@ -548,9 +550,8 @@ export function executeBucket( for (const dep of sideEffectStepsWithErrors[ currentPolymorphicPath ?? NO_POLY_PATH ]) { - const depVal = dep._isUnary - ? bucket.unaryStore.get(dep.id) - : bucket.store.get(dep.id)![dataIndex]; + const depExecutionValue = bucket.store.get(dep.id)!; + const depVal = depExecutionValue.at(dataIndex); if ( depVal === POLY_SKIPPED || (isDev && depVal?.$$error === POLY_SKIPPED) @@ -566,10 +567,10 @@ export function executeBucket( allStepsIndex ] as UnbatchedExecutableStep; if (step._isUnary) { - bucket.unaryStore.set(step.id, depVal); + bucket.store.set(step.id, depExecutionValue); } else { const storeEntry = bucket.store.get(step.id)!; - storeEntry[dataIndex] = depVal; + (storeEntry.entries as any[])[dataIndex] = depVal; } } continue outerLoop; @@ -589,15 +590,14 @@ export function executeBucket( const deps: any = []; const extra = extras[allStepsIndex]; for (const $dep of step.dependencies) { - const depVal = $dep._isUnary - ? bucket.unaryStore.get($dep.id) - : bucket.store.get($dep.id)![dataIndex]; + const depExecutionVal = bucket.store.get($dep.id)!; + const depVal = depExecutionVal.at(dataIndex); if (bucket.hasErrors && isGrafastError(depVal)) { if (step._isUnary) { - bucket.unaryStore.set(step.id, depVal); + bucket.store.set(step.id, depExecutionVal); } else { const storeEntry = bucket.store.get(step.id)!; - storeEntry[dataIndex] = depVal; + (storeEntry.entries as any[])[dataIndex] = depVal; } continue stepLoop; } @@ -605,19 +605,19 @@ export function executeBucket( } const stepResult = step.unbatchedExecute(extra, ...deps); if (step._isUnary) { - bucket.unaryStore.set(step.id, stepResult); + bucket.store.set(step.id, unaryExecutionValue(stepResult)); } else { const storeEntry = bucket.store.get(step.id)!; - storeEntry[dataIndex] = stepResult; + (storeEntry.entries as any[])[dataIndex] = stepResult; } } catch (e) { bucket.hasErrors = true; const error = newGrafastError(e, step.id); if (step._isUnary) { - bucket.unaryStore.set(step.id, error); + bucket.store.set(step.id, unaryExecutionValue(error)); } else { const storeEntry = bucket.store.get(step.id)!; - storeEntry[dataIndex] = error; + (storeEntry.entries as any[])[dataIndex] = error; } } } @@ -860,38 +860,23 @@ export function executeBucket( if (depCount > 0 || sideEffectStepsWithErrors !== null) { for (let i = 0, l = depCount; i < l; i++) { const $dep = sstep.dependencies[i]; - if ($dep._isUnary) { - dependencies[i] = unaryExecutionValue(unaryStore.get($dep.id)); - } else { - dependencies[i] = batchExecutionValue(store.get($dep.id)!); - } + const executionValue = store.get($dep.id)!; + dependencies[i] = executionValue; } if (sideEffectStepsWithErrors !== null) { if (sstep.polymorphicPaths) { for (const path of sstep.polymorphicPaths) { for (const sideEffectStep of sideEffectStepsWithErrors[path]) { - if (sideEffectStep._isUnary) { - const sideEffectStoreEntry = unaryStore.get( - sideEffectStep.id, - )!; - dependencies.push(unaryExecutionValue(sideEffectStoreEntry)); - } else { - const sideEffectStoreEntry = store.get(sideEffectStep.id)!; - dependencies.push(batchExecutionValue(sideEffectStoreEntry)); - } + const sideEffectStoreEntry = store.get(sideEffectStep.id)!; + dependencies.push(sideEffectStoreEntry); } } } else { for (const sideEffectStep of sideEffectStepsWithErrors[ NO_POLY_PATH ]) { - if (sideEffectStep._isUnary) { - const sideEffectStoreEntry = unaryStore.get(sideEffectStep.id)!; - dependencies.push(unaryExecutionValue(sideEffectStoreEntry)); - } else { - const sideEffectStoreEntry = store.get(sideEffectStep.id)!; - dependencies.push(batchExecutionValue(sideEffectStoreEntry)); - } + const sideEffectStoreEntry = store.get(sideEffectStep.id)!; + dependencies.push(sideEffectStoreEntry); } } } @@ -1021,7 +1006,6 @@ export function newBucket( Bucket, | "layerPlan" | "store" - | "unaryStore" | "size" | "hasErrors" | "polymorphicPathList" @@ -1053,14 +1037,16 @@ export function newBucket( */ for (const [key, list] of spec.store.entries()) { assert.ok( - Array.isArray(list), - `Store entry for step '${key}' for layerPlan '${spec.layerPlan.id}' should be a list`, - ); - assert.strictEqual( - list.length, - spec.size, - `Store entry for step '${key}' for layerPlan '${spec.layerPlan.id}' should have same length as bucket`, + typeof list.isBatch === "boolean", + `Store entry for step '${key}' for layerPlan '${spec.layerPlan.id}' should be an ExecutionValue`, ); + if (list.isBatch) { + assert.strictEqual( + list.entries.length, + spec.size, + `Store entry for step '${key}' for layerPlan '${spec.layerPlan.id}' should have same length as bucket`, + ); + } } if (!spec.iterators) { throw new Error(`newBucket called but no iterators array was specified`); @@ -1079,7 +1065,6 @@ export function newBucket( // Copy from spec layerPlan: spec.layerPlan, store: spec.store, - unaryStore: spec.unaryStore, size: spec.size, hasErrors: spec.hasErrors, polymorphicPathList: spec.polymorphicPathList, @@ -1091,7 +1076,9 @@ export function newBucket( } // TODO: memoize? -function batchExecutionValue(entries: TData[]): ExecutionValue { +export function batchExecutionValue( + entries: TData[], +): ExecutionValue { return { at(i) { return entries[i]; @@ -1102,7 +1089,9 @@ function batchExecutionValue(entries: TData[]): ExecutionValue { } // TODO: memoize? -function unaryExecutionValue(value: TData): ExecutionValue { +export function unaryExecutionValue( + value: TData, +): ExecutionValue { return { at() { return value; diff --git a/grafast/grafast/src/engine/executeOutputPlan.ts b/grafast/grafast/src/engine/executeOutputPlan.ts index 7bc749c0e5..e95dd68074 100644 --- a/grafast/grafast/src/engine/executeOutputPlan.ts +++ b/grafast/grafast/src/engine/executeOutputPlan.ts @@ -104,8 +104,6 @@ function recursivePrintBucket(bucket: Bucket, indentLevel = 0): string { `Bucket for ${bucket.layerPlan} (size = ${bucket.size}): Store: ${indent(4, inspect(bucket.store, { colors: true }))} - Unary store: -${indent(4, inspect(bucket.unaryStore, { colors: true }))} Children: ${Object.entries(bucket.children) .map(([_id, { bucket }]) => indent(4, recursivePrintBucket(bucket))) diff --git a/grafast/grafast/src/prepare.ts b/grafast/grafast/src/prepare.ts index 8471e095a0..06bc7786fc 100644 --- a/grafast/grafast/src/prepare.ts +++ b/grafast/grafast/src/prepare.ts @@ -12,7 +12,12 @@ import type { Bucket, RequestTools } from "./bucket.js"; import type { Deferred } from "./deferred.js"; import { defer } from "./deferred.js"; import { isDev } from "./dev.js"; -import { executeBucket, newBucket } from "./engine/executeBucket.js"; +import { + batchExecutionValue, + executeBucket, + newBucket, + unaryExecutionValue, +} from "./engine/executeBucket.js"; import type { OutputPlanContext, PayloadRoot, @@ -35,7 +40,7 @@ import type { } from "./interfaces.js"; import { $$eventEmitter, $$extensions, $$streamMore } from "./interfaces.js"; import { timeSource } from "./timeSource.js"; -import { isPromiseLike } from "./utils.js"; +import { arrayOfLength, isPromiseLike } from "./utils.js"; const { GraphQLError } = graphql; @@ -300,18 +305,19 @@ function executePreemptive( const iterators: Array | Iterator>> = [new Set()]; const store: Bucket["store"] = new Map(); - const unaryStore = new Map(); - unaryStore.set(operationPlan.rootLayerPlan.rootStep!.id, 0); - unaryStore.set(operationPlan.variableValuesStep.id, variableValues); - unaryStore.set(operationPlan.contextStep.id, context); - unaryStore.set(operationPlan.rootValueStep.id, rootValue); + store.set(operationPlan.rootLayerPlan.rootStep!.id, unaryExecutionValue(0)); + store.set( + operationPlan.variableValuesStep.id, + unaryExecutionValue(variableValues), + ); + store.set(operationPlan.contextStep.id, unaryExecutionValue(context)); + store.set(operationPlan.rootValueStep.id, unaryExecutionValue(rootValue)); const rootBucket = newBucket( { layerPlan: operationPlan.rootLayerPlan, size, store, - unaryStore, hasErrors: false, polymorphicPathList, iterators, @@ -343,31 +349,23 @@ function executePreemptive( const { rootStep } = layerPlan; // PERF: we could consider batching this. const store: Bucket["store"] = new Map(); - const unaryStore = new Map(); - const subscriptionBucketIndex = 0; + const ZERO = 0; - for (const depId of layerPlan.copyUnaryStepIds) { - unaryStore.set(depId, rootBucket.unaryStore.get(depId)); - } - for (const depId of layerPlan.copyBatchStepIds) { - store.set(depId, []); + for (const depId of layerPlan.copyStepIds) { + const executionVal = rootBucket.store.get(depId)!; + // Normally this would need scaling, but not this time since we know it only represents a single entry + store.set(depId, executionVal); } - if (rootStep!._isUnary) { - unaryStore.set(rootStep!.id, payload); - } else { - store.set(rootStep!.id, [payload]); - } - for (const depId of layerPlan.copyBatchStepIds) { - store.get(depId)![subscriptionBucketIndex] = - rootBucket.store.get(depId)![rootBucketIndex]; - } + const rootExecutionValue = rootStep!._isUnary + ? unaryExecutionValue(payload) + : batchExecutionValue([payload]); + store.set(rootStep!.id, rootExecutionValue); const subscriptionBucket = newBucket( { layerPlan, store, - unaryStore, hasErrors: rootBucket.hasErrors, polymorphicPathList: [POLYMORPHIC_ROOT_PATH], iterators: [new Set()], @@ -380,14 +378,12 @@ function executePreemptive( const [ctx, result] = outputBucket( operationPlan.rootOutputPlan, subscriptionBucket, - subscriptionBucketIndex, + ZERO, requestContext, [], - operationPlan.variableValuesStep._isUnary - ? rootBucket.unaryStore.get(operationPlan.variableValuesStep.id) - : rootBucket.store.get(operationPlan.variableValuesStep.id)![ - rootBucketIndex - ], + rootBucket.store + .get(operationPlan.variableValuesStep.id)! + .at(rootBucketIndex), outputDataAsString, ); return finalize( @@ -409,12 +405,11 @@ function executePreemptive( // If it's a subscription we need to use the stream const bucketRootValue = - rootBucket.layerPlan.rootStep!.id != null - ? rootBucket.layerPlan.rootStep!._isUnary - ? rootBucket.unaryStore.get(rootBucket.layerPlan.rootStep!.id) - : rootBucket.store.get(rootBucket.layerPlan.rootStep!.id)![ - rootBucketIndex - ] + rootBucket.layerPlan.rootStep != null && + rootBucket.layerPlan.rootStep.id != null + ? rootBucket.store + .get(rootBucket.layerPlan.rootStep.id)! + .at(rootBucketIndex) : null; if (isGrafastError(bucketRootValue)) { releaseUnusedIterators(rootBucket, rootBucketIndex, null); @@ -513,7 +508,7 @@ function executePreemptive( rootBucketIndex, requestContext, [], - rootBucket.unaryStore.get(operationPlan.variableValuesStep.id), + rootBucket.store.get(operationPlan.variableValuesStep.id)!.at(0), outputDataAsString, ); return finalize( @@ -739,7 +734,6 @@ async function processStream( const _processQueue = (entries: ResultTuple[]) => { const size = entries.length; const store: Bucket["store"] = new Map(); - const unaryStore = new Map(); const polymorphicPathList: (string | null)[] = []; const iterators: Array | Iterator>> = []; @@ -753,55 +747,41 @@ async function processStream( } directLayerPlanChild = parent; } + const { id: listItemStepId, _isUnary: isUnary } = + directLayerPlanChild.rootStep!; - const listItemStepId = directLayerPlanChild.rootStep!.id; - const listItemStepIdList: any[] = []; - if (directLayerPlanChild.rootStep?._isUnary) { - // handled later - } else { - store.set(listItemStepId, listItemStepIdList); + for (const copyStepId of directLayerPlanChild.copyStepIds) { + const executionValue = spec.bucket.store.get(copyStepId)!; + if (!executionValue) { + throw new Error( + `GrafastInternalError<2db7b749-399f-486b-bd12-7ca337b937e4>: ${spec.bucket.layerPlan} doesn't seem to include ${copyStepId} (required by ${directLayerPlanChild} via ${spec.outputPlan})`, + ); + } + if (executionValue.isBatch) { + const values: any[] = arrayOfLength( + size, + executionValue.at(spec.bucketIndex), + ); + store.set(copyStepId, batchExecutionValue(values)); + } else { + store.set(copyStepId, executionValue); + } } - for (const copyStepId of directLayerPlanChild.copyUnaryStepIds) { - unaryStore.set(copyStepId, spec.bucket.unaryStore.get(copyStepId)); - } - for (const copyStepId of directLayerPlanChild.copyBatchStepIds) { - store.set(copyStepId, []); + if (isUnary) { + assert.ok(entries.length === 0, "Unary step should only have one index"); + store.set(listItemStepId, unaryExecutionValue(entries[0][0])); + } else { + const listItemStepIdList = entries.map((e) => e[0]); + store.set(listItemStepId, batchExecutionValue(listItemStepIdList)); } - let bucketIndex = 0; - for (const entry of entries) { - const [result] = entry; - if (directLayerPlanChild.rootStep?._isUnary) { - assert.ok(bucketIndex === 0, "Unary step should only have one index"); - unaryStore.set(listItemStepId, result); - } else { - listItemStepIdList[bucketIndex] = result; - } - + for (let bucketIndex = 0; bucketIndex < size; bucketIndex++) { polymorphicPathList[bucketIndex] = spec.bucket.polymorphicPathList[spec.bucketIndex]; iterators[bucketIndex] = new Set(); - for (const copyStepId of directLayerPlanChild.copyBatchStepIds) { - const list = spec.bucket.store.get(copyStepId); - if (!list) { - throw new Error( - `GrafastInternalError<2db7b749-399f-486b-bd12-7ca337b937e4>: ${spec.bucket.layerPlan} doesn't seem to include ${copyStepId} (required by ${directLayerPlanChild} via ${spec.outputPlan})`, - ); - } - // PERF: optimize away these .get calls - store.get(copyStepId)![bucketIndex] = list[spec.bucketIndex]; - } - // PERF: we should be able to optimize this - bucketIndex++; } - assert.strictEqual( - bucketIndex, - size, - "GrafastInternalError<7c8deab0-8dfa-40f2-b625-97026f8fedcc>: expected bucket size does not match", - ); - // const childBucket = newBucket(directLayerPlanChild, noDepsList, store); // const childBucketIndex = 0; const rootBucket = newBucket( @@ -809,7 +789,6 @@ async function processStream( layerPlan: directLayerPlanChild, size, store, - unaryStore, hasErrors: false, polymorphicPathList, iterators, @@ -939,8 +918,6 @@ function processSingleDeferred( const size = specs.length; const store: Bucket["store"] = new Map(); - const unaryStore = new Map(); - const polymorphicPathList: (string | null)[] = []; const iterators: Array | Iterator>> = []; @@ -956,32 +933,25 @@ function processSingleDeferred( } } - for (const copyStepId of outputPlan.layerPlan.copyUnaryStepIds) { - unaryStore.set(copyStepId, firstBucket.unaryStore.get(copyStepId)); - } - for (const copyStepId of outputPlan.layerPlan.copyBatchStepIds) { - store.set(copyStepId, []); + for (const copyStepId of outputPlan.layerPlan.copyStepIds) { + const executionValue = firstBucket.store.get(copyStepId)!; + if (executionValue!.isBatch) { + const values = specs.map(([, spec]) => + executionValue.at(spec.bucketIndex), + ); + store.set(copyStepId, batchExecutionValue(values)); + } else { + store.set(copyStepId, executionValue); + } } - let bucketIndex = 0; - for (const [, spec] of specs) { + for (let bucketIndex = 0; bucketIndex < size; bucketIndex++) { + const spec = specs[bucketIndex][1]; polymorphicPathList[bucketIndex] = spec.bucket.polymorphicPathList[spec.bucketIndex]; iterators[bucketIndex] = new Set(); - for (const copyStepId of outputPlan.layerPlan.copyBatchStepIds) { - store.get(copyStepId)![bucketIndex] = - spec.bucket.store.get(copyStepId)![spec.bucketIndex]; - } - // PERF: we should be able to optimize this - bucketIndex++; } - assert.strictEqual( - bucketIndex, - size, - "GrafastInternalError<4e88c671-f65b-42a6-8756-61247b188093>: expected bucket size does not match", - ); - // const childBucket = newBucket(spec.outputPlan.layerPlan, noDepsList, store); // const childBucketIndex = 0; const rootBucket = newBucket( @@ -989,7 +959,6 @@ function processSingleDeferred( layerPlan: outputPlan.layerPlan, size, store, - unaryStore, hasErrors: false, polymorphicPathList, iterators, diff --git a/grafast/grafast/src/steps/applyTransforms.ts b/grafast/grafast/src/steps/applyTransforms.ts index 7b9ff152d3..f9f9e25959 100644 --- a/grafast/grafast/src/steps/applyTransforms.ts +++ b/grafast/grafast/src/steps/applyTransforms.ts @@ -1,7 +1,12 @@ import * as assert from "../assert.js"; import type { Bucket } from "../bucket.js"; import { isDev } from "../dev.js"; -import { executeBucket, newBucket } from "../engine/executeBucket.js"; +import { + batchExecutionValue, + executeBucket, + newBucket, + unaryExecutionValue, +} from "../engine/executeBucket.js"; import type { LayerPlanReasonSubroutine } from "../engine/LayerPlan.js"; import { LayerPlan } from "../engine/LayerPlan.js"; import { withGlobalLayerPlan } from "../engine/lib/withGlobalLayerPlan.js"; @@ -79,10 +84,9 @@ export class ApplyTransformsStep extends ExecutableStep { const bucket = extra._bucket; const childLayerPlan = this.subroutineLayer; - const { copyBatchStepIds, copyUnaryStepIds, rootStep } = childLayerPlan; + const { copyStepIds, rootStep } = childLayerPlan; const store: Bucket["store"] = new Map(); - const unaryStore = new Map(); const polymorphicPathList: (string | null)[] = []; const iterators: Array | Iterator>> = []; const map: Map = new Map(); @@ -97,30 +101,25 @@ export class ApplyTransformsStep extends ExecutableStep { ); } if (itemStep._isUnary) { - // Handled later + store.set(itemStepId, unaryExecutionValue(values0.at(0))); } else { - store.set(itemStepId, []); + store.set(itemStepId, batchExecutionValue([])); } - for (const stepId of copyUnaryStepIds) { - unaryStore.set(stepId, bucket.unaryStore.get(stepId)); - if (isDev && !bucket.unaryStore.has(stepId)) { + for (const stepId of copyStepIds) { + const ev = bucket.store.get(stepId)!; + if (!ev) { throw new Error( `GrafastInternalError<68675bbd-bc15-4c4a-902a-61c0de616325>: unary step '${stepId}' (${this.operationPlan.dangerouslyGetStep( stepId, - )}) listed in copyUnaryStepIds but not available in parent bucket for ${this}`, + )}) listed in copyStepIds but not available in parent bucket for ${this}`, ); } - } - // Prepare store with an empty list for each copyBatchPlanId - for (const stepId of copyBatchStepIds) { - store.set(stepId, []); - if (isDev && !bucket.store.has(stepId)) { - throw new Error( - `GrafastInternalError<14f2b4c6-f951-44d6-ad6b-2eace3330b84>: step '${stepId}' (${this.operationPlan.dangerouslyGetStep( - stepId, - )}) listed in copyBatchStepIds but not available in parent bucket for ${this}`, - ); + if (ev.isBatch) { + // Prepare store with an empty list for each copyBatchPlanId + store.set(stepId, batchExecutionValue([])); + } else { + store.set(stepId, ev); } } @@ -139,14 +138,17 @@ export class ApplyTransformsStep extends ExecutableStep { // Copying across the iterators because we do NOT call outputBucket, // so we need to ensure any streams are cleaned up. iterators[newIndex] = bucket.iterators[originalIndex]; - if (itemStep._isUnary) { - unaryStore.set(itemStepId, list[j]); - } else { - store.get(itemStepId)![newIndex] = list[j]; + const ev = store.get(itemStepId)!; + if (ev.isBatch) { + (ev.entries as any[])[newIndex] = list[j]; } - for (const stepId of copyBatchStepIds) { - store.get(stepId)![newIndex] = - bucket.store.get(stepId)![originalIndex]; + for (const stepId of copyStepIds) { + const ev = store.get(stepId)!; + if (ev.isBatch) { + (ev.entries as any[])[newIndex] = bucket.store + .get(stepId)! + .at(originalIndex); + } } } } @@ -158,7 +160,6 @@ export class ApplyTransformsStep extends ExecutableStep { layerPlan: childLayerPlan, size, store, - unaryStore, hasErrors: bucket.hasErrors, polymorphicPathList, iterators, @@ -168,9 +169,7 @@ export class ApplyTransformsStep extends ExecutableStep { await executeBucket(childBucket, extra._requestContext); } - const [depResults, unaryResult] = rootStep?._isUnary - ? [null, unaryStore.get(rootStep.id)] - : [store.get(rootStep!.id)!, null]; + const depResults = store.get(rootStep!.id)!; return indexMap((originalIndex) => { const list = values0.at(originalIndex); @@ -186,7 +185,7 @@ export class ApplyTransformsStep extends ExecutableStep { return null; } const values = indexes.map((idx) => { - const val = depResults === null ? unaryResult : depResults[idx]; + const val = depResults.at(idx); if (val instanceof Error) { throw val; } diff --git a/grafast/grafast/src/steps/listTransform.ts b/grafast/grafast/src/steps/listTransform.ts index efa8e5a815..d95b37736b 100644 --- a/grafast/grafast/src/steps/listTransform.ts +++ b/grafast/grafast/src/steps/listTransform.ts @@ -1,7 +1,12 @@ import * as assert from "../assert.js"; import type { Bucket } from "../bucket.js"; import { isDev } from "../dev.js"; -import { executeBucket, newBucket } from "../engine/executeBucket.js"; +import { + batchExecutionValue, + executeBucket, + newBucket, + unaryExecutionValue, +} from "../engine/executeBucket.js"; import type { LayerPlanReasonSubroutine } from "../engine/LayerPlan.js"; import { LayerPlan } from "../engine/LayerPlan.js"; import { withGlobalLayerPlan } from "../engine/lib/withGlobalLayerPlan.js"; @@ -203,13 +208,12 @@ export class __ListTransformStep< const bucket = extra._bucket; const childLayerPlan = this.subroutineLayer; - const { copyUnaryStepIds, copyBatchStepIds, rootStep } = childLayerPlan; + const { copyStepIds, rootStep } = childLayerPlan; if (rootStep === null) { throw new Error(`rootStep of ${childLayerPlan} must not be null.`); } const store: Bucket["store"] = new Map(); - const unaryStore = new Map(); const polymorphicPathList: (string | null)[] = []; const iterators: Array | Iterator>> = []; const map: Map = new Map(); @@ -223,36 +227,36 @@ export class __ListTransformStep< "GrafastInternalError: listItem layer plan has no rootStepId", ); } + + const listStepValue = values[this.listStepDepId]; + if (itemStep._isUnary) { - // handled later + const list = listStepValue.at(0); + store.set( + itemStepId, + unaryExecutionValue(Array.isArray(list) ? list[0] : list), + ); } else { - store.set(itemStepId, []); + store.set(itemStepId, batchExecutionValue([])); } - for (const stepId of copyUnaryStepIds) { - unaryStore.set(stepId, bucket.unaryStore.get(stepId)); - if (isDev && !bucket.unaryStore.has(stepId)) { + for (const stepId of copyStepIds) { + const ev = bucket.store.get(stepId); + if (!ev) { throw new Error( `GrafastInternalError<2be5c2c6-a7f8-4002-93a0-6ace5a89a962>: unary step '${stepId}' (${this.operationPlan.dangerouslyGetStep( stepId, - )}) listed in copyUnaryStepIds but not available in parent bucket for ${this}`, + )}) listed in copyStepIds but not available in parent bucket for ${this}`, ); } - } - // Prepare store with an empty list for each copyPlanId - for (const stepId of copyBatchStepIds) { - store.set(stepId, []); - if (isDev && !bucket.store.has(stepId)) { - throw new Error( - `GrafastInternalError<26f20f5a-a38a-4f0d-8889-f04bc56d95b3>: step '${stepId}' (${this.operationPlan.dangerouslyGetStep( - stepId, - )}) listed in copyBatchStepIds but not available in parent bucket for ${this}`, - ); + if (ev.isBatch) { + // Prepare store with an empty list for each copyPlanId + store.set(stepId, batchExecutionValue([])); + } else { + store.set(stepId, ev); } } - const listStepValue = values[this.listStepDepId]; - // We'll typically be creating more listItem bucket entries than we // have parent buckets, so we must "multiply up" the store entries. indexForEach((originalIndex) => { @@ -268,14 +272,17 @@ export class __ListTransformStep< // Copying across the iterators because we do NOT call outputBucket, // so we need to ensure any streams are cleaned up. iterators[newIndex] = bucket.iterators[originalIndex]; - if (itemStep._isUnary) { - unaryStore.set(itemStepId, list[j]); - } else { - store.get(itemStepId)![newIndex] = list[j]; + const ev = store.get(itemStepId)!; + if (ev.isBatch) { + (ev.entries as any[])[newIndex] = list[j]; } - for (const planId of copyBatchStepIds) { - store.get(planId)![newIndex] = - bucket.store.get(planId)![originalIndex]; + for (const planId of copyStepIds) { + const ev = store.get(planId)!; + if (ev.isBatch) { + (ev.entries as any[])[newIndex] = bucket.store + .get(planId)! + .at(originalIndex); + } } } } @@ -287,7 +294,6 @@ export class __ListTransformStep< layerPlan: childLayerPlan, size, store, - unaryStore, hasErrors: bucket.hasErrors, polymorphicPathList, iterators, @@ -297,9 +303,7 @@ export class __ListTransformStep< await executeBucket(childBucket, extra._requestContext); } - const [depResults, unaryResult] = rootStep._isUnary - ? [null, unaryStore.get(rootStep.id)] - : [store.get(rootStep.id)!, null]; + const depResults = store.get(rootStep.id)!; return indexMap((originalIndex) => { const list = listStepValue.at(originalIndex); @@ -314,9 +318,7 @@ export class __ListTransformStep< ); return null; } - const values = indexes.map((idx) => - depResults === null ? unaryResult : depResults[idx], - ); + const values = indexes.map((idx) => depResults.at(idx)); if (isDev) { assert.strictEqual( list.length, diff --git a/postgraphile/postgraphile/__tests__/mutations/v4/mutation-return-types.mermaid b/postgraphile/postgraphile/__tests__/mutations/v4/mutation-return-types.mermaid index 890e04bc25..e6533316a6 100644 --- a/postgraphile/postgraphile/__tests__/mutations/v4/mutation-return-types.mermaid +++ b/postgraphile/postgraphile/__tests__/mutations/v4/mutation-return-types.mermaid @@ -442,7 +442,7 @@ graph TD Bucket12("Bucket 12 (listItem)
Deps: 92

ROOT __Item{12}ᐸ291ᐳ[90]"):::bucket classDef bucket12 stroke:#4169e1 class Bucket12,__Item90,PgSelectSingle91 bucket12 - Bucket13("Bucket 13 (nullableBoundary)
Deps: 92, 91

ROOT PgSelectSingle{12}ᐸpostᐳ[91]"):::bucket + Bucket13("Bucket 13 (nullableBoundary)
Deps: 91, 92

ROOT PgSelectSingle{12}ᐸpostᐳ[91]"):::bucket classDef bucket13 stroke:#3cb371 class Bucket13,PgClassExpression93,List94,Lambda95 bucket13 Bucket14("Bucket 14 (mutationField)
Deps: 296, 297, 3

1: Access[102]
2: Access[103]
3: Object[104]
4: PgSelect[101]
5:
ᐳ: Object[105]"):::bucket @@ -454,19 +454,19 @@ graph TD Bucket16("Bucket 16 (listItem)
Deps: 104

ROOT __Item{16}ᐸ101ᐳ[106]"):::bucket classDef bucket16 stroke:#f5deb3 class Bucket16,__Item106,PgSelectSingle107,Constant126,Connection145,Constant149 bucket16 - Bucket17("Bucket 17 (nullableBoundary)
Deps: 104, 126, 149, 145, 107

ROOT PgSelectSingle{16}ᐸmutation_out_complex_setofᐳ[107]
1:
ᐳ: 108, 109, 119
2: PgSelect[110], PgSelect[120]
ᐳ: 114, 115, 124, 125"):::bucket + Bucket17("Bucket 17 (nullableBoundary)
Deps: 107, 104, 126, 149, 145

ROOT PgSelectSingle{16}ᐸmutation_out_complex_setofᐳ[107]
1:
ᐳ: 108, 109, 119
2: PgSelect[110], PgSelect[120]
ᐳ: 114, 115, 124, 125"):::bucket classDef bucket17 stroke:#696969 class Bucket17,PgClassExpression108,PgClassExpression109,PgSelect110,First114,PgSelectSingle115,PgClassExpression119,PgSelect120,First124,PgSelectSingle125 bucket17 Bucket18("Bucket 18 (nullableBoundary)
Deps: 115

ROOT PgSelectSingle{17}ᐸfrmcdc_compoundTypeᐳ[115]"):::bucket classDef bucket18 stroke:#00bfff class Bucket18,PgClassExpression116,PgClassExpression117,PgClassExpression118 bucket18 - Bucket19("Bucket 19 (nullableBoundary)
Deps: 126, 149, 145, 125, 124

ROOT PgSelectSingle{17}ᐸpersonᐳ[125]"):::bucket + Bucket19("Bucket 19 (nullableBoundary)
Deps: 125, 126, 124, 149, 145

ROOT PgSelectSingle{17}ᐸpersonᐳ[125]"):::bucket classDef bucket19 stroke:#7f007f class Bucket19,PgClassExpression127,List128,Lambda129,PgClassExpression131,Access292 bucket19 Bucket20("Bucket 20 (listItem)
Deps: 149

ROOT __Item{20}ᐸ292ᐳ[147]"):::bucket classDef bucket20 stroke:#ffa500 class Bucket20,__Item147,PgSelectSingle148 bucket20 - Bucket21("Bucket 21 (nullableBoundary)
Deps: 149, 148

ROOT PgSelectSingle{20}ᐸpostᐳ[148]"):::bucket + Bucket21("Bucket 21 (nullableBoundary)
Deps: 148, 149

ROOT PgSelectSingle{20}ᐸpostᐳ[148]"):::bucket classDef bucket21 stroke:#0000ff class Bucket21,PgClassExpression150,List151,Lambda152 bucket21 Bucket22("Bucket 22 (mutationField)
Deps: 3

1: Access[157]
2: Access[158]
3: Object[159]
4: PgSelect[156]
5:
ᐳ: 160, 161, 162"):::bucket @@ -538,7 +538,7 @@ graph TD Bucket44("Bucket 44 (listItem)
ROOT __Item{44}ᐸ234ᐳ[239]"):::bucket classDef bucket44 stroke:#ffff00 class Bucket44,__Item239,PgSelectSingle240,Constant241 bucket44 - Bucket45("Bucket 45 (nullableBoundary)
Deps: 241, 240

ROOT PgSelectSingle{44}ᐸmutation_out_table_setofᐳ[240]"):::bucket + Bucket45("Bucket 45 (nullableBoundary)
Deps: 240, 241

ROOT PgSelectSingle{44}ᐸmutation_out_table_setofᐳ[240]"):::bucket classDef bucket45 stroke:#00ffff class Bucket45,PgClassExpression242,List243,Lambda244 bucket45 Bucket46("Bucket 46 (mutationField)
Deps: 3

1: Access[249]
2: Access[250]
3: Object[251]
4: PgSelect[248]
5:
ᐳ: 252, 253, 254, 255"):::bucket diff --git a/postgraphile/postgraphile/__tests__/mutations/v4/procedure-mutation.mermaid b/postgraphile/postgraphile/__tests__/mutations/v4/procedure-mutation.mermaid index 4fa5387fec..d680e67857 100644 --- a/postgraphile/postgraphile/__tests__/mutations/v4/procedure-mutation.mermaid +++ b/postgraphile/postgraphile/__tests__/mutations/v4/procedure-mutation.mermaid @@ -1015,7 +1015,7 @@ graph TD Bucket78("Bucket 78 (listItem)
Deps: 536

ROOT __Item{78}ᐸ533ᐳ[538]"):::bucket classDef bucket78 stroke:#ffff00 class Bucket78,__Item538,PgSelectSingle539 bucket78 - Bucket79("Bucket 79 (nullableBoundary)
Deps: 536, 539

ROOT PgSelectSingle{78}ᐸpost_manyᐳ[539]
1:
ᐳ: 540, 541, 542
2: PgSelect[543]"):::bucket + Bucket79("Bucket 79 (nullableBoundary)
Deps: 539, 536

ROOT PgSelectSingle{78}ᐸpost_manyᐳ[539]
1:
ᐳ: 540, 541, 542
2: PgSelect[543]"):::bucket classDef bucket79 stroke:#00ffff class Bucket79,PgClassExpression540,PgClassExpression541,PgClassExpression542,PgSelect543 bucket79 Bucket80("Bucket 80 (listItem)
ROOT __Item{80}ᐸ543ᐳ[547]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/mutations/v4/types.mermaid b/postgraphile/postgraphile/__tests__/mutations/v4/types.mermaid index b1b3e626e3..c545d763b7 100644 --- a/postgraphile/postgraphile/__tests__/mutations/v4/types.mermaid +++ b/postgraphile/postgraphile/__tests__/mutations/v4/types.mermaid @@ -1590,7 +1590,7 @@ graph TD Bucket32("Bucket 32 (listItem)
Deps: 232

ROOT __Item{32}ᐸ229ᐳ[234]"):::bucket classDef bucket32 stroke:#ff00ff class Bucket32,__Item234,PgSelectSingle235 bucket32 - Bucket33("Bucket 33 (nullableBoundary)
Deps: 232, 235

ROOT PgSelectSingle{32}ᐸtype_function_list_mutationᐳ[235]
1:
ᐳ: 236, 237, 238, 239, 240, 241, 242, 243, 244, 246, 247, 248, 250, 251, 252, 259, 266, 273, 280, 281, 282, 283, 284, 285, 292, 300, 301, 315, 351, 365, 401, 404, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 422, 423, 443, 444, 260, 263, 267, 270, 274, 277
2: 302, 316, 352, 366, 426, 435
ᐳ: 306, 307, 308, 309, 310, 311, 312, 313, 314, 320, 321, 328, 350, 356, 357, 370, 371, 430, 431, 439, 440, 1378, 342"):::bucket + Bucket33("Bucket 33 (nullableBoundary)
Deps: 235, 232

ROOT PgSelectSingle{32}ᐸtype_function_list_mutationᐳ[235]
1:
ᐳ: 236, 237, 238, 239, 240, 241, 242, 243, 244, 246, 247, 248, 250, 251, 252, 259, 266, 273, 280, 281, 282, 283, 284, 285, 292, 300, 301, 315, 351, 365, 401, 404, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 420, 422, 423, 443, 444, 260, 263, 267, 270, 274, 277
2: 302, 316, 352, 366, 426, 435
ᐳ: 306, 307, 308, 309, 310, 311, 312, 313, 314, 320, 321, 328, 350, 356, 357, 370, 371, 430, 431, 439, 440, 1378, 342"):::bucket classDef bucket33 stroke:#f5deb3 class Bucket33,PgClassExpression236,PgClassExpression237,PgClassExpression238,PgClassExpression239,PgClassExpression240,PgClassExpression241,PgClassExpression242,PgClassExpression243,PgClassExpression244,PgClassExpression246,PgClassExpression247,PgClassExpression248,PgClassExpression250,PgClassExpression251,PgClassExpression252,PgClassExpression259,Access260,Access263,PgClassExpression266,Access267,Access270,PgClassExpression273,Access274,Access277,PgClassExpression280,PgClassExpression281,PgClassExpression282,PgClassExpression283,PgClassExpression284,PgClassExpression285,PgClassExpression292,PgClassExpression300,PgClassExpression301,PgSelect302,First306,PgSelectSingle307,PgClassExpression308,PgClassExpression309,PgClassExpression310,PgClassExpression311,PgClassExpression312,PgClassExpression313,PgClassExpression314,PgClassExpression315,PgSelect316,First320,PgSelectSingle321,PgSelectSingle328,PgSelectSingle342,PgClassExpression350,PgClassExpression351,PgSelect352,First356,PgSelectSingle357,PgClassExpression365,PgSelect366,First370,PgSelectSingle371,PgClassExpression401,PgClassExpression404,PgClassExpression407,PgClassExpression408,PgClassExpression409,PgClassExpression410,PgClassExpression411,PgClassExpression412,PgClassExpression413,PgClassExpression414,PgClassExpression415,PgClassExpression416,PgClassExpression417,PgClassExpression418,PgClassExpression420,PgClassExpression422,PgClassExpression423,PgSelect426,First430,PgSelectSingle431,PgSelect435,First439,PgSelectSingle440,PgClassExpression443,PgClassExpression444,RemapKeys1378 bucket33 Bucket34("Bucket 34 (listItem)
ROOT __Item{34}ᐸ244ᐳ[245]"):::bucket @@ -1680,7 +1680,7 @@ graph TD Bucket62("Bucket 62 (listItem)
Deps: 451

ROOT __Item{62}ᐸ448ᐳ[453]"):::bucket classDef bucket62 stroke:#00ffff class Bucket62,__Item453,PgSelectSingle454 bucket62 - Bucket63("Bucket 63 (nullableBoundary)
Deps: 451, 454

ROOT PgSelectSingle{62}ᐸtype_function_connection_mutationᐳ[454]
1:
ᐳ: 455, 456, 457, 458, 459, 460, 461, 462, 463, 465, 466, 467, 469, 470, 471, 478, 485, 492, 499, 500, 501, 502, 503, 504, 511, 519, 520, 534, 570, 584, 620, 623, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 639, 641, 642, 662, 663, 479, 482, 486, 489, 493, 496
2: 521, 535, 571, 585, 645, 654
ᐳ: 525, 526, 527, 528, 529, 530, 531, 532, 533, 539, 540, 547, 569, 575, 576, 589, 590, 649, 650, 658, 659, 1386, 561"):::bucket + Bucket63("Bucket 63 (nullableBoundary)
Deps: 454, 451

ROOT PgSelectSingle{62}ᐸtype_function_connection_mutationᐳ[454]
1:
ᐳ: 455, 456, 457, 458, 459, 460, 461, 462, 463, 465, 466, 467, 469, 470, 471, 478, 485, 492, 499, 500, 501, 502, 503, 504, 511, 519, 520, 534, 570, 584, 620, 623, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 639, 641, 642, 662, 663, 479, 482, 486, 489, 493, 496
2: 521, 535, 571, 585, 645, 654
ᐳ: 525, 526, 527, 528, 529, 530, 531, 532, 533, 539, 540, 547, 569, 575, 576, 589, 590, 649, 650, 658, 659, 1386, 561"):::bucket classDef bucket63 stroke:#4169e1 class Bucket63,PgClassExpression455,PgClassExpression456,PgClassExpression457,PgClassExpression458,PgClassExpression459,PgClassExpression460,PgClassExpression461,PgClassExpression462,PgClassExpression463,PgClassExpression465,PgClassExpression466,PgClassExpression467,PgClassExpression469,PgClassExpression470,PgClassExpression471,PgClassExpression478,Access479,Access482,PgClassExpression485,Access486,Access489,PgClassExpression492,Access493,Access496,PgClassExpression499,PgClassExpression500,PgClassExpression501,PgClassExpression502,PgClassExpression503,PgClassExpression504,PgClassExpression511,PgClassExpression519,PgClassExpression520,PgSelect521,First525,PgSelectSingle526,PgClassExpression527,PgClassExpression528,PgClassExpression529,PgClassExpression530,PgClassExpression531,PgClassExpression532,PgClassExpression533,PgClassExpression534,PgSelect535,First539,PgSelectSingle540,PgSelectSingle547,PgSelectSingle561,PgClassExpression569,PgClassExpression570,PgSelect571,First575,PgSelectSingle576,PgClassExpression584,PgSelect585,First589,PgSelectSingle590,PgClassExpression620,PgClassExpression623,PgClassExpression626,PgClassExpression627,PgClassExpression628,PgClassExpression629,PgClassExpression630,PgClassExpression631,PgClassExpression632,PgClassExpression633,PgClassExpression634,PgClassExpression635,PgClassExpression636,PgClassExpression637,PgClassExpression639,PgClassExpression641,PgClassExpression642,PgSelect645,First649,PgSelectSingle650,PgSelect654,First658,PgSelectSingle659,PgClassExpression662,PgClassExpression663,RemapKeys1386 bucket63 Bucket64("Bucket 64 (listItem)
ROOT __Item{64}ᐸ463ᐳ[464]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/polymorphic/only.mermaid b/postgraphile/postgraphile/__tests__/queries/polymorphic/only.mermaid index 7753388e99..0f69ab0219 100644 --- a/postgraphile/postgraphile/__tests__/queries/polymorphic/only.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/polymorphic/only.mermaid @@ -150,19 +150,19 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 20

ROOT __Item{2}ᐸ22ᐳ[23]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item23,PgUnionAllSingle24,Access25 bucket2 - Bucket3("Bucket 3 (polymorphic)
AwsApplication,GcpApplication
Deps: 20, 25, 24
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[26], JSONParse[79]
ᐳ: 50, 103, 27, 80
2: PgSelect[28], PgSelect[81]
ᐳ: 32, 33, 34, 44, 85, 86, 87, 97
3: PgUnionAll[51], PgUnionAll[104]"):::bucket + Bucket3("Bucket 3 (polymorphic)
AwsApplication,GcpApplication
Deps: 25, 20, 24
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[26], JSONParse[79]
ᐳ: 50, 103, 27, 80
2: PgSelect[28], PgSelect[81]
ᐳ: 32, 33, 34, 44, 85, 86, 87, 97
3: PgUnionAll[51], PgUnionAll[104]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,JSONParse26,Access27,PgSelect28,First32,PgSelectSingle33,PgClassExpression34,PgClassExpression44,Connection50,PgUnionAll51,JSONParse79,Access80,PgSelect81,First85,PgSelectSingle86,PgClassExpression87,PgClassExpression97,Connection103,PgUnionAll104 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 20

ROOT __Item{4}ᐸ51ᐳ[52]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item52,PgUnionAllSingle53,Access54 bucket4 - Bucket5("Bucket 5 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 20, 54, 53
ᐳAwsApplicationᐳFirstPartyVulnerability
ᐳAwsApplicationᐳThirdPartyVulnerability
1: JSONParse[55], JSONParse[67]
ᐳ: Access[56], Access[68]
2: PgSelect[57], PgSelect[69]
ᐳ: 61, 62, 63, 64, 65, 73, 74, 75, 76, 77"):::bucket + Bucket5("Bucket 5 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 54, 20, 53
ᐳAwsApplicationᐳFirstPartyVulnerability
ᐳAwsApplicationᐳThirdPartyVulnerability
1: JSONParse[55], JSONParse[67]
ᐳ: Access[56], Access[68]
2: PgSelect[57], PgSelect[69]
ᐳ: 61, 62, 63, 64, 65, 73, 74, 75, 76, 77"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,JSONParse55,Access56,PgSelect57,First61,PgSelectSingle62,PgClassExpression63,PgClassExpression64,PgClassExpression65,JSONParse67,Access68,PgSelect69,First73,PgSelectSingle74,PgClassExpression75,PgClassExpression76,PgClassExpression77 bucket5 Bucket6("Bucket 6 (listItem)
Deps: 20

ROOT __Item{6}ᐸ104ᐳ[105]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,__Item105,PgUnionAllSingle106,Access107 bucket6 - Bucket7("Bucket 7 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 20, 107, 106
ᐳGcpApplicationᐳFirstPartyVulnerability
ᐳGcpApplicationᐳThirdPartyVulnerability
1: JSONParse[108], JSONParse[120]
ᐳ: Access[109], Access[121]
2: PgSelect[110], PgSelect[122]
ᐳ: 114, 115, 116, 117, 118, 126, 127, 128, 129, 130"):::bucket + Bucket7("Bucket 7 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 107, 20, 106
ᐳGcpApplicationᐳFirstPartyVulnerability
ᐳGcpApplicationᐳThirdPartyVulnerability
1: JSONParse[108], JSONParse[120]
ᐳ: Access[109], Access[121]
2: PgSelect[110], PgSelect[122]
ᐳ: 114, 115, 116, 117, 118, 126, 127, 128, 129, 130"):::bucket classDef bucket7 stroke:#808000 class Bucket7,JSONParse108,Access109,PgSelect110,First114,PgSelectSingle115,PgClassExpression116,PgClassExpression117,PgClassExpression118,JSONParse120,Access121,PgSelect122,First126,PgSelectSingle127,PgClassExpression128,PgClassExpression129,PgClassExpression130 bucket7 Bucket0 --> Bucket1 diff --git a/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-condition.mermaid b/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-condition.mermaid index 168944880a..0979312841 100644 --- a/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-condition.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-condition.mermaid @@ -101,16 +101,16 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18, 80, 42, 43, 50, 51

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 80, 42, 43, 50, 51, 22

ROOT PgSelectSingle{2}ᐸpeopleᐳ[22]
1:
ᐳ: 23, 24
2: PgUnionAll[44]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 18, 80, 42, 43, 50, 51

ROOT PgSelectSingle{2}ᐸpeopleᐳ[22]
1:
ᐳ: 23, 24
2: PgUnionAll[44]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression24,PgUnionAll44 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 18

ROOT __Item{4}ᐸ44ᐳ[45]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item45,PgUnionAllSingle46 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 18, 46

ROOT PgUnionAllSingle{4}[46]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 46, 18

ROOT PgUnionAllSingle{4}[46]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgCursor47,Access52,Access53,List54 bucket5 - Bucket6("Bucket 6 (polymorphic)
AwsApplication,GcpApplication
Deps: 18, 53, 46
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[56], JSONParse[67]
ᐳ: Access[57], Access[68]
2: PgSelect[58], PgSelect[69]
ᐳ: 62, 63, 64, 65, 73, 74, 75, 76"):::bucket + Bucket6("Bucket 6 (polymorphic)
AwsApplication,GcpApplication
Deps: 53, 18, 46
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[56], JSONParse[67]
ᐳ: Access[57], Access[68]
2: PgSelect[58], PgSelect[69]
ᐳ: 62, 63, 64, 65, 73, 74, 75, 76"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,JSONParse56,Access57,PgSelect58,First62,PgSelectSingle63,PgClassExpression64,PgClassExpression65,JSONParse67,Access68,PgSelect69,First73,PgSelectSingle74,PgClassExpression75,PgClassExpression76 bucket6 Bucket0 --> Bucket1 diff --git a/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-order.mermaid b/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-order.mermaid index 88adbb9f07..fd1feecf1d 100644 --- a/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-order.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-order.mermaid @@ -95,16 +95,16 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18, 41

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 41, 22

ROOT PgSelectSingle{2}ᐸpeopleᐳ[22]
1:
ᐳ: 23, 24
2: PgUnionAll[42]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 18, 41

ROOT PgSelectSingle{2}ᐸpeopleᐳ[22]
1:
ᐳ: 23, 24
2: PgUnionAll[42]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression24,PgUnionAll42 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 18

ROOT __Item{4}ᐸ42ᐳ[43]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item43,PgUnionAllSingle44 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 18, 44

ROOT PgUnionAllSingle{4}[44]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 44, 18

ROOT PgUnionAllSingle{4}[44]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgCursor45,Access46,Access47,Access48,Access49,List50 bucket5 - Bucket6("Bucket 6 (polymorphic)
AwsApplication,GcpApplication
Deps: 18, 49, 44
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[52], JSONParse[64]
ᐳ: Access[53], Access[65]
2: PgSelect[54], PgSelect[66]
ᐳ: 58, 59, 60, 61, 62, 70, 71, 72, 73, 74"):::bucket + Bucket6("Bucket 6 (polymorphic)
AwsApplication,GcpApplication
Deps: 49, 18, 44
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[52], JSONParse[64]
ᐳ: Access[53], Access[65]
2: PgSelect[54], PgSelect[66]
ᐳ: 58, 59, 60, 61, 62, 70, 71, 72, 73, 74"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,JSONParse52,Access53,PgSelect54,First58,PgSelectSingle59,PgClassExpression60,PgClassExpression61,PgClassExpression62,JSONParse64,Access65,PgSelect66,First70,PgSelectSingle71,PgClassExpression72,PgClassExpression73,PgClassExpression74 bucket6 Bucket0 --> Bucket1 diff --git a/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-page-2.mermaid b/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-page-2.mermaid index 3921d37d35..ea775cab6e 100644 --- a/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-page-2.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-page-2.mermaid @@ -176,34 +176,34 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18, 39, 40, 47, 48, 157

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 39, 40, 47, 48, 157, 22

ROOT PgSelectSingle{2}ᐸpeopleᐳ[22]
1:
ᐳ: 23, 24
2: PgUnionAll[41]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 18, 39, 40, 47, 48, 157

ROOT PgSelectSingle{2}ᐸpeopleᐳ[22]
1:
ᐳ: 23, 24
2: PgUnionAll[41]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression24,PgUnionAll41 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 18, 157

ROOT __Item{4}ᐸ41ᐳ[42]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item42,PgUnionAllSingle43 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 18, 157, 43

ROOT PgUnionAllSingle{4}[43]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 43, 18, 157

ROOT PgUnionAllSingle{4}[43]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgCursor44,Access49,Access50,List51 bucket5 - Bucket6("Bucket 6 (polymorphic)
AwsApplication,GcpApplication
Deps: 18, 157, 50, 43
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[53], JSONParse[105]
ᐳ: 76, 128, 54, 106
2: PgSelect[55], PgSelect[107]
ᐳ: 59, 60, 61, 111, 112, 113
3: PgUnionAll[77], PgUnionAll[129]"):::bucket + Bucket6("Bucket 6 (polymorphic)
AwsApplication,GcpApplication
Deps: 50, 18, 157, 43
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[53], JSONParse[105]
ᐳ: 76, 128, 54, 106
2: PgSelect[55], PgSelect[107]
ᐳ: 59, 60, 61, 111, 112, 113
3: PgUnionAll[77], PgUnionAll[129]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,JSONParse53,Access54,PgSelect55,First59,PgSelectSingle60,PgClassExpression61,Connection76,PgUnionAll77,JSONParse105,Access106,PgSelect107,First111,PgSelectSingle112,PgClassExpression113,Connection128,PgUnionAll129 bucket6 Bucket7("Bucket 7 (listItem)
Deps: 18

ROOT __Item{7}ᐸ77ᐳ[78]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,__Item78,PgUnionAllSingle79 bucket7 - Bucket8("Bucket 8 (nullableBoundary)
Deps: 18, 79

ROOT PgUnionAllSingle{7}[79]"):::bucket + Bucket8("Bucket 8 (nullableBoundary)
Deps: 79, 18

ROOT PgUnionAllSingle{7}[79]"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,PgCursor80,Access81,Access82,List83 bucket8 - Bucket9("Bucket 9 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 82, 79
ᐳAwsApplicationᐳFirstPartyVulnerability
ᐳAwsApplicationᐳThirdPartyVulnerability
1: JSONParse[85], JSONParse[95]
ᐳ: Access[86], Access[96]
2: PgSelect[87], PgSelect[97]
ᐳ: 91, 92, 93, 101, 102, 103"):::bucket + Bucket9("Bucket 9 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 82, 18, 79
ᐳAwsApplicationᐳFirstPartyVulnerability
ᐳAwsApplicationᐳThirdPartyVulnerability
1: JSONParse[85], JSONParse[95]
ᐳ: Access[86], Access[96]
2: PgSelect[87], PgSelect[97]
ᐳ: 91, 92, 93, 101, 102, 103"):::bucket classDef bucket9 stroke:#ff0000 class Bucket9,JSONParse85,Access86,PgSelect87,First91,PgSelectSingle92,PgClassExpression93,JSONParse95,Access96,PgSelect97,First101,PgSelectSingle102,PgClassExpression103 bucket9 Bucket10("Bucket 10 (listItem)
Deps: 18

ROOT __Item{10}ᐸ129ᐳ[130]"):::bucket classDef bucket10 stroke:#ffff00 class Bucket10,__Item130,PgUnionAllSingle131 bucket10 - Bucket11("Bucket 11 (nullableBoundary)
Deps: 18, 131

ROOT PgUnionAllSingle{10}[131]"):::bucket + Bucket11("Bucket 11 (nullableBoundary)
Deps: 131, 18

ROOT PgUnionAllSingle{10}[131]"):::bucket classDef bucket11 stroke:#00ffff class Bucket11,PgCursor132,Access133,Access134,List135 bucket11 - Bucket12("Bucket 12 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 134, 131
ᐳGcpApplicationᐳFirstPartyVulnerability
ᐳGcpApplicationᐳThirdPartyVulnerability
1: JSONParse[137], JSONParse[147]
ᐳ: Access[138], Access[148]
2: PgSelect[139], PgSelect[149]
ᐳ: 143, 144, 145, 153, 154, 155"):::bucket + Bucket12("Bucket 12 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 134, 18, 131
ᐳGcpApplicationᐳFirstPartyVulnerability
ᐳGcpApplicationᐳThirdPartyVulnerability
1: JSONParse[137], JSONParse[147]
ᐳ: Access[138], Access[148]
2: PgSelect[139], PgSelect[149]
ᐳ: 143, 144, 145, 153, 154, 155"):::bucket classDef bucket12 stroke:#4169e1 class Bucket12,JSONParse137,Access138,PgSelect139,First143,PgSelectSingle144,PgClassExpression145,JSONParse147,Access148,PgSelect149,First153,PgSelectSingle154,PgClassExpression155 bucket12 Bucket0 --> Bucket1 diff --git a/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-totalCount.mermaid b/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-totalCount.mermaid index 685bac05cb..f7b6ba5c38 100644 --- a/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-totalCount.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-totalCount.mermaid @@ -53,7 +53,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18, 39

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 39, 22

ROOT PgSelectSingle{2}ᐸpeopleᐳ[22]
1:
ᐳ: 23, 24
2: PgUnionAll[40]
ᐳ: First[41]
3: PgUnionAllSingle[42]
ᐳ: PgClassExpression[43]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 18, 39

ROOT PgSelectSingle{2}ᐸpeopleᐳ[22]
1:
ᐳ: 23, 24
2: PgUnionAll[40]
ᐳ: First[41]
3: PgUnionAllSingle[42]
ᐳ: PgClassExpression[43]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression24,PgUnionAll40,First41,PgUnionAllSingle42,PgClassExpression43 bucket3 Bucket0 --> Bucket1 diff --git a/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-vuln-totalCount.mermaid b/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-vuln-totalCount.mermaid index 6eb423e3dd..448b357725 100644 --- a/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-vuln-totalCount.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.app-vuln-totalCount.mermaid @@ -95,13 +95,13 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18, 39

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 39, 22

ROOT PgSelectSingle{2}ᐸpeopleᐳ[22]
1:
ᐳ: 23, 24
2: PgUnionAll[40]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 18, 39

ROOT PgSelectSingle{2}ᐸpeopleᐳ[22]
1:
ᐳ: 23, 24
2: PgUnionAll[40]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression24,PgUnionAll40 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 18

ROOT __Item{4}ᐸ40ᐳ[41]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item41,PgUnionAllSingle42,Access43 bucket4 - Bucket5("Bucket 5 (polymorphic)
AwsApplication,GcpApplication
Deps: 18, 43, 42
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[44], JSONParse[72]
ᐳ: 66, 94, 45, 73
2: PgSelect[46], PgSelect[74]
ᐳ: 50, 51, 60, 78, 79, 88
3: PgUnionAll[67], PgUnionAll[95]
ᐳ: First[68], First[96]
4: 69, 97
ᐳ: 70, 98"):::bucket + Bucket5("Bucket 5 (polymorphic)
AwsApplication,GcpApplication
Deps: 43, 18, 42
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[44], JSONParse[72]
ᐳ: 66, 94, 45, 73
2: PgSelect[46], PgSelect[74]
ᐳ: 50, 51, 60, 78, 79, 88
3: PgUnionAll[67], PgUnionAll[95]
ᐳ: First[68], First[96]
4: 69, 97
ᐳ: 70, 98"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,JSONParse44,Access45,PgSelect46,First50,PgSelectSingle51,PgClassExpression60,Connection66,PgUnionAll67,First68,PgUnionAllSingle69,PgClassExpression70,JSONParse72,Access73,PgSelect74,First78,PgSelectSingle79,PgClassExpression88,Connection94,PgUnionAll95,First96,PgUnionAllSingle97,PgClassExpression98 bucket5 Bucket0 --> Bucket1 diff --git a/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.mermaid b/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.mermaid index ea489a2105..110ae8ce8e 100644 --- a/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/polymorphic/person-app-vulns.mermaid @@ -409,58 +409,58 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18, 39

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 39, 22

ROOT PgSelectSingle{2}ᐸpeopleᐳ[22]
1:
ᐳ: 23, 24
2: 40, 44, 71
ᐳ: First[41]
3: PgUnionAllSingle[42]
ᐳ: PgClassExpression[43]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 18, 39

ROOT PgSelectSingle{2}ᐸpeopleᐳ[22]
1:
ᐳ: 23, 24
2: 40, 44, 71
ᐳ: First[41]
3: PgUnionAllSingle[42]
ᐳ: PgClassExpression[43]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression24,PgUnionAll40,First41,PgUnionAllSingle42,PgClassExpression43,PgUnionAll44,PgUnionAll71 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 18

ROOT __Item{4}ᐸ44ᐳ[45]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item45,PgUnionAllSingle46 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 18, 46

ROOT PgUnionAllSingle{4}[46]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 46, 18

ROOT PgUnionAllSingle{4}[46]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgCursor47,Access48,Access49,List50 bucket5 - Bucket6("Bucket 6 (polymorphic)
AwsApplication,GcpApplication
Deps: 18, 49, 46
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[52], JSONParse[62]
ᐳ: Access[53], Access[63]
2: PgSelect[54], PgSelect[64]
ᐳ: 58, 59, 60, 68, 69, 70"):::bucket + Bucket6("Bucket 6 (polymorphic)
AwsApplication,GcpApplication
Deps: 49, 18, 46
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[52], JSONParse[62]
ᐳ: Access[53], Access[63]
2: PgSelect[54], PgSelect[64]
ᐳ: 58, 59, 60, 68, 69, 70"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,JSONParse52,Access53,PgSelect54,First58,PgSelectSingle59,PgClassExpression60,JSONParse62,Access63,PgSelect64,First68,PgSelectSingle69,PgClassExpression70 bucket6 Bucket7("Bucket 7 (listItem)
Deps: 18

ROOT __Item{7}ᐸ71ᐳ[72]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,__Item72,PgUnionAllSingle73,Access74 bucket7 - Bucket8("Bucket 8 (polymorphic)
AwsApplication,GcpApplication
Deps: 18, 74, 73
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[75], JSONParse[206]
ᐳ: 169, 300, 76, 207
2: PgSelect[77], PgSelect[208]
ᐳ: 81, 82, 83, 84, 85, 86, 87, 212, 213, 214, 215, 216, 217, 218
3: 88, 123, 170, 174, 219, 254, 301, 305
ᐳ: 92, 171, 223, 302
4: 93, 172, 224, 303
ᐳ: 94, 173, 225, 304"):::bucket + Bucket8("Bucket 8 (polymorphic)
AwsApplication,GcpApplication
Deps: 74, 18, 73
ᐳAwsApplication
ᐳGcpApplication
1: JSONParse[75], JSONParse[206]
ᐳ: 169, 300, 76, 207
2: PgSelect[77], PgSelect[208]
ᐳ: 81, 82, 83, 84, 85, 86, 87, 212, 213, 214, 215, 216, 217, 218
3: 88, 123, 170, 174, 219, 254, 301, 305
ᐳ: 92, 171, 223, 302
4: 93, 172, 224, 303
ᐳ: 94, 173, 225, 304"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,JSONParse75,Access76,PgSelect77,First81,PgSelectSingle82,PgClassExpression83,PgClassExpression84,PgClassExpression85,PgClassExpression86,PgClassExpression87,PgUnionAll88,First92,PgUnionAllSingle93,Access94,PgUnionAll123,Connection169,PgUnionAll170,First171,PgUnionAllSingle172,PgClassExpression173,PgUnionAll174,JSONParse206,Access207,PgSelect208,First212,PgSelectSingle213,PgClassExpression214,PgClassExpression215,PgClassExpression216,PgClassExpression217,PgClassExpression218,PgUnionAll219,First223,PgUnionAllSingle224,Access225,PgUnionAll254,Connection300,PgUnionAll301,First302,PgUnionAllSingle303,PgClassExpression304,PgUnionAll305 bucket8 - Bucket9("Bucket 9 (polymorphic)
Organization,Person
Deps: 18, 94, 93
ᐳAwsApplicationᐳOrganization
ᐳAwsApplicationᐳPerson
1: JSONParse[95], JSONParse[106]
ᐳ: Access[96], Access[107]
2: PgSelect[97], PgSelect[108]
ᐳ: 101, 102, 103, 104, 112, 113, 114, 115"):::bucket + Bucket9("Bucket 9 (polymorphic)
Organization,Person
Deps: 94, 18, 93
ᐳAwsApplicationᐳOrganization
ᐳAwsApplicationᐳPerson
1: JSONParse[95], JSONParse[106]
ᐳ: Access[96], Access[107]
2: PgSelect[97], PgSelect[108]
ᐳ: 101, 102, 103, 104, 112, 113, 114, 115"):::bucket classDef bucket9 stroke:#ff0000 class Bucket9,JSONParse95,Access96,PgSelect97,First101,PgSelectSingle102,PgClassExpression103,PgClassExpression104,JSONParse106,Access107,PgSelect108,First112,PgSelectSingle113,PgClassExpression114,PgClassExpression115 bucket9 Bucket10("Bucket 10 (listItem)
Deps: 18

ROOT __Item{10}ᐸ123ᐳ[127]"):::bucket classDef bucket10 stroke:#ffff00 class Bucket10,__Item127,PgUnionAllSingle128,Access129 bucket10 - Bucket11("Bucket 11 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 129, 128
ᐳAwsApplicationᐳFirstPartyVulnerability
ᐳAwsApplicationᐳThirdPartyVulnerability
1: JSONParse[130], JSONParse[143]
ᐳ: Access[131], Access[144]
2: PgSelect[132], PgSelect[145]
ᐳ: 136, 137, 138, 139, 140, 141, 149, 150, 151, 152, 153, 154"):::bucket + Bucket11("Bucket 11 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 129, 18, 128
ᐳAwsApplicationᐳFirstPartyVulnerability
ᐳAwsApplicationᐳThirdPartyVulnerability
1: JSONParse[130], JSONParse[143]
ᐳ: Access[131], Access[144]
2: PgSelect[132], PgSelect[145]
ᐳ: 136, 137, 138, 139, 140, 141, 149, 150, 151, 152, 153, 154"):::bucket classDef bucket11 stroke:#00ffff class Bucket11,JSONParse130,Access131,PgSelect132,First136,PgSelectSingle137,PgClassExpression138,PgClassExpression139,PgClassExpression140,PgClassExpression141,JSONParse143,Access144,PgSelect145,First149,PgSelectSingle150,PgClassExpression151,PgClassExpression152,PgClassExpression153,PgClassExpression154 bucket11 Bucket12("Bucket 12 (listItem)
Deps: 18

ROOT __Item{12}ᐸ174ᐳ[175]"):::bucket classDef bucket12 stroke:#4169e1 class Bucket12,__Item175,PgUnionAllSingle176 bucket12 - Bucket13("Bucket 13 (nullableBoundary)
Deps: 18, 176

ROOT PgUnionAllSingle{12}[176]"):::bucket + Bucket13("Bucket 13 (nullableBoundary)
Deps: 176, 18

ROOT PgUnionAllSingle{12}[176]"):::bucket classDef bucket13 stroke:#3cb371 class Bucket13,PgCursor177,Access178,Access179,List180 bucket13 - Bucket14("Bucket 14 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 179, 176
ᐳAwsApplicationᐳFirstPartyVulnerability
ᐳAwsApplicationᐳThirdPartyVulnerability
1: JSONParse[182], JSONParse[194]
ᐳ: Access[183], Access[195]
2: PgSelect[184], PgSelect[196]
ᐳ: 188, 189, 190, 191, 192, 200, 201, 202, 203, 204"):::bucket + Bucket14("Bucket 14 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 179, 18, 176
ᐳAwsApplicationᐳFirstPartyVulnerability
ᐳAwsApplicationᐳThirdPartyVulnerability
1: JSONParse[182], JSONParse[194]
ᐳ: Access[183], Access[195]
2: PgSelect[184], PgSelect[196]
ᐳ: 188, 189, 190, 191, 192, 200, 201, 202, 203, 204"):::bucket classDef bucket14 stroke:#a52a2a class Bucket14,JSONParse182,Access183,PgSelect184,First188,PgSelectSingle189,PgClassExpression190,PgClassExpression191,PgClassExpression192,JSONParse194,Access195,PgSelect196,First200,PgSelectSingle201,PgClassExpression202,PgClassExpression203,PgClassExpression204 bucket14 - Bucket15("Bucket 15 (polymorphic)
Organization,Person
Deps: 18, 225, 224
ᐳGcpApplicationᐳOrganization
ᐳGcpApplicationᐳPerson
1: JSONParse[226], JSONParse[237]
ᐳ: Access[227], Access[238]
2: PgSelect[228], PgSelect[239]
ᐳ: 232, 233, 234, 235, 243, 244, 245, 246"):::bucket + Bucket15("Bucket 15 (polymorphic)
Organization,Person
Deps: 225, 18, 224
ᐳGcpApplicationᐳOrganization
ᐳGcpApplicationᐳPerson
1: JSONParse[226], JSONParse[237]
ᐳ: Access[227], Access[238]
2: PgSelect[228], PgSelect[239]
ᐳ: 232, 233, 234, 235, 243, 244, 245, 246"):::bucket classDef bucket15 stroke:#ff00ff class Bucket15,JSONParse226,Access227,PgSelect228,First232,PgSelectSingle233,PgClassExpression234,PgClassExpression235,JSONParse237,Access238,PgSelect239,First243,PgSelectSingle244,PgClassExpression245,PgClassExpression246 bucket15 Bucket16("Bucket 16 (listItem)
Deps: 18

ROOT __Item{16}ᐸ254ᐳ[258]"):::bucket classDef bucket16 stroke:#f5deb3 class Bucket16,__Item258,PgUnionAllSingle259,Access260 bucket16 - Bucket17("Bucket 17 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 260, 259
ᐳGcpApplicationᐳFirstPartyVulnerability
ᐳGcpApplicationᐳThirdPartyVulnerability
1: JSONParse[261], JSONParse[274]
ᐳ: Access[262], Access[275]
2: PgSelect[263], PgSelect[276]
ᐳ: 267, 268, 269, 270, 271, 272, 280, 281, 282, 283, 284, 285"):::bucket + Bucket17("Bucket 17 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 260, 18, 259
ᐳGcpApplicationᐳFirstPartyVulnerability
ᐳGcpApplicationᐳThirdPartyVulnerability
1: JSONParse[261], JSONParse[274]
ᐳ: Access[262], Access[275]
2: PgSelect[263], PgSelect[276]
ᐳ: 267, 268, 269, 270, 271, 272, 280, 281, 282, 283, 284, 285"):::bucket classDef bucket17 stroke:#696969 class Bucket17,JSONParse261,Access262,PgSelect263,First267,PgSelectSingle268,PgClassExpression269,PgClassExpression270,PgClassExpression271,PgClassExpression272,JSONParse274,Access275,PgSelect276,First280,PgSelectSingle281,PgClassExpression282,PgClassExpression283,PgClassExpression284,PgClassExpression285 bucket17 Bucket18("Bucket 18 (listItem)
Deps: 18

ROOT __Item{18}ᐸ305ᐳ[306]"):::bucket classDef bucket18 stroke:#00bfff class Bucket18,__Item306,PgUnionAllSingle307 bucket18 - Bucket19("Bucket 19 (nullableBoundary)
Deps: 18, 307

ROOT PgUnionAllSingle{18}[307]"):::bucket + Bucket19("Bucket 19 (nullableBoundary)
Deps: 307, 18

ROOT PgUnionAllSingle{18}[307]"):::bucket classDef bucket19 stroke:#7f007f class Bucket19,PgCursor308,Access309,Access310,List311 bucket19 - Bucket20("Bucket 20 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 310, 307
ᐳGcpApplicationᐳFirstPartyVulnerability
ᐳGcpApplicationᐳThirdPartyVulnerability
1: JSONParse[313], JSONParse[325]
ᐳ: Access[314], Access[326]
2: PgSelect[315], PgSelect[327]
ᐳ: 319, 320, 321, 322, 323, 331, 332, 333, 334, 335"):::bucket + Bucket20("Bucket 20 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 310, 18, 307
ᐳGcpApplicationᐳFirstPartyVulnerability
ᐳGcpApplicationᐳThirdPartyVulnerability
1: JSONParse[313], JSONParse[325]
ᐳ: Access[314], Access[326]
2: PgSelect[315], PgSelect[327]
ᐳ: 319, 320, 321, 322, 323, 331, 332, 333, 334, 335"):::bucket classDef bucket20 stroke:#ffa500 class Bucket20,JSONParse313,Access314,PgSelect315,First319,PgSelectSingle320,PgClassExpression321,PgClassExpression322,PgClassExpression323,JSONParse325,Access326,PgSelect327,First331,PgSelectSingle332,PgClassExpression333,PgClassExpression334,PgClassExpression335 bucket20 Bucket0 --> Bucket1 diff --git a/postgraphile/postgraphile/__tests__/queries/polymorphic/relay.polyroot_with_related_poly.mermaid b/postgraphile/postgraphile/__tests__/queries/polymorphic/relay.polyroot_with_related_poly.mermaid index 370ed502e6..70084a9382 100644 --- a/postgraphile/postgraphile/__tests__/queries/polymorphic/relay.polyroot_with_related_poly.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/polymorphic/relay.polyroot_with_related_poly.mermaid @@ -861,7 +861,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22,PgClassExpression24,PgClassExpression27,PgClassExpression28 bucket2 - Bucket3("Bucket 3 (polymorphic)
SingleTableTopic,SingleTablePost,SingleTableDivider,SingleTableChecklist,SingleTableChecklistItem
Deps: 18, 24, 28, 22, 27
ᐳSingleTableTopic
ᐳSingleTablePost
ᐳSingleTableDivider
ᐳSingleTableChecklist
ᐳSingleTableChecklistItem"):::bucket + Bucket3("Bucket 3 (polymorphic)
SingleTableTopic,SingleTablePost,SingleTableDivider,SingleTableChecklist,SingleTableChecklistItem
Deps: 24, 18, 28, 22, 27
ᐳSingleTableTopic
ᐳSingleTablePost
ᐳSingleTableDivider
ᐳSingleTableChecklist
ᐳSingleTableChecklistItem"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,Constant23,List25,Lambda26,PgSelect29,First33,PgSelectSingle34,PgClassExpression36,PgClassExpression39,Constant60,List62,Lambda63,Constant97,List99,Lambda100,Constant134,List136,Lambda137,Constant171,List173,Lambda174 bucket3 Bucket4("Bucket 4 (polymorphic)
SingleTableTopic,SingleTablePost,SingleTableDivider,SingleTableChecklist,SingleTableChecklistItem
Deps: 36, 34, 39
ᐳSingleTableTopicᐳSingleTableTopic
ᐳSingleTableTopicᐳSingleTablePost
ᐳSingleTableTopicᐳSingleTableDivider
ᐳSingleTableTopicᐳSingleTableChecklist
ᐳSingleTableTopicᐳSingleTableChecklistItem
ᐳSingleTablePostᐳSingleTableTopic
ᐳSingleTablePostᐳSingleTablePost
ᐳSingleTablePostᐳSingleTableDivider
ᐳSingleTablePostᐳSingleTableChecklist
ᐳSingleTablePostᐳSingleTableChecklistItem
ᐳSingleTableDividerᐳSingleTableTopic
ᐳSingleTableDividerᐳSingleTablePost
ᐳSingleTableDividerᐳSingleTableDivider
ᐳSingleTableDividerᐳSingleTableChecklist
ᐳSingleTableDividerᐳSingleTableChecklistItem
ᐳSingleTableChecklistᐳSingleTableTopic
ᐳSingleTableChecklistᐳSingleTablePost
ᐳSingleTableChecklistᐳSingleTableDivider
ᐳSingleTableChecklistᐳSingleTableChecklist
ᐳSingleTableChecklistᐳSingleTableChecklistItem
ᐳSingleTableChecklistItemᐳSingleTableTopic
ᐳSingleTableChecklistItemᐳSingleTablePost
ᐳSingleTableChecklistItemᐳSingleTableDivider
ᐳSingleTableChecklistItemᐳSingleTableChecklist
ᐳSingleTableChecklistItemᐳSingleTableChecklistItem"):::bucket @@ -897,7 +897,7 @@ graph TD Bucket14("Bucket 14 (listItem)
Deps: 666

ROOT __Item{14}ᐸ663ᐳ[664]"):::bucket classDef bucket14 stroke:#a52a2a class Bucket14,__Item664,PgSelectSingle665 bucket14 - Bucket15("Bucket 15 (nullableBoundary)
Deps: 666, 665

ROOT PgSelectSingle{14}ᐸsingle_table_item_relationsᐳ[665]"):::bucket + Bucket15("Bucket 15 (nullableBoundary)
Deps: 665, 666

ROOT PgSelectSingle{14}ᐸsingle_table_item_relationsᐳ[665]"):::bucket classDef bucket15 stroke:#ff00ff class Bucket15,PgClassExpression667,List668,Lambda669,PgSelectSingle676,PgClassExpression678,PgClassExpression681,PgSelectSingle708,PgClassExpression710,PgClassExpression713,RemapKeys919,RemapKeys921 bucket15 Bucket16("Bucket 16 (polymorphic)
SingleTableTopic,SingleTablePost,SingleTableDivider,SingleTableChecklist,SingleTableChecklistItem
Deps: 678, 676, 681
ᐳSingleTableTopic
ᐳSingleTablePost
ᐳSingleTableDivider
ᐳSingleTableChecklist
ᐳSingleTableChecklistItem"):::bucket @@ -912,7 +912,7 @@ graph TD Bucket19("Bucket 19 (listItem)
Deps: 781, 18

ROOT __Item{19}ᐸ778ᐳ[779]"):::bucket classDef bucket19 stroke:#7f007f class Bucket19,__Item779,PgSelectSingle780 bucket19 - Bucket20("Bucket 20 (nullableBoundary)
Deps: 781, 18, 780

ROOT PgSelectSingle{19}ᐸrelational_item_relationsᐳ[780]"):::bucket + Bucket20("Bucket 20 (nullableBoundary)
Deps: 780, 781, 18

ROOT PgSelectSingle{19}ᐸrelational_item_relationsᐳ[780]"):::bucket classDef bucket20 stroke:#ffa500 class Bucket20,PgClassExpression782,List783,Lambda784,PgSelectSingle791,PgClassExpression792,PgClassExpression803,PgSelectSingle858,PgClassExpression859,PgClassExpression870,RemapKeys923,RemapKeys925 bucket20 Bucket21("Bucket 21 (polymorphic)
RelationalTopic,RelationalPost,RelationalDivider,RelationalChecklist,RelationalChecklistItem
Deps: 18, 792, 791, 803
ᐳRelationalTopic
ᐳRelationalPost
ᐳRelationalDivider
ᐳRelationalChecklist
ᐳRelationalChecklistItem"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/polymorphic/simple-log-entries.mermaid b/postgraphile/postgraphile/__tests__/queries/polymorphic/simple-log-entries.mermaid index 2f2290e2d9..aaa58b905e 100644 --- a/postgraphile/postgraphile/__tests__/queries/polymorphic/simple-log-entries.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/polymorphic/simple-log-entries.mermaid @@ -76,10 +76,10 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 22

ROOT PgSelectSingle{2}ᐸlog_entriesᐳ[22]
1:
ᐳ: 23, 24, 25
2: PgUnionAll[26]
ᐳ: First[30]
3: PgUnionAllSingle[31]
ᐳ: Access[32]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 18

ROOT PgSelectSingle{2}ᐸlog_entriesᐳ[22]
1:
ᐳ: 23, 24, 25
2: PgUnionAll[26]
ᐳ: First[30]
3: PgUnionAllSingle[31]
ᐳ: Access[32]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression24,PgClassExpression25,PgUnionAll26,First30,PgUnionAllSingle31,Access32 bucket3 - Bucket4("Bucket 4 (polymorphic)
Organization,Person
Deps: 18, 32, 31
ᐳOrganization
ᐳPerson
1: JSONParse[33], JSONParse[43]
ᐳ: Access[34], Access[44]
2: PgSelect[35], PgSelect[45]
ᐳ: 39, 40, 41, 49, 50, 51"):::bucket + Bucket4("Bucket 4 (polymorphic)
Organization,Person
Deps: 32, 18, 31
ᐳOrganization
ᐳPerson
1: JSONParse[33], JSONParse[43]
ᐳ: Access[34], Access[44]
2: PgSelect[35], PgSelect[45]
ᐳ: 39, 40, 41, 49, 50, 51"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,JSONParse33,Access34,PgSelect35,First39,PgSelectSingle40,PgClassExpression41,JSONParse43,Access44,PgSelect45,First49,PgSelectSingle50,PgClassExpression51 bucket4 Bucket0 --> Bucket1 diff --git a/postgraphile/postgraphile/__tests__/queries/polymorphic/simple-single-table-items-root-topic.mermaid b/postgraphile/postgraphile/__tests__/queries/polymorphic/simple-single-table-items-root-topic.mermaid index b79e9d57d3..30eb621c78 100644 --- a/postgraphile/postgraphile/__tests__/queries/polymorphic/simple-single-table-items-root-topic.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/polymorphic/simple-single-table-items-root-topic.mermaid @@ -244,7 +244,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22,PgClassExpression23,PgClassExpression28,PgClassExpression29 bucket2 - Bucket3("Bucket 3 (polymorphic)
SingleTableTopic,SingleTablePost,SingleTableDivider,SingleTableChecklist,SingleTableChecklistItem
Deps: 18, 23, 29, 22, 28
ᐳSingleTableTopic
ᐳSingleTablePost
ᐳSingleTableDivider
ᐳSingleTableChecklist
ᐳSingleTableChecklistItem"):::bucket + Bucket3("Bucket 3 (polymorphic)
SingleTableTopic,SingleTablePost,SingleTableDivider,SingleTableChecklist,SingleTableChecklistItem
Deps: 23, 18, 29, 22, 28
ᐳSingleTableTopic
ᐳSingleTablePost
ᐳSingleTableDivider
ᐳSingleTableChecklist
ᐳSingleTableChecklistItem"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,Constant24,List26,Lambda27,PgSelect31,First35,PgSelectSingle36,Constant40,List42,Lambda43,Constant56,List58,Lambda59,Constant72,List74,Lambda75,Constant88,List90,Lambda91 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 36

ROOT PgSelectSingle{3}ᐸsingle_table_itemsᐳ[36]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/polymorphic/vulns.mermaid b/postgraphile/postgraphile/__tests__/queries/polymorphic/vulns.mermaid index 7bd8d9ac80..0c9678a188 100644 --- a/postgraphile/postgraphile/__tests__/queries/polymorphic/vulns.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/polymorphic/vulns.mermaid @@ -188,16 +188,16 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 19

ROOT __Item{2}ᐸ22ᐳ[23]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item23,PgUnionAllSingle24 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 19, 24

ROOT PgUnionAllSingle{2}[24]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 24, 19

ROOT PgUnionAllSingle{2}[24]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor25,Access32,Access33,Access34,List35 bucket3 - Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 19, 34, 24
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[37], JSONParse[49]
ᐳ: Access[38], Access[50]
2: PgSelect[39], PgSelect[51]
ᐳ: 43, 44, 45, 46, 47, 55, 56, 57, 58, 59, 60"):::bucket + Bucket4("Bucket 4 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 34, 19, 24
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[37], JSONParse[49]
ᐳ: Access[38], Access[50]
2: PgSelect[39], PgSelect[51]
ᐳ: 43, 44, 45, 46, 47, 55, 56, 57, 58, 59, 60"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,JSONParse37,Access38,PgSelect39,First43,PgSelectSingle44,PgClassExpression45,PgClassExpression46,PgClassExpression47,JSONParse49,Access50,PgSelect51,First55,PgSelectSingle56,PgClassExpression57,PgClassExpression58,PgClassExpression59,PgClassExpression60 bucket4 Bucket5("Bucket 5 (listItem)
Deps: 19

ROOT __Item{5}ᐸ103ᐳ[107]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,__Item107,PgUnionAllSingle108,Access109 bucket5 - Bucket6("Bucket 6 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 19, 109, 108
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[110], JSONParse[122]
ᐳ: Access[111], Access[123]
2: PgSelect[112], PgSelect[124]
ᐳ: 116, 117, 118, 119, 120, 128, 129, 130, 131, 132, 133"):::bucket + Bucket6("Bucket 6 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 109, 19, 108
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[110], JSONParse[122]
ᐳ: Access[111], Access[123]
2: PgSelect[112], PgSelect[124]
ᐳ: 116, 117, 118, 119, 120, 128, 129, 130, 131, 132, 133"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,JSONParse110,Access111,PgSelect112,First116,PgSelectSingle117,PgClassExpression118,PgClassExpression119,PgClassExpression120,JSONParse122,Access123,PgSelect124,First128,PgSelectSingle129,PgClassExpression130,PgClassExpression131,PgClassExpression132,PgClassExpression133 bucket6 Bucket0 --> Bucket1 & Bucket5 diff --git a/postgraphile/postgraphile/__tests__/queries/polymorphic/vulns.union_owners.mermaid b/postgraphile/postgraphile/__tests__/queries/polymorphic/vulns.union_owners.mermaid index 6abf55c3f6..1aac4ce9c3 100644 --- a/postgraphile/postgraphile/__tests__/queries/polymorphic/vulns.union_owners.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/polymorphic/vulns.union_owners.mermaid @@ -852,79 +852,79 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgUnionAllSingle22,Access23 bucket2 - Bucket3("Bucket 3 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 23, 22
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[24], JSONParse[347]
ᐳ: 32, 51, 276, 355, 374, 599, 25, 348
2: PgSelect[26], PgSelect[349]
ᐳ: 30, 31, 33, 34, 35, 36, 353, 354, 356, 357, 358, 359
3: 52, 162, 277, 312, 375, 485, 600, 635"):::bucket + Bucket3("Bucket 3 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 23, 18, 22
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[24], JSONParse[347]
ᐳ: 32, 51, 276, 355, 374, 599, 25, 348
2: PgSelect[26], PgSelect[349]
ᐳ: 30, 31, 33, 34, 35, 36, 353, 354, 356, 357, 358, 359
3: 52, 162, 277, 312, 375, 485, 600, 635"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,JSONParse24,Access25,PgSelect26,First30,PgSelectSingle31,Constant32,PgClassExpression33,List34,Lambda35,PgClassExpression36,Connection51,PgUnionAll52,PgUnionAll162,Connection276,PgUnionAll277,PgUnionAll312,JSONParse347,Access348,PgSelect349,First353,PgSelectSingle354,Constant355,PgClassExpression356,List357,Lambda358,PgClassExpression359,Connection374,PgUnionAll375,PgUnionAll485,Connection599,PgUnionAll600,PgUnionAll635 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 18

ROOT __Item{4}ᐸ52ᐳ[53]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item53,PgUnionAllSingle54,Access55 bucket4 - Bucket5("Bucket 5 (polymorphic)
AwsApplication,GcpApplication
Deps: 18, 55, 54
ᐳFirstPartyVulnerabilityᐳAwsApplication
ᐳFirstPartyVulnerabilityᐳGcpApplication
1: JSONParse[56], JSONParse[106]
ᐳ: 64, 114, 57, 107
2: PgSelect[58], PgSelect[108]
ᐳ: 62, 63, 65, 66, 67, 68, 69, 70, 112, 113, 115, 116, 117, 118, 119, 120
3: PgUnionAll[71], PgUnionAll[121]
ᐳ: First[75], First[125]
4: 76, 126
ᐳ: Access[77], Access[127]"):::bucket + Bucket5("Bucket 5 (polymorphic)
AwsApplication,GcpApplication
Deps: 55, 18, 54
ᐳFirstPartyVulnerabilityᐳAwsApplication
ᐳFirstPartyVulnerabilityᐳGcpApplication
1: JSONParse[56], JSONParse[106]
ᐳ: 64, 114, 57, 107
2: PgSelect[58], PgSelect[108]
ᐳ: 62, 63, 65, 66, 67, 68, 69, 70, 112, 113, 115, 116, 117, 118, 119, 120
3: PgUnionAll[71], PgUnionAll[121]
ᐳ: First[75], First[125]
4: 76, 126
ᐳ: Access[77], Access[127]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,JSONParse56,Access57,PgSelect58,First62,PgSelectSingle63,Constant64,PgClassExpression65,List66,Lambda67,PgClassExpression68,PgClassExpression69,PgClassExpression70,PgUnionAll71,First75,PgUnionAllSingle76,Access77,JSONParse106,Access107,PgSelect108,First112,PgSelectSingle113,Constant114,PgClassExpression115,List116,Lambda117,PgClassExpression118,PgClassExpression119,PgClassExpression120,PgUnionAll121,First125,PgUnionAllSingle126,Access127 bucket5 - Bucket6("Bucket 6 (polymorphic)
Organization,Person
Deps: 18, 77, 76
ᐳFirstPartyVulnerabilityᐳAwsApplicationᐳOrganization
ᐳFirstPartyVulnerabilityᐳAwsApplicationᐳPerson
1: JSONParse[78], JSONParse[92]
ᐳ: 86, 100, 79, 93
2: PgSelect[80], PgSelect[94]
ᐳ: 84, 85, 87, 88, 89, 90, 98, 99, 101, 102, 103, 104"):::bucket + Bucket6("Bucket 6 (polymorphic)
Organization,Person
Deps: 77, 18, 76
ᐳFirstPartyVulnerabilityᐳAwsApplicationᐳOrganization
ᐳFirstPartyVulnerabilityᐳAwsApplicationᐳPerson
1: JSONParse[78], JSONParse[92]
ᐳ: 86, 100, 79, 93
2: PgSelect[80], PgSelect[94]
ᐳ: 84, 85, 87, 88, 89, 90, 98, 99, 101, 102, 103, 104"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,JSONParse78,Access79,PgSelect80,First84,PgSelectSingle85,Constant86,PgClassExpression87,List88,Lambda89,PgClassExpression90,JSONParse92,Access93,PgSelect94,First98,PgSelectSingle99,Constant100,PgClassExpression101,List102,Lambda103,PgClassExpression104 bucket6 - Bucket7("Bucket 7 (polymorphic)
Organization,Person
Deps: 18, 127, 126
ᐳFirstPartyVulnerabilityᐳGcpApplicationᐳOrganization
ᐳFirstPartyVulnerabilityᐳGcpApplicationᐳPerson
1: JSONParse[128], JSONParse[142]
ᐳ: 136, 150, 129, 143
2: PgSelect[130], PgSelect[144]
ᐳ: 134, 135, 137, 138, 139, 140, 148, 149, 151, 152, 153, 154"):::bucket + Bucket7("Bucket 7 (polymorphic)
Organization,Person
Deps: 127, 18, 126
ᐳFirstPartyVulnerabilityᐳGcpApplicationᐳOrganization
ᐳFirstPartyVulnerabilityᐳGcpApplicationᐳPerson
1: JSONParse[128], JSONParse[142]
ᐳ: 136, 150, 129, 143
2: PgSelect[130], PgSelect[144]
ᐳ: 134, 135, 137, 138, 139, 140, 148, 149, 151, 152, 153, 154"):::bucket classDef bucket7 stroke:#808000 class Bucket7,JSONParse128,Access129,PgSelect130,First134,PgSelectSingle135,Constant136,PgClassExpression137,List138,Lambda139,PgClassExpression140,JSONParse142,Access143,PgSelect144,First148,PgSelectSingle149,Constant150,PgClassExpression151,List152,Lambda153,PgClassExpression154 bucket7 Bucket8("Bucket 8 (listItem)
Deps: 18

ROOT __Item{8}ᐸ162ᐳ[166]"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,__Item166,PgUnionAllSingle167,Access168 bucket8 - Bucket9("Bucket 9 (polymorphic)
AwsApplication,GcpApplication
Deps: 18, 168, 167
ᐳFirstPartyVulnerabilityᐳAwsApplication
ᐳFirstPartyVulnerabilityᐳGcpApplication
1: JSONParse[169], JSONParse[219]
ᐳ: 177, 227, 170, 220
2: PgSelect[171], PgSelect[221]
ᐳ: 175, 176, 178, 179, 180, 181, 182, 183, 225, 226, 228, 229, 230, 231, 232, 233
3: PgUnionAll[184], PgUnionAll[234]
ᐳ: First[188], First[238]
4: 189, 239
ᐳ: Access[190], Access[240]"):::bucket + Bucket9("Bucket 9 (polymorphic)
AwsApplication,GcpApplication
Deps: 168, 18, 167
ᐳFirstPartyVulnerabilityᐳAwsApplication
ᐳFirstPartyVulnerabilityᐳGcpApplication
1: JSONParse[169], JSONParse[219]
ᐳ: 177, 227, 170, 220
2: PgSelect[171], PgSelect[221]
ᐳ: 175, 176, 178, 179, 180, 181, 182, 183, 225, 226, 228, 229, 230, 231, 232, 233
3: PgUnionAll[184], PgUnionAll[234]
ᐳ: First[188], First[238]
4: 189, 239
ᐳ: Access[190], Access[240]"):::bucket classDef bucket9 stroke:#ff0000 class Bucket9,JSONParse169,Access170,PgSelect171,First175,PgSelectSingle176,Constant177,PgClassExpression178,List179,Lambda180,PgClassExpression181,PgClassExpression182,PgClassExpression183,PgUnionAll184,First188,PgUnionAllSingle189,Access190,JSONParse219,Access220,PgSelect221,First225,PgSelectSingle226,Constant227,PgClassExpression228,List229,Lambda230,PgClassExpression231,PgClassExpression232,PgClassExpression233,PgUnionAll234,First238,PgUnionAllSingle239,Access240 bucket9 - Bucket10("Bucket 10 (polymorphic)
Organization,Person
Deps: 18, 190, 189
ᐳFirstPartyVulnerabilityᐳAwsApplicationᐳOrganization
ᐳFirstPartyVulnerabilityᐳAwsApplicationᐳPerson
1: JSONParse[191], JSONParse[205]
ᐳ: 199, 213, 192, 206
2: PgSelect[193], PgSelect[207]
ᐳ: 197, 198, 200, 201, 202, 203, 211, 212, 214, 215, 216, 217"):::bucket + Bucket10("Bucket 10 (polymorphic)
Organization,Person
Deps: 190, 18, 189
ᐳFirstPartyVulnerabilityᐳAwsApplicationᐳOrganization
ᐳFirstPartyVulnerabilityᐳAwsApplicationᐳPerson
1: JSONParse[191], JSONParse[205]
ᐳ: 199, 213, 192, 206
2: PgSelect[193], PgSelect[207]
ᐳ: 197, 198, 200, 201, 202, 203, 211, 212, 214, 215, 216, 217"):::bucket classDef bucket10 stroke:#ffff00 class Bucket10,JSONParse191,Access192,PgSelect193,First197,PgSelectSingle198,Constant199,PgClassExpression200,List201,Lambda202,PgClassExpression203,JSONParse205,Access206,PgSelect207,First211,PgSelectSingle212,Constant213,PgClassExpression214,List215,Lambda216,PgClassExpression217 bucket10 - Bucket11("Bucket 11 (polymorphic)
Organization,Person
Deps: 18, 240, 239
ᐳFirstPartyVulnerabilityᐳGcpApplicationᐳOrganization
ᐳFirstPartyVulnerabilityᐳGcpApplicationᐳPerson
1: JSONParse[241], JSONParse[255]
ᐳ: 249, 263, 242, 256
2: PgSelect[243], PgSelect[257]
ᐳ: 247, 248, 250, 251, 252, 253, 261, 262, 264, 265, 266, 267"):::bucket + Bucket11("Bucket 11 (polymorphic)
Organization,Person
Deps: 240, 18, 239
ᐳFirstPartyVulnerabilityᐳGcpApplicationᐳOrganization
ᐳFirstPartyVulnerabilityᐳGcpApplicationᐳPerson
1: JSONParse[241], JSONParse[255]
ᐳ: 249, 263, 242, 256
2: PgSelect[243], PgSelect[257]
ᐳ: 247, 248, 250, 251, 252, 253, 261, 262, 264, 265, 266, 267"):::bucket classDef bucket11 stroke:#00ffff class Bucket11,JSONParse241,Access242,PgSelect243,First247,PgSelectSingle248,Constant249,PgClassExpression250,List251,Lambda252,PgClassExpression253,JSONParse255,Access256,PgSelect257,First261,PgSelectSingle262,Constant263,PgClassExpression264,List265,Lambda266,PgClassExpression267 bucket11 Bucket12("Bucket 12 (listItem)
Deps: 18

ROOT __Item{12}ᐸ277ᐳ[278]"):::bucket classDef bucket12 stroke:#4169e1 class Bucket12,__Item278,PgUnionAllSingle279,Access280 bucket12 - Bucket13("Bucket 13 (polymorphic)
Organization,Person
Deps: 18, 280, 279
ᐳFirstPartyVulnerabilityᐳOrganization
ᐳFirstPartyVulnerabilityᐳPerson
1: JSONParse[281], JSONParse[295]
ᐳ: 289, 303, 282, 296
2: PgSelect[283], PgSelect[297]
ᐳ: 287, 288, 290, 291, 292, 293, 301, 302, 304, 305, 306, 307"):::bucket + Bucket13("Bucket 13 (polymorphic)
Organization,Person
Deps: 280, 18, 279
ᐳFirstPartyVulnerabilityᐳOrganization
ᐳFirstPartyVulnerabilityᐳPerson
1: JSONParse[281], JSONParse[295]
ᐳ: 289, 303, 282, 296
2: PgSelect[283], PgSelect[297]
ᐳ: 287, 288, 290, 291, 292, 293, 301, 302, 304, 305, 306, 307"):::bucket classDef bucket13 stroke:#3cb371 class Bucket13,JSONParse281,Access282,PgSelect283,First287,PgSelectSingle288,Constant289,PgClassExpression290,List291,Lambda292,PgClassExpression293,JSONParse295,Access296,PgSelect297,First301,PgSelectSingle302,Constant303,PgClassExpression304,List305,Lambda306,PgClassExpression307 bucket13 Bucket14("Bucket 14 (listItem)
Deps: 18

ROOT __Item{14}ᐸ312ᐳ[316]"):::bucket classDef bucket14 stroke:#a52a2a class Bucket14,__Item316,PgUnionAllSingle317,Access318 bucket14 - Bucket15("Bucket 15 (polymorphic)
Organization,Person
Deps: 18, 318, 317
ᐳFirstPartyVulnerabilityᐳOrganization
ᐳFirstPartyVulnerabilityᐳPerson
1: JSONParse[319], JSONParse[333]
ᐳ: 327, 341, 320, 334
2: PgSelect[321], PgSelect[335]
ᐳ: 325, 326, 328, 329, 330, 331, 339, 340, 342, 343, 344, 345"):::bucket + Bucket15("Bucket 15 (polymorphic)
Organization,Person
Deps: 318, 18, 317
ᐳFirstPartyVulnerabilityᐳOrganization
ᐳFirstPartyVulnerabilityᐳPerson
1: JSONParse[319], JSONParse[333]
ᐳ: 327, 341, 320, 334
2: PgSelect[321], PgSelect[335]
ᐳ: 325, 326, 328, 329, 330, 331, 339, 340, 342, 343, 344, 345"):::bucket classDef bucket15 stroke:#ff00ff class Bucket15,JSONParse319,Access320,PgSelect321,First325,PgSelectSingle326,Constant327,PgClassExpression328,List329,Lambda330,PgClassExpression331,JSONParse333,Access334,PgSelect335,First339,PgSelectSingle340,Constant341,PgClassExpression342,List343,Lambda344,PgClassExpression345 bucket15 Bucket16("Bucket 16 (listItem)
Deps: 18

ROOT __Item{16}ᐸ375ᐳ[376]"):::bucket classDef bucket16 stroke:#f5deb3 class Bucket16,__Item376,PgUnionAllSingle377,Access378 bucket16 - Bucket17("Bucket 17 (polymorphic)
AwsApplication,GcpApplication
Deps: 18, 378, 377
ᐳThirdPartyVulnerabilityᐳAwsApplication
ᐳThirdPartyVulnerabilityᐳGcpApplication
1: JSONParse[379], JSONParse[429]
ᐳ: 387, 437, 380, 430
2: PgSelect[381], PgSelect[431]
ᐳ: 385, 386, 388, 389, 390, 391, 392, 393, 435, 436, 438, 439, 440, 441, 442, 443
3: PgUnionAll[394], PgUnionAll[444]
ᐳ: First[398], First[448]
4: 399, 449
ᐳ: Access[400], Access[450]"):::bucket + Bucket17("Bucket 17 (polymorphic)
AwsApplication,GcpApplication
Deps: 378, 18, 377
ᐳThirdPartyVulnerabilityᐳAwsApplication
ᐳThirdPartyVulnerabilityᐳGcpApplication
1: JSONParse[379], JSONParse[429]
ᐳ: 387, 437, 380, 430
2: PgSelect[381], PgSelect[431]
ᐳ: 385, 386, 388, 389, 390, 391, 392, 393, 435, 436, 438, 439, 440, 441, 442, 443
3: PgUnionAll[394], PgUnionAll[444]
ᐳ: First[398], First[448]
4: 399, 449
ᐳ: Access[400], Access[450]"):::bucket classDef bucket17 stroke:#696969 class Bucket17,JSONParse379,Access380,PgSelect381,First385,PgSelectSingle386,Constant387,PgClassExpression388,List389,Lambda390,PgClassExpression391,PgClassExpression392,PgClassExpression393,PgUnionAll394,First398,PgUnionAllSingle399,Access400,JSONParse429,Access430,PgSelect431,First435,PgSelectSingle436,Constant437,PgClassExpression438,List439,Lambda440,PgClassExpression441,PgClassExpression442,PgClassExpression443,PgUnionAll444,First448,PgUnionAllSingle449,Access450 bucket17 - Bucket18("Bucket 18 (polymorphic)
Organization,Person
Deps: 18, 400, 399
ᐳThirdPartyVulnerabilityᐳAwsApplicationᐳOrganization
ᐳThirdPartyVulnerabilityᐳAwsApplicationᐳPerson
1: JSONParse[401], JSONParse[415]
ᐳ: 409, 423, 402, 416
2: PgSelect[403], PgSelect[417]
ᐳ: 407, 408, 410, 411, 412, 413, 421, 422, 424, 425, 426, 427"):::bucket + Bucket18("Bucket 18 (polymorphic)
Organization,Person
Deps: 400, 18, 399
ᐳThirdPartyVulnerabilityᐳAwsApplicationᐳOrganization
ᐳThirdPartyVulnerabilityᐳAwsApplicationᐳPerson
1: JSONParse[401], JSONParse[415]
ᐳ: 409, 423, 402, 416
2: PgSelect[403], PgSelect[417]
ᐳ: 407, 408, 410, 411, 412, 413, 421, 422, 424, 425, 426, 427"):::bucket classDef bucket18 stroke:#00bfff class Bucket18,JSONParse401,Access402,PgSelect403,First407,PgSelectSingle408,Constant409,PgClassExpression410,List411,Lambda412,PgClassExpression413,JSONParse415,Access416,PgSelect417,First421,PgSelectSingle422,Constant423,PgClassExpression424,List425,Lambda426,PgClassExpression427 bucket18 - Bucket19("Bucket 19 (polymorphic)
Organization,Person
Deps: 18, 450, 449
ᐳThirdPartyVulnerabilityᐳGcpApplicationᐳOrganization
ᐳThirdPartyVulnerabilityᐳGcpApplicationᐳPerson
1: JSONParse[451], JSONParse[465]
ᐳ: 459, 473, 452, 466
2: PgSelect[453], PgSelect[467]
ᐳ: 457, 458, 460, 461, 462, 463, 471, 472, 474, 475, 476, 477"):::bucket + Bucket19("Bucket 19 (polymorphic)
Organization,Person
Deps: 450, 18, 449
ᐳThirdPartyVulnerabilityᐳGcpApplicationᐳOrganization
ᐳThirdPartyVulnerabilityᐳGcpApplicationᐳPerson
1: JSONParse[451], JSONParse[465]
ᐳ: 459, 473, 452, 466
2: PgSelect[453], PgSelect[467]
ᐳ: 457, 458, 460, 461, 462, 463, 471, 472, 474, 475, 476, 477"):::bucket classDef bucket19 stroke:#7f007f class Bucket19,JSONParse451,Access452,PgSelect453,First457,PgSelectSingle458,Constant459,PgClassExpression460,List461,Lambda462,PgClassExpression463,JSONParse465,Access466,PgSelect467,First471,PgSelectSingle472,Constant473,PgClassExpression474,List475,Lambda476,PgClassExpression477 bucket19 Bucket20("Bucket 20 (listItem)
Deps: 18

ROOT __Item{20}ᐸ485ᐳ[489]"):::bucket classDef bucket20 stroke:#ffa500 class Bucket20,__Item489,PgUnionAllSingle490,Access491 bucket20 - Bucket21("Bucket 21 (polymorphic)
AwsApplication,GcpApplication
Deps: 18, 491, 490
ᐳThirdPartyVulnerabilityᐳAwsApplication
ᐳThirdPartyVulnerabilityᐳGcpApplication
1: JSONParse[492], JSONParse[542]
ᐳ: 500, 550, 493, 543
2: PgSelect[494], PgSelect[544]
ᐳ: 498, 499, 501, 502, 503, 504, 505, 506, 548, 549, 551, 552, 553, 554, 555, 556
3: PgUnionAll[507], PgUnionAll[557]
ᐳ: First[511], First[561]
4: 512, 562
ᐳ: Access[513], Access[563]"):::bucket + Bucket21("Bucket 21 (polymorphic)
AwsApplication,GcpApplication
Deps: 491, 18, 490
ᐳThirdPartyVulnerabilityᐳAwsApplication
ᐳThirdPartyVulnerabilityᐳGcpApplication
1: JSONParse[492], JSONParse[542]
ᐳ: 500, 550, 493, 543
2: PgSelect[494], PgSelect[544]
ᐳ: 498, 499, 501, 502, 503, 504, 505, 506, 548, 549, 551, 552, 553, 554, 555, 556
3: PgUnionAll[507], PgUnionAll[557]
ᐳ: First[511], First[561]
4: 512, 562
ᐳ: Access[513], Access[563]"):::bucket classDef bucket21 stroke:#0000ff class Bucket21,JSONParse492,Access493,PgSelect494,First498,PgSelectSingle499,Constant500,PgClassExpression501,List502,Lambda503,PgClassExpression504,PgClassExpression505,PgClassExpression506,PgUnionAll507,First511,PgUnionAllSingle512,Access513,JSONParse542,Access543,PgSelect544,First548,PgSelectSingle549,Constant550,PgClassExpression551,List552,Lambda553,PgClassExpression554,PgClassExpression555,PgClassExpression556,PgUnionAll557,First561,PgUnionAllSingle562,Access563 bucket21 - Bucket22("Bucket 22 (polymorphic)
Organization,Person
Deps: 18, 513, 512
ᐳThirdPartyVulnerabilityᐳAwsApplicationᐳOrganization
ᐳThirdPartyVulnerabilityᐳAwsApplicationᐳPerson
1: JSONParse[514], JSONParse[528]
ᐳ: 522, 536, 515, 529
2: PgSelect[516], PgSelect[530]
ᐳ: 520, 521, 523, 524, 525, 526, 534, 535, 537, 538, 539, 540"):::bucket + Bucket22("Bucket 22 (polymorphic)
Organization,Person
Deps: 513, 18, 512
ᐳThirdPartyVulnerabilityᐳAwsApplicationᐳOrganization
ᐳThirdPartyVulnerabilityᐳAwsApplicationᐳPerson
1: JSONParse[514], JSONParse[528]
ᐳ: 522, 536, 515, 529
2: PgSelect[516], PgSelect[530]
ᐳ: 520, 521, 523, 524, 525, 526, 534, 535, 537, 538, 539, 540"):::bucket classDef bucket22 stroke:#7fff00 class Bucket22,JSONParse514,Access515,PgSelect516,First520,PgSelectSingle521,Constant522,PgClassExpression523,List524,Lambda525,PgClassExpression526,JSONParse528,Access529,PgSelect530,First534,PgSelectSingle535,Constant536,PgClassExpression537,List538,Lambda539,PgClassExpression540 bucket22 - Bucket23("Bucket 23 (polymorphic)
Organization,Person
Deps: 18, 563, 562
ᐳThirdPartyVulnerabilityᐳGcpApplicationᐳOrganization
ᐳThirdPartyVulnerabilityᐳGcpApplicationᐳPerson
1: JSONParse[564], JSONParse[578]
ᐳ: 572, 586, 565, 579
2: PgSelect[566], PgSelect[580]
ᐳ: 570, 571, 573, 574, 575, 576, 584, 585, 587, 588, 589, 590"):::bucket + Bucket23("Bucket 23 (polymorphic)
Organization,Person
Deps: 563, 18, 562
ᐳThirdPartyVulnerabilityᐳGcpApplicationᐳOrganization
ᐳThirdPartyVulnerabilityᐳGcpApplicationᐳPerson
1: JSONParse[564], JSONParse[578]
ᐳ: 572, 586, 565, 579
2: PgSelect[566], PgSelect[580]
ᐳ: 570, 571, 573, 574, 575, 576, 584, 585, 587, 588, 589, 590"):::bucket classDef bucket23 stroke:#ff1493 class Bucket23,JSONParse564,Access565,PgSelect566,First570,PgSelectSingle571,Constant572,PgClassExpression573,List574,Lambda575,PgClassExpression576,JSONParse578,Access579,PgSelect580,First584,PgSelectSingle585,Constant586,PgClassExpression587,List588,Lambda589,PgClassExpression590 bucket23 Bucket24("Bucket 24 (listItem)
Deps: 18

ROOT __Item{24}ᐸ600ᐳ[601]"):::bucket classDef bucket24 stroke:#808000 class Bucket24,__Item601,PgUnionAllSingle602,Access603 bucket24 - Bucket25("Bucket 25 (polymorphic)
Organization,Person
Deps: 18, 603, 602
ᐳThirdPartyVulnerabilityᐳOrganization
ᐳThirdPartyVulnerabilityᐳPerson
1: JSONParse[604], JSONParse[618]
ᐳ: 612, 626, 605, 619
2: PgSelect[606], PgSelect[620]
ᐳ: 610, 611, 613, 614, 615, 616, 624, 625, 627, 628, 629, 630"):::bucket + Bucket25("Bucket 25 (polymorphic)
Organization,Person
Deps: 603, 18, 602
ᐳThirdPartyVulnerabilityᐳOrganization
ᐳThirdPartyVulnerabilityᐳPerson
1: JSONParse[604], JSONParse[618]
ᐳ: 612, 626, 605, 619
2: PgSelect[606], PgSelect[620]
ᐳ: 610, 611, 613, 614, 615, 616, 624, 625, 627, 628, 629, 630"):::bucket classDef bucket25 stroke:#dda0dd class Bucket25,JSONParse604,Access605,PgSelect606,First610,PgSelectSingle611,Constant612,PgClassExpression613,List614,Lambda615,PgClassExpression616,JSONParse618,Access619,PgSelect620,First624,PgSelectSingle625,Constant626,PgClassExpression627,List628,Lambda629,PgClassExpression630 bucket25 Bucket26("Bucket 26 (listItem)
Deps: 18

ROOT __Item{26}ᐸ635ᐳ[639]"):::bucket classDef bucket26 stroke:#ff0000 class Bucket26,__Item639,PgUnionAllSingle640,Access641 bucket26 - Bucket27("Bucket 27 (polymorphic)
Organization,Person
Deps: 18, 641, 640
ᐳThirdPartyVulnerabilityᐳOrganization
ᐳThirdPartyVulnerabilityᐳPerson
1: JSONParse[642], JSONParse[656]
ᐳ: 650, 664, 643, 657
2: PgSelect[644], PgSelect[658]
ᐳ: 648, 649, 651, 652, 653, 654, 662, 663, 665, 666, 667, 668"):::bucket + Bucket27("Bucket 27 (polymorphic)
Organization,Person
Deps: 641, 18, 640
ᐳThirdPartyVulnerabilityᐳOrganization
ᐳThirdPartyVulnerabilityᐳPerson
1: JSONParse[642], JSONParse[656]
ᐳ: 650, 664, 643, 657
2: PgSelect[644], PgSelect[658]
ᐳ: 648, 649, 651, 652, 653, 654, 662, 663, 665, 666, 667, 668"):::bucket classDef bucket27 stroke:#ffff00 class Bucket27,JSONParse642,Access643,PgSelect644,First648,PgSelectSingle649,Constant650,PgClassExpression651,List652,Lambda653,PgClassExpression654,JSONParse656,Access657,PgSelect658,First662,PgSelectSingle663,Constant664,PgClassExpression665,List666,Lambda667,PgClassExpression668 bucket27 Bucket0 --> Bucket1 diff --git a/postgraphile/postgraphile/__tests__/queries/polymorphic/vulns.union_owners.simple.mermaid b/postgraphile/postgraphile/__tests__/queries/polymorphic/vulns.union_owners.simple.mermaid index 411105fa80..e2c83fc4c5 100644 --- a/postgraphile/postgraphile/__tests__/queries/polymorphic/vulns.union_owners.simple.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/polymorphic/vulns.union_owners.simple.mermaid @@ -174,19 +174,19 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgUnionAllSingle22,Access23 bucket2 - Bucket3("Bucket 3 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 18, 23, 22
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[24], JSONParse[78]
ᐳ: 32, 45, 86, 99, 25, 79
2: PgSelect[26], PgSelect[80]
ᐳ: 30, 31, 33, 34, 35, 36, 84, 85, 87, 88, 89, 90
3: PgUnionAll[46], PgUnionAll[100]"):::bucket + Bucket3("Bucket 3 (polymorphic)
FirstPartyVulnerability,ThirdPartyVulnerability
Deps: 23, 18, 22
ᐳFirstPartyVulnerability
ᐳThirdPartyVulnerability
1: JSONParse[24], JSONParse[78]
ᐳ: 32, 45, 86, 99, 25, 79
2: PgSelect[26], PgSelect[80]
ᐳ: 30, 31, 33, 34, 35, 36, 84, 85, 87, 88, 89, 90
3: PgUnionAll[46], PgUnionAll[100]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,JSONParse24,Access25,PgSelect26,First30,PgSelectSingle31,Constant32,PgClassExpression33,List34,Lambda35,PgClassExpression36,Connection45,PgUnionAll46,JSONParse78,Access79,PgSelect80,First84,PgSelectSingle85,Constant86,PgClassExpression87,List88,Lambda89,PgClassExpression90,Connection99,PgUnionAll100 bucket3 Bucket4("Bucket 4 (listItem)
Deps: 18

ROOT __Item{4}ᐸ46ᐳ[47]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item47,PgUnionAllSingle48,Access49 bucket4 - Bucket5("Bucket 5 (polymorphic)
Organization,Person
Deps: 18, 49, 48
ᐳFirstPartyVulnerabilityᐳOrganization
ᐳFirstPartyVulnerabilityᐳPerson
1: JSONParse[50], JSONParse[64]
ᐳ: 58, 72, 51, 65
2: PgSelect[52], PgSelect[66]
ᐳ: 56, 57, 59, 60, 61, 62, 70, 71, 73, 74, 75, 76"):::bucket + Bucket5("Bucket 5 (polymorphic)
Organization,Person
Deps: 49, 18, 48
ᐳFirstPartyVulnerabilityᐳOrganization
ᐳFirstPartyVulnerabilityᐳPerson
1: JSONParse[50], JSONParse[64]
ᐳ: 58, 72, 51, 65
2: PgSelect[52], PgSelect[66]
ᐳ: 56, 57, 59, 60, 61, 62, 70, 71, 73, 74, 75, 76"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,JSONParse50,Access51,PgSelect52,First56,PgSelectSingle57,Constant58,PgClassExpression59,List60,Lambda61,PgClassExpression62,JSONParse64,Access65,PgSelect66,First70,PgSelectSingle71,Constant72,PgClassExpression73,List74,Lambda75,PgClassExpression76 bucket5 Bucket6("Bucket 6 (listItem)
Deps: 18

ROOT __Item{6}ᐸ100ᐳ[101]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,__Item101,PgUnionAllSingle102,Access103 bucket6 - Bucket7("Bucket 7 (polymorphic)
Organization,Person
Deps: 18, 103, 102
ᐳThirdPartyVulnerabilityᐳOrganization
ᐳThirdPartyVulnerabilityᐳPerson
1: JSONParse[104], JSONParse[118]
ᐳ: 112, 126, 105, 119
2: PgSelect[106], PgSelect[120]
ᐳ: 110, 111, 113, 114, 115, 116, 124, 125, 127, 128, 129, 130"):::bucket + Bucket7("Bucket 7 (polymorphic)
Organization,Person
Deps: 103, 18, 102
ᐳThirdPartyVulnerabilityᐳOrganization
ᐳThirdPartyVulnerabilityᐳPerson
1: JSONParse[104], JSONParse[118]
ᐳ: 112, 126, 105, 119
2: PgSelect[106], PgSelect[120]
ᐳ: 110, 111, 113, 114, 115, 116, 124, 125, 127, 128, 129, 130"):::bucket classDef bucket7 stroke:#808000 class Bucket7,JSONParse104,Access105,PgSelect106,First110,PgSelectSingle111,Constant112,PgClassExpression113,List114,Lambda115,PgClassExpression116,JSONParse118,Access119,PgSelect120,First124,PgSelectSingle125,Constant126,PgClassExpression127,List128,Lambda129,PgClassExpression130 bucket7 Bucket0 --> Bucket1 diff --git a/postgraphile/postgraphile/__tests__/queries/v4/badlyBehavedFunction.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/badlyBehavedFunction.mermaid index 8843579993..2d25e53e92 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/badlyBehavedFunction.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/badlyBehavedFunction.mermaid @@ -73,7 +73,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 20

ROOT __Item{2}ᐸ17ᐳ[18]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item18,PgSelectSingle19 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 20, 19

ROOT PgSelectSingle{2}ᐸbadly_behaved_functionᐳ[19]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 19, 20

ROOT PgSelectSingle{2}ᐸbadly_behaved_functionᐳ[19]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression21,List22,Lambda23,PgClassExpression26 bucket3 Bucket4("Bucket 4 (subroutine)
ROOT PgSelectSingle{4}ᐸbadly_behaved_functionᐳ[30]"):::bucket @@ -82,10 +82,10 @@ graph TD Bucket5("Bucket 5 (listItem)
Deps: 16, 20

ROOT __Item{5}ᐸ28ᐳ[31]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,__Item31,PgSelectSingle32,Edge33,PgCursor34,PgClassExpression35,List36 bucket5 - Bucket6("Bucket 6 (nullableBoundary)
Deps: 20, 33, 32, 34

ROOT Edge{5}[33]"):::bucket + Bucket6("Bucket 6 (nullableBoundary)
Deps: 33, 32, 20, 34

ROOT Edge{5}[33]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6 bucket6 - Bucket7("Bucket 7 (nullableBoundary)
Deps: 20, 32

ROOT PgSelectSingle{5}ᐸbadly_behaved_functionᐳ[32]"):::bucket + Bucket7("Bucket 7 (nullableBoundary)
Deps: 32, 20

ROOT PgSelectSingle{5}ᐸbadly_behaved_functionᐳ[32]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgClassExpression38,List39,Lambda40,PgClassExpression43 bucket7 Bucket0 --> Bucket1 diff --git a/postgraphile/postgraphile/__tests__/queries/v4/classic-ids.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/classic-ids.mermaid index 6aba1cd0ee..730aa25973 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/classic-ids.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/classic-ids.mermaid @@ -58,7 +58,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 30

ROOT __Item{2}ᐸ27ᐳ[28]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item28,PgSelectSingle29 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 30, 29

ROOT PgSelectSingle{2}ᐸpostᐳ[29]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 29, 30

ROOT PgSelectSingle{2}ᐸpostᐳ[29]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression31,List32,Lambda33,PgClassExpression35 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 25, 51

ROOT Connectionᐸ47ᐳ[51]
1:
ᐳ: Constant[57]
2: PgSelect[52]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/composite_domains.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/composite_domains.mermaid index d77db92874..74653ba076 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/composite_domains.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/composite_domains.mermaid @@ -86,7 +86,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 22, 21

ROOT PgSelectSingle{2}ᐸpostsᐳ[22]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 21, 18

ROOT PgSelectSingle{2}ᐸpostsᐳ[22]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression24,PgSelectSingle31,PgClassExpression32,PgClassExpression33,PgClassExpression65,RemapKeys66,Access68 bucket3 Bucket5("Bucket 5 (listItem)
Deps: 18

ROOT __Item{5}ᐸ33ᐳ[36]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/connections-totalCount.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/connections-totalCount.mermaid index 7a87ab00ff..5e5ae9dacb 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/connections-totalCount.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/connections-totalCount.mermaid @@ -68,7 +68,7 @@ graph TD Bucket3("Bucket 3 (listItem)
Deps: 51

ROOT __Item{3}ᐸ37ᐳ[38]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,__Item38,PgSelectSingle39 bucket3 - Bucket4("Bucket 4 (nullableBoundary)
Deps: 51, 38, 39

ROOT PgSelectSingle{3}ᐸpersonᐳ[39]"):::bucket + Bucket4("Bucket 4 (nullableBoundary)
Deps: 38, 39, 51

ROOT PgSelectSingle{3}ᐸpersonᐳ[39]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,First53,PgSelectSingle54,PgClassExpression55,Access72 bucket4 Bucket5("Bucket 5 (nullableBoundary)
Deps: 18, 67

ROOT Connectionᐸ63ᐳ[67]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/connections.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/connections.mermaid index dce4d8308c..8f50963da4 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/connections.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/connections.mermaid @@ -1455,7 +1455,7 @@ graph TD Bucket67("Bucket 67 (nullableBoundary)
Deps: 996

ROOT PgSelectSingle{66}ᐸpersonᐳ[996]"):::bucket classDef bucket67 stroke:#f5deb3 class Bucket67,PgClassExpression997,PgClassExpression1006 bucket67 - Bucket68("Bucket 68 (nullableBoundary)
Deps: 1009, 988

ROOT PgSelectSingle{65}ᐸpostᐳ[988]"):::bucket + Bucket68("Bucket 68 (nullableBoundary)
Deps: 988, 1009

ROOT PgSelectSingle{65}ᐸpostᐳ[988]"):::bucket classDef bucket68 stroke:#696969 class Bucket68,PgClassExpression1010,List1011,Lambda1012 bucket68 Bucket69("Bucket 69 (nullableBoundary)
Deps: 1037, 18, 33

ROOT Connectionᐸ1033ᐳ[1037]
1:
ᐳ: PgPageInfo[1038], Constant[1170]
2: PgSelect[1039], PgSelect[1053]
ᐳ: 1040, 1041, 1043, 1044, 1046, 1047, 1049, 1050, 1054, 1055, 1056, 1042, 1048"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/function-return-types.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/function-return-types.mermaid index 968f9bb9a8..424a0e032d 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/function-return-types.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/function-return-types.mermaid @@ -539,7 +539,7 @@ graph TD Bucket4("Bucket 4 (listItem)
Deps: 80

ROOT __Item{4}ᐸ581ᐳ[78]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,__Item78,PgSelectSingle79 bucket4 - Bucket5("Bucket 5 (nullableBoundary)
Deps: 80, 79

ROOT PgSelectSingle{4}ᐸpostᐳ[79]"):::bucket + Bucket5("Bucket 5 (nullableBoundary)
Deps: 79, 80

ROOT PgSelectSingle{4}ᐸpostᐳ[79]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression81,List82,Lambda83 bucket5 Bucket6("Bucket 6 (nullableBoundary)
Deps: 12, 635, 636, 96, 57, 80

ROOT Connectionᐸ92ᐳ[96]"):::bucket @@ -548,19 +548,19 @@ graph TD Bucket7("Bucket 7 (listItem)
Deps: 57, 80, 137

ROOT __Item{7}ᐸ97ᐳ[98]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,__Item98,PgSelectSingle99 bucket7 - Bucket8("Bucket 8 (nullableBoundary)
Deps: 57, 80, 137, 99

ROOT PgSelectSingle{7}ᐸfunc_out_complex_setofᐳ[99]"):::bucket + Bucket8("Bucket 8 (nullableBoundary)
Deps: 99, 57, 80, 137

ROOT PgSelectSingle{7}ᐸfunc_out_complex_setofᐳ[99]"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,PgClassExpression100,PgSelectSingle107,PgSelectSingle117,RemapKeys584,RemapKeys587 bucket8 Bucket9("Bucket 9 (nullableBoundary)
Deps: 107

ROOT PgSelectSingle{8}ᐸfrmcdc_compoundTypeᐳ[107]"):::bucket classDef bucket9 stroke:#ff0000 class Bucket9,PgClassExpression108,PgClassExpression109,PgClassExpression110 bucket9 - Bucket10("Bucket 10 (nullableBoundary)
Deps: 57, 80, 137, 117, 587

ROOT PgSelectSingle{8}ᐸpersonᐳ[117]"):::bucket + Bucket10("Bucket 10 (nullableBoundary)
Deps: 117, 57, 587, 80, 137

ROOT PgSelectSingle{8}ᐸpersonᐳ[117]"):::bucket classDef bucket10 stroke:#ffff00 class Bucket10,PgClassExpression119,List120,Lambda121,PgClassExpression123,Access586 bucket10 Bucket11("Bucket 11 (listItem)
Deps: 80

ROOT __Item{11}ᐸ586ᐳ[139]"):::bucket classDef bucket11 stroke:#00ffff class Bucket11,__Item139,PgSelectSingle140 bucket11 - Bucket12("Bucket 12 (nullableBoundary)
Deps: 80, 140

ROOT PgSelectSingle{11}ᐸpostᐳ[140]"):::bucket + Bucket12("Bucket 12 (nullableBoundary)
Deps: 140, 80

ROOT PgSelectSingle{11}ᐸpostᐳ[140]"):::bucket classDef bucket12 stroke:#4169e1 class Bucket12,PgClassExpression142,List143,Lambda144 bucket12 Bucket13("Bucket 13 (nullableBoundary)
Deps: 155

ROOT PgSelectSingleᐸfunc_out_outᐳ[155]"):::bucket @@ -599,7 +599,7 @@ graph TD Bucket24("Bucket 24 (listItem)
Deps: 57

ROOT __Item{24}ᐸ242ᐳ[243]"):::bucket classDef bucket24 stroke:#808000 class Bucket24,__Item243,PgSelectSingle244 bucket24 - Bucket25("Bucket 25 (nullableBoundary)
Deps: 57, 244

ROOT PgSelectSingle{24}ᐸfunc_out_table_setofᐳ[244]"):::bucket + Bucket25("Bucket 25 (nullableBoundary)
Deps: 244, 57

ROOT PgSelectSingle{24}ᐸfunc_out_table_setofᐳ[244]"):::bucket classDef bucket25 stroke:#dda0dd class Bucket25,PgClassExpression246,List247,Lambda248 bucket25 Bucket26("Bucket 26 (nullableBoundary)
Deps: 266

ROOT PgSelectSingleᐸfunc_out_unnamed_out_out_unnamedᐳ[266]"):::bucket @@ -635,7 +635,7 @@ graph TD Bucket36("Bucket 36 (listItem)
Deps: 80

ROOT __Item{36}ᐸ593ᐳ[370]"):::bucket classDef bucket36 stroke:#7f007f class Bucket36,__Item370,PgSelectSingle371 bucket36 - Bucket37("Bucket 37 (nullableBoundary)
Deps: 80, 371

ROOT PgSelectSingle{36}ᐸpostᐳ[371]"):::bucket + Bucket37("Bucket 37 (nullableBoundary)
Deps: 371, 80

ROOT PgSelectSingle{36}ᐸpostᐳ[371]"):::bucket classDef bucket37 stroke:#ffa500 class Bucket37,PgClassExpression373,List374,Lambda375 bucket37 Bucket38("Bucket 38 (nullableBoundary)
Deps: 383

ROOT PgSelectSingle{32}ᐸperson_computed_first_arg_inoutᐳ[383]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/json-overflow-nested.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/json-overflow-nested.mermaid index 5e793156ff..2c3ae9dfa6 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/json-overflow-nested.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/json-overflow-nested.mermaid @@ -360,7 +360,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 37

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 37, 22, 21

ROOT PgSelectSingle{2}ᐸpersonᐳ[22]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 21, 37

ROOT PgSelectSingle{2}ᐸpersonᐳ[22]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,Access454 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ454ᐳ[39]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/large_bigint.issue491.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/large_bigint.issue491.mermaid index d141086237..8c7e464413 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/large_bigint.issue491.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/large_bigint.issue491.mermaid @@ -85,7 +85,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 23

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 23, 22

ROOT PgSelectSingle{2}ᐸlarge_node_idᐳ[22]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 23

ROOT PgSelectSingle{2}ᐸlarge_node_idᐳ[22]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression24,List25,Lambda26,PgClassExpression28 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 37, 23

ROOT PgSelectSingleᐸlarge_node_idᐳ[37]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/nested_arrays.select.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/nested_arrays.select.mermaid index 316c1081ab..50edbae938 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/nested_arrays.select.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/nested_arrays.select.mermaid @@ -58,7 +58,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 22

ROOT PgSelectSingle{2}ᐸtᐳ[22]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 18

ROOT PgSelectSingle{2}ᐸtᐳ[22]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression24 bucket3 Bucket5("Bucket 5 (listItem)
Deps: 18

ROOT __Item{5}ᐸ24ᐳ[27]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/node.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/node.mermaid index 4e294290e7..4d69147049 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/node.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/node.mermaid @@ -2319,7 +2319,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 23

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 23, 22

ROOT PgSelectSingle{2}ᐸpersonᐳ[22]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 23

ROOT PgSelectSingle{2}ᐸpersonᐳ[22]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression24,List25,Lambda26,PgClassExpression28 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 18, 41, 45

ROOT Connectionᐸ37ᐳ[41]"):::bucket @@ -2328,7 +2328,7 @@ graph TD Bucket5("Bucket 5 (listItem)
Deps: 45

ROOT __Item{5}ᐸ42ᐳ[43]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,__Item43,PgSelectSingle44 bucket5 - Bucket6("Bucket 6 (nullableBoundary)
Deps: 45, 44

ROOT PgSelectSingle{5}ᐸcompound_keyᐳ[44]"):::bucket + Bucket6("Bucket 6 (nullableBoundary)
Deps: 44, 45

ROOT PgSelectSingle{5}ᐸcompound_keyᐳ[44]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression46,PgClassExpression47,List48,Lambda49 bucket6 Bucket7("Bucket 7 (polymorphic)
Query,Input,Patch,Reserved,ReservedPatchRecord,ReservedInputRecord,DefaultValue,CompoundKey,Person,Post,Type,PersonSecret,LeftArm,MyTable,ViewTable,SimilarTable1,SimilarTable2,NullTestRecord,Issue756
Deps: 18, 54, 53, 5
ᐳQuery
ᐳInput
ᐳPatch
ᐳReserved
ᐳReservedPatchRecord
ᐳReservedInputRecord
ᐳDefaultValue
ᐳCompoundKey
ᐳPerson
ᐳPost
ᐳType
ᐳPersonSecret
ᐳLeftArm
ᐳMyTable
ᐳViewTable
ᐳSimilarTable1
ᐳSimilarTable2
ᐳNullTestRecord
ᐳIssue756
1:
ᐳ: 56, 66, 78, 90, 102, 114, 126, 139, 154, 168, 180, 192, 204, 216, 228, 240, 256, 272, 284, 2070, 2071, 57
2: 60, 72, 84, 96, 108, 120, 133, 148, 162, 174, 186, 198, 210, 222, 234, 250, 266, 278
ᐳ: 64, 65, 67, 68, 69, 76, 77, 79, 80, 81, 88, 89, 91, 92, 93, 100, 101, 103, 104, 105, 112, 113, 115, 116, 117, 124, 125, 127, 128, 129, 137, 138, 140, 141, 142, 143, 152, 153, 155, 156, 157, 159, 166, 167, 169, 170, 171, 178, 179, 181, 182, 183, 190, 191, 193, 194, 195, 202, 203, 205, 206, 207, 214, 215, 217, 218, 219, 226, 227, 229, 230, 231, 238, 239, 241, 242, 243, 245, 246, 247, 254, 255, 257, 258, 259, 261, 262, 263, 270, 271, 273, 274, 275, 282, 283, 285, 286, 287"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/one-to-one-backward.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/one-to-one-backward.mermaid index b3b3806bbd..37f93fdd82 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/one-to-one-backward.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/one-to-one-backward.mermaid @@ -92,16 +92,16 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 37, 62

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 37, 62, 22

ROOT PgSelectSingle{2}ᐸpersonᐳ[22]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 37, 62

ROOT PgSelectSingle{2}ᐸpersonᐳ[22]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor23,PgClassExpression24,List25,PgClassExpression27,PgClassExpression29,PgSelectSingle36,PgSelectSingle61,RemapKeys85 bucket3 - Bucket4("Bucket 4 (nullableBoundary)
Deps: 37, 36

ROOT PgSelectSingle{3}ᐸleft_armᐳ[36]"):::bucket + Bucket4("Bucket 4 (nullableBoundary)
Deps: 36, 37

ROOT PgSelectSingle{3}ᐸleft_armᐳ[36]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgClassExpression38,List39,Lambda40,PgClassExpression42,PgSelectSingle49,PgClassExpression54,RemapKeys79 bucket4 Bucket5("Bucket 5 (nullableBoundary)
Deps: 49

ROOT PgSelectSingle{4}ᐸpersonᐳ[49]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,PgClassExpression50,PgClassExpression51,PgClassExpression53 bucket5 - Bucket6("Bucket 6 (nullableBoundary)
Deps: 62, 61

ROOT PgSelectSingle{3}ᐸperson_secretᐳ[61]"):::bucket + Bucket6("Bucket 6 (nullableBoundary)
Deps: 61, 62

ROOT PgSelectSingle{3}ᐸperson_secretᐳ[61]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression63,List64,Lambda65,PgSelectSingle73,PgClassExpression78 bucket6 Bucket7("Bucket 7 (nullableBoundary)
Deps: 73

ROOT PgSelectSingle{6}ᐸpersonᐳ[73]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/orderByNullsLast.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/orderByNullsLast.mermaid index 9f1e33b07a..584bd9fc69 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/orderByNullsLast.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/orderByNullsLast.mermaid @@ -62,7 +62,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 23

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 23, 22

ROOT PgSelectSingle{2}ᐸsimilar_table_1ᐳ[22]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 23

ROOT PgSelectSingle{2}ᐸsimilar_table_1ᐳ[22]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression24,List25,Lambda26,PgClassExpression27 bucket3 Bucket4("Bucket 4 (nullableBoundary)
Deps: 18, 40, 23

ROOT Connectionᐸ36ᐳ[40]"):::bucket @@ -71,7 +71,7 @@ graph TD Bucket5("Bucket 5 (listItem)
Deps: 23

ROOT __Item{5}ᐸ41ᐳ[42]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,__Item42,PgSelectSingle43 bucket5 - Bucket6("Bucket 6 (nullableBoundary)
Deps: 23, 43

ROOT PgSelectSingle{5}ᐸsimilar_table_1ᐳ[43]"):::bucket + Bucket6("Bucket 6 (nullableBoundary)
Deps: 43, 23

ROOT PgSelectSingle{5}ᐸsimilar_table_1ᐳ[43]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression45,List46,Lambda47,PgClassExpression48 bucket6 Bucket0 --> Bucket1 & Bucket4 diff --git a/postgraphile/postgraphile/__tests__/queries/v4/posts.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/posts.mermaid index e51ba888e0..d194d9b27e 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/posts.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/posts.mermaid @@ -111,10 +111,10 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 78, 90

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 78, 90, 22

ROOT PgSelectSingle{2}ᐸpostᐳ[22]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 78, 90

ROOT PgSelectSingle{2}ᐸpostᐳ[22]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgCursor23,PgClassExpression24,List25,PgClassExpression27,PgClassExpression31,PgSelectSingle38,RemapKeys103 bucket3 - Bucket4("Bucket 4 (nullableBoundary)
Deps: 78, 90, 38, 103

ROOT PgSelectSingle{3}ᐸpersonᐳ[38]"):::bucket + Bucket4("Bucket 4 (nullableBoundary)
Deps: 38, 103, 78, 90

ROOT PgSelectSingle{3}ᐸpersonᐳ[38]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgClassExpression39,PgClassExpression40,PgClassExpression42,PgSelectSingle49,First87,PgSelectSingle88,PgClassExpression89,First92,PgSelectSingle93,PgCursor94,PgClassExpression95,List96,RemapKeys99,Access101,Access102 bucket4 Bucket5("Bucket 5 (nullableBoundary)
Deps: 49

ROOT PgSelectSingle{4}ᐸperson_first_postᐳ[49]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/procedure-computed-fields.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/procedure-computed-fields.mermaid index 9bf2aba194..0a43ad8707 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/procedure-computed-fields.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/procedure-computed-fields.mermaid @@ -280,7 +280,7 @@ graph TD Bucket11("Bucket 11 (listItem)
Deps: 224

ROOT __Item{11}ᐸ116ᐳ[117]"):::bucket classDef bucket11 stroke:#00ffff class Bucket11,__Item117,PgSelectSingle118 bucket11 - Bucket12("Bucket 12 (nullableBoundary)
Deps: 224, 118, 117

ROOT PgSelectSingle{11}ᐸpostᐳ[118]
1:
ᐳ: 119, 123, 127, 131, 135, 139, 143, 159, 203, 206, 350, 353, 355, 153, 155, 352
2: __ListTransform[236]"):::bucket + Bucket12("Bucket 12 (nullableBoundary)
Deps: 118, 117, 224

ROOT PgSelectSingle{11}ᐸpostᐳ[118]
1:
ᐳ: 119, 123, 127, 131, 135, 139, 143, 159, 203, 206, 350, 353, 355, 153, 155, 352
2: __ListTransform[236]"):::bucket classDef bucket12 stroke:#4169e1 class Bucket12,PgClassExpression119,PgClassExpression123,PgClassExpression127,PgClassExpression131,PgClassExpression135,PgClassExpression139,PgClassExpression143,PgSelectSingle153,PgClassExpression155,PgClassExpression159,PgClassExpression203,PgClassExpression206,__ListTransform236,RemapKeys350,Access352,RemapKeys353,Access355 bucket12 Bucket13("Bucket 13 (listItem)
ROOT __Item{13}ᐸ352ᐳ[189]"):::bucket @@ -325,13 +325,13 @@ graph TD Bucket26("Bucket 26 (listItem)
Deps: 280, 298

ROOT __Item{26}ᐸ263ᐳ[264]"):::bucket classDef bucket26 stroke:#ff0000 class Bucket26,__Item264,PgSelectSingle265 bucket26 - Bucket27("Bucket 27 (nullableBoundary)
Deps: 280, 298, 265, 264

ROOT PgSelectSingle{26}ᐸpersonᐳ[265]"):::bucket + Bucket27("Bucket 27 (nullableBoundary)
Deps: 265, 264, 280, 298

ROOT PgSelectSingle{26}ᐸpersonᐳ[265]"):::bucket classDef bucket27 stroke:#ffff00 class Bucket27,PgClassExpression266,PgClassExpression268,PgSelectSingle311,Access357,RemapKeys358 bucket27 Bucket28("Bucket 28 (listItem)
Deps: 298

ROOT __Item{28}ᐸ357ᐳ[282]"):::bucket classDef bucket28 stroke:#00ffff class Bucket28,__Item282,PgSelectSingle283 bucket28 - Bucket29("Bucket 29 (nullableBoundary)
Deps: 298, 283, 282

ROOT PgSelectSingle{28}ᐸperson_friendsᐳ[283]"):::bucket + Bucket29("Bucket 29 (nullableBoundary)
Deps: 283, 282, 298

ROOT PgSelectSingle{28}ᐸperson_friendsᐳ[283]"):::bucket classDef bucket29 stroke:#4169e1 class Bucket29,PgClassExpression284,PgClassExpression286,Access356 bucket29 Bucket30("Bucket 30 (listItem)
ROOT __Item{30}ᐸ356ᐳ[300]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/rbac.basic.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/rbac.basic.mermaid index 3505f2bf6f..c4f6809963 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/rbac.basic.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/rbac.basic.mermaid @@ -262,7 +262,7 @@ graph TD Bucket3("Bucket 3 (listItem)
Deps: 14

ROOT __Item{3}ᐸ33ᐳ[34]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,__Item34,PgSelectSingle35 bucket3 - Bucket4("Bucket 4 (nullableBoundary)
Deps: 14, 35

ROOT PgSelectSingle{3}ᐸperson_secretᐳ[35]"):::bucket + Bucket4("Bucket 4 (nullableBoundary)
Deps: 35, 14

ROOT PgSelectSingle{3}ᐸperson_secretᐳ[35]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgClassExpression37,List38,Lambda39,PgClassExpression41 bucket4 Bucket5("Bucket 5 (nullableBoundary)
Deps: 48, 49, 14

ROOT PgSelectSingleᐸpersonᐳ[48]"):::bucket @@ -286,7 +286,7 @@ graph TD Bucket11("Bucket 11 (listItem)
Deps: 99

ROOT __Item{11}ᐸ120ᐳ[121]"):::bucket classDef bucket11 stroke:#00ffff class Bucket11,__Item121,PgSelectSingle122 bucket11 - Bucket12("Bucket 12 (nullableBoundary)
Deps: 99, 122

ROOT PgSelectSingle{11}ᐸleft_armᐳ[122]"):::bucket + Bucket12("Bucket 12 (nullableBoundary)
Deps: 122, 99

ROOT PgSelectSingle{11}ᐸleft_armᐳ[122]"):::bucket classDef bucket12 stroke:#4169e1 class Bucket12,PgClassExpression124,List125,Lambda126,PgClassExpression128,PgClassExpression129,PgClassExpression130 bucket12 Bucket13("Bucket 13 (nullableBoundary)
Deps: 137, 49, 99

ROOT PgSelectSingleᐸpersonᐳ[137]"):::bucket @@ -304,7 +304,7 @@ graph TD Bucket17("Bucket 17 (listItem)
Deps: 164

ROOT __Item{17}ᐸ185ᐳ[186]"):::bucket classDef bucket17 stroke:#696969 class Bucket17,__Item186,PgSelectSingle187 bucket17 - Bucket18("Bucket 18 (nullableBoundary)
Deps: 164, 187

ROOT PgSelectSingle{17}ᐸpostᐳ[187]"):::bucket + Bucket18("Bucket 18 (nullableBoundary)
Deps: 187, 164

ROOT PgSelectSingle{17}ᐸpostᐳ[187]"):::bucket classDef bucket18 stroke:#00bfff class Bucket18,PgClassExpression189,List190,Lambda191,PgClassExpression193,PgClassExpression194,PgClassExpression195 bucket18 Bucket19("Bucket 19 (nullableBoundary)
Deps: 202, 49, 201, 164

ROOT PgSelectSingleᐸpersonᐳ[202]"):::bucket @@ -313,7 +313,7 @@ graph TD Bucket20("Bucket 20 (listItem)
Deps: 164

ROOT __Item{20}ᐸ246ᐳ[222]"):::bucket classDef bucket20 stroke:#ffa500 class Bucket20,__Item222,PgSelectSingle223 bucket20 - Bucket21("Bucket 21 (nullableBoundary)
Deps: 164, 223

ROOT PgSelectSingle{20}ᐸpostᐳ[223]"):::bucket + Bucket21("Bucket 21 (nullableBoundary)
Deps: 223, 164

ROOT PgSelectSingle{20}ᐸpostᐳ[223]"):::bucket classDef bucket21 stroke:#0000ff class Bucket21,PgClassExpression225,List226,Lambda227,PgClassExpression229,PgClassExpression230,PgClassExpression231 bucket21 Bucket22("Bucket 22 (nullableBoundary)
Deps: 237

ROOT PgSelectSingleᐸreturn_table_without_grantsᐳ[237]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/relation-head-tail.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/relation-head-tail.mermaid index 2e25565a28..0e92765f6e 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/relation-head-tail.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/relation-head-tail.mermaid @@ -115,7 +115,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 38, 64, 83, 102

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 38, 64, 83, 102, 22, 21

ROOT PgSelectSingle{2}ᐸpersonᐳ[22]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 21, 38, 64, 83, 102

ROOT PgSelectSingle{2}ᐸpersonᐳ[22]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgClassExpression24,Access147,Reverse148,Access149,Access150,Access151 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ148ᐳ[40]"):::bucket @@ -148,7 +148,7 @@ graph TD Bucket13("Bucket 13 (listItem)
Deps: 140

ROOT __Item{13}ᐸ121ᐳ[122]"):::bucket classDef bucket13 stroke:#3cb371 class Bucket13,__Item122,PgSelectSingle123 bucket13 - Bucket14("Bucket 14 (nullableBoundary)
Deps: 140, 123, 122

ROOT PgSelectSingle{13}ᐸcompound_keyᐳ[123]"):::bucket + Bucket14("Bucket 14 (nullableBoundary)
Deps: 123, 122, 140

ROOT PgSelectSingle{13}ᐸcompound_keyᐳ[123]"):::bucket classDef bucket14 stroke:#a52a2a class Bucket14,PgClassExpression124,PgClassExpression125,Access152 bucket14 Bucket15("Bucket 15 (listItem)
ROOT __Item{15}ᐸ152ᐳ[142]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/simple-procedure-computed-fields.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/simple-procedure-computed-fields.mermaid index e96db2ce65..f5b5f1a9b1 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/simple-procedure-computed-fields.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/simple-procedure-computed-fields.mermaid @@ -414,7 +414,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 49

ROOT __Item{2}ᐸ608ᐳ[33]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item33,PgSelectSingle34 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 49, 34, 33

ROOT PgSelectSingle{2}ᐸperson_friendsᐳ[34]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 34, 33, 49

ROOT PgSelectSingle{2}ᐸperson_friendsᐳ[34]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression35,PgClassExpression37,Access607 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ607ᐳ[51]"):::bucket @@ -426,7 +426,7 @@ graph TD Bucket6("Bucket 6 (listItem)
Deps: 90

ROOT __Item{6}ᐸ612ᐳ[72]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,__Item72,PgSelectSingle73 bucket6 - Bucket7("Bucket 7 (nullableBoundary)
Deps: 90, 73, 72

ROOT PgSelectSingle{6}ᐸpostᐳ[73]"):::bucket + Bucket7("Bucket 7 (nullableBoundary)
Deps: 73, 72, 90

ROOT PgSelectSingle{6}ᐸpostᐳ[73]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgClassExpression74,PgClassExpression78,PgClassExpression79,Access609,Access610 bucket7 Bucket8("Bucket 8 (listItem)
ROOT __Item{8}ᐸ609ᐳ[92]"):::bucket @@ -459,7 +459,7 @@ graph TD Bucket17("Bucket 17 (listItem)
Deps: 191

ROOT __Item{17}ᐸ618ᐳ[173]"):::bucket classDef bucket17 stroke:#696969 class Bucket17,__Item173,PgSelectSingle174 bucket17 - Bucket18("Bucket 18 (nullableBoundary)
Deps: 191, 174, 173

ROOT PgSelectSingle{17}ᐸpostᐳ[174]"):::bucket + Bucket18("Bucket 18 (nullableBoundary)
Deps: 174, 173, 191

ROOT PgSelectSingle{17}ᐸpostᐳ[174]"):::bucket classDef bucket18 stroke:#00bfff class Bucket18,PgClassExpression175,PgClassExpression179,PgClassExpression180,Access616,Access617 bucket18 Bucket19("Bucket 19 (listItem)
ROOT __Item{19}ᐸ616ᐳ[193]"):::bucket @@ -513,13 +513,13 @@ graph TD Bucket35("Bucket 35 (listItem)
Deps: 354, 374, 418, 455, 475, 526, 556, 575

ROOT __Item{35}ᐸ336ᐳ[337]"):::bucket classDef bucket35 stroke:#00bfff class Bucket35,__Item337,PgSelectSingle338 bucket35 - Bucket36("Bucket 36 (nullableBoundary)
Deps: 354, 374, 418, 455, 475, 526, 556, 575, 338, 337

ROOT PgSelectSingle{35}ᐸpersonᐳ[338]"):::bucket + Bucket36("Bucket 36 (nullableBoundary)
Deps: 338, 337, 354, 374, 418, 455, 475, 526, 556, 575

ROOT PgSelectSingle{35}ᐸpersonᐳ[338]"):::bucket classDef bucket36 stroke:#7f007f class Bucket36,PgClassExpression339,PgClassExpression340,Access628,Reverse629,Access632,Access635,Access638,Access639,Access640,Access641,Access642 bucket36 Bucket37("Bucket 37 (listItem)
Deps: 374

ROOT __Item{37}ᐸ629ᐳ[356]"):::bucket classDef bucket37 stroke:#ffa500 class Bucket37,__Item356,PgSelectSingle357 bucket37 - Bucket38("Bucket 38 (nullableBoundary)
Deps: 374, 357, 356

ROOT PgSelectSingle{37}ᐸpostᐳ[357]"):::bucket + Bucket38("Bucket 38 (nullableBoundary)
Deps: 357, 356, 374

ROOT PgSelectSingle{37}ᐸpostᐳ[357]"):::bucket classDef bucket38 stroke:#0000ff class Bucket38,PgClassExpression358,PgClassExpression362,PgClassExpression363,Access626,Access627 bucket38 Bucket39("Bucket 39 (listItem)
ROOT __Item{39}ᐸ626ᐳ[376]"):::bucket @@ -552,7 +552,7 @@ graph TD Bucket48("Bucket 48 (listItem)
Deps: 475

ROOT __Item{48}ᐸ635ᐳ[457]"):::bucket classDef bucket48 stroke:#a52a2a class Bucket48,__Item457,PgSelectSingle458 bucket48 - Bucket49("Bucket 49 (nullableBoundary)
Deps: 475, 458, 457

ROOT PgSelectSingle{48}ᐸpostᐳ[458]"):::bucket + Bucket49("Bucket 49 (nullableBoundary)
Deps: 458, 457, 475

ROOT PgSelectSingle{48}ᐸpostᐳ[458]"):::bucket classDef bucket49 stroke:#ff00ff class Bucket49,PgClassExpression459,PgClassExpression463,PgClassExpression464,Access633,Access634 bucket49 Bucket50("Bucket 50 (listItem)
ROOT __Item{50}ᐸ633ᐳ[477]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/smart_comment_relations.houses.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/smart_comment_relations.houses.mermaid index f248d14a7a..dba476cc47 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/smart_comment_relations.houses.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/smart_comment_relations.houses.mermaid @@ -333,76 +333,76 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 23, 41, 64, 128, 60, 111, 161, 211, 258, 308

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 23, 41, 64, 128, 60, 111, 161, 211, 258, 308, 22

ROOT PgSelectSingle{2}ᐸhousesᐳ[22]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 23, 41, 64, 128, 60, 111, 161, 211, 258, 308

ROOT PgSelectSingle{2}ᐸhousesᐳ[22]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression24,PgClassExpression25,List26,Lambda27,PgClassExpression28,PgClassExpression29,PgClassExpression30,PgClassExpression32,PgSelectSingle40,PgSelectSingle76,PgSelectSingle177,PgSelectSingle228,RemapKeys363,RemapKeys368,RemapKeys378 bucket3 - Bucket4("Bucket 4 (nullableBoundary)
Deps: 41, 64, 60, 40, 22

ROOT PgSelectSingle{3}ᐸstreetsᐳ[40]"):::bucket + Bucket4("Bucket 4 (nullableBoundary)
Deps: 40, 41, 22, 64, 60

ROOT PgSelectSingle{3}ᐸstreetsᐳ[40]"):::bucket classDef bucket4 stroke:#0000ff class Bucket4,PgClassExpression42,List43,Lambda44,PgClassExpression46,Access352 bucket4 Bucket5("Bucket 5 (listItem)
Deps: 64

ROOT __Item{5}ᐸ352ᐳ[62]"):::bucket classDef bucket5 stroke:#7fff00 class Bucket5,__Item62,PgSelectSingle63 bucket5 - Bucket6("Bucket 6 (nullableBoundary)
Deps: 64, 63

ROOT PgSelectSingle{5}ᐸbuildingsᐳ[63]"):::bucket + Bucket6("Bucket 6 (nullableBoundary)
Deps: 63, 64

ROOT PgSelectSingle{5}ᐸbuildingsᐳ[63]"):::bucket classDef bucket6 stroke:#ff1493 class Bucket6,PgClassExpression65,List66,Lambda67,PgClassExpression69 bucket6 - Bucket7("Bucket 7 (nullableBoundary)
Deps: 64, 41, 128, 111, 161, 76

ROOT PgSelectSingle{3}ᐸbuildingsᐳ[76]"):::bucket + Bucket7("Bucket 7 (nullableBoundary)
Deps: 76, 64, 41, 128, 111, 161

ROOT PgSelectSingle{3}ᐸbuildingsᐳ[76]"):::bucket classDef bucket7 stroke:#808000 class Bucket7,PgClassExpression78,List79,Lambda80,PgClassExpression82,PgClassExpression83,PgClassExpression84,PgSelectSingle91,PgSelectSingle127,RemapKeys371,RemapKeys376 bucket7 - Bucket8("Bucket 8 (nullableBoundary)
Deps: 41, 64, 111, 91, 371

ROOT PgSelectSingle{7}ᐸstreetsᐳ[91]"):::bucket + Bucket8("Bucket 8 (nullableBoundary)
Deps: 91, 41, 371, 64, 111

ROOT PgSelectSingle{7}ᐸstreetsᐳ[91]"):::bucket classDef bucket8 stroke:#dda0dd class Bucket8,PgClassExpression93,List94,Lambda95,PgClassExpression97,Access370 bucket8 Bucket9("Bucket 9 (listItem)
Deps: 64

ROOT __Item{9}ᐸ370ᐳ[113]"):::bucket classDef bucket9 stroke:#ff0000 class Bucket9,__Item113,PgSelectSingle114 bucket9 - Bucket10("Bucket 10 (nullableBoundary)
Deps: 64, 114

ROOT PgSelectSingle{9}ᐸbuildingsᐳ[114]"):::bucket + Bucket10("Bucket 10 (nullableBoundary)
Deps: 114, 64

ROOT PgSelectSingle{9}ᐸbuildingsᐳ[114]"):::bucket classDef bucket10 stroke:#ffff00 class Bucket10,PgClassExpression116,List117,Lambda118,PgClassExpression120 bucket10 - Bucket11("Bucket 11 (nullableBoundary)
Deps: 128, 41, 64, 161, 127

ROOT PgSelectSingle{7}ᐸpropertiesᐳ[127]"):::bucket + Bucket11("Bucket 11 (nullableBoundary)
Deps: 127, 128, 41, 64, 161

ROOT PgSelectSingle{7}ᐸpropertiesᐳ[127]"):::bucket classDef bucket11 stroke:#00ffff class Bucket11,PgClassExpression129,List130,Lambda131,PgClassExpression133,PgClassExpression134,PgSelectSingle141,RemapKeys374 bucket11 - Bucket12("Bucket 12 (nullableBoundary)
Deps: 41, 64, 161, 141, 374

ROOT PgSelectSingle{11}ᐸstreetsᐳ[141]"):::bucket + Bucket12("Bucket 12 (nullableBoundary)
Deps: 141, 41, 374, 64, 161

ROOT PgSelectSingle{11}ᐸstreetsᐳ[141]"):::bucket classDef bucket12 stroke:#4169e1 class Bucket12,PgClassExpression143,List144,Lambda145,PgClassExpression147,Access373 bucket12 Bucket13("Bucket 13 (listItem)
Deps: 64

ROOT __Item{13}ᐸ373ᐳ[163]"):::bucket classDef bucket13 stroke:#3cb371 class Bucket13,__Item163,PgSelectSingle164 bucket13 - Bucket14("Bucket 14 (nullableBoundary)
Deps: 64, 164

ROOT PgSelectSingle{13}ᐸbuildingsᐳ[164]"):::bucket + Bucket14("Bucket 14 (nullableBoundary)
Deps: 164, 64

ROOT PgSelectSingle{13}ᐸbuildingsᐳ[164]"):::bucket classDef bucket14 stroke:#a52a2a class Bucket14,PgClassExpression166,List167,Lambda168,PgClassExpression170 bucket14 - Bucket15("Bucket 15 (nullableBoundary)
Deps: 128, 41, 64, 211, 177

ROOT PgSelectSingle{3}ᐸpropertiesᐳ[177]"):::bucket + Bucket15("Bucket 15 (nullableBoundary)
Deps: 177, 128, 41, 64, 211

ROOT PgSelectSingle{3}ᐸpropertiesᐳ[177]"):::bucket classDef bucket15 stroke:#ff00ff class Bucket15,PgClassExpression179,List180,Lambda181,PgClassExpression183,PgClassExpression184,PgSelectSingle191,RemapKeys366 bucket15 - Bucket16("Bucket 16 (nullableBoundary)
Deps: 41, 64, 211, 191, 366

ROOT PgSelectSingle{15}ᐸstreetsᐳ[191]"):::bucket + Bucket16("Bucket 16 (nullableBoundary)
Deps: 191, 41, 366, 64, 211

ROOT PgSelectSingle{15}ᐸstreetsᐳ[191]"):::bucket classDef bucket16 stroke:#f5deb3 class Bucket16,PgClassExpression193,List194,Lambda195,PgClassExpression197,Access365 bucket16 Bucket17("Bucket 17 (listItem)
Deps: 64

ROOT __Item{17}ᐸ365ᐳ[213]"):::bucket classDef bucket17 stroke:#696969 class Bucket17,__Item213,PgSelectSingle214 bucket17 - Bucket18("Bucket 18 (nullableBoundary)
Deps: 64, 214

ROOT PgSelectSingle{17}ᐸbuildingsᐳ[214]"):::bucket + Bucket18("Bucket 18 (nullableBoundary)
Deps: 214, 64

ROOT PgSelectSingle{17}ᐸbuildingsᐳ[214]"):::bucket classDef bucket18 stroke:#00bfff class Bucket18,PgClassExpression216,List217,Lambda218,PgClassExpression220 bucket18 - Bucket19("Bucket 19 (nullableBoundary)
Deps: 41, 64, 128, 258, 308, 228

ROOT PgSelectSingle{3}ᐸstreet_propertyᐳ[228]"):::bucket + Bucket19("Bucket 19 (nullableBoundary)
Deps: 228, 41, 64, 128, 258, 308

ROOT PgSelectSingle{3}ᐸstreet_propertyᐳ[228]"):::bucket classDef bucket19 stroke:#7f007f class Bucket19,PgClassExpression229,PgClassExpression230,PgClassExpression231,PgSelectSingle238,PgSelectSingle274,RemapKeys361 bucket19 - Bucket20("Bucket 20 (nullableBoundary)
Deps: 41, 64, 258, 238, 228

ROOT PgSelectSingle{19}ᐸstreetsᐳ[238]"):::bucket + Bucket20("Bucket 20 (nullableBoundary)
Deps: 238, 41, 228, 64, 258

ROOT PgSelectSingle{19}ᐸstreetsᐳ[238]"):::bucket classDef bucket20 stroke:#ffa500 class Bucket20,PgClassExpression240,List241,Lambda242,PgClassExpression244,Access355 bucket20 Bucket21("Bucket 21 (listItem)
Deps: 64

ROOT __Item{21}ᐸ355ᐳ[260]"):::bucket classDef bucket21 stroke:#0000ff class Bucket21,__Item260,PgSelectSingle261 bucket21 - Bucket22("Bucket 22 (nullableBoundary)
Deps: 64, 261

ROOT PgSelectSingle{21}ᐸbuildingsᐳ[261]"):::bucket + Bucket22("Bucket 22 (nullableBoundary)
Deps: 261, 64

ROOT PgSelectSingle{21}ᐸbuildingsᐳ[261]"):::bucket classDef bucket22 stroke:#7fff00 class Bucket22,PgClassExpression263,List264,Lambda265,PgClassExpression267 bucket22 - Bucket23("Bucket 23 (nullableBoundary)
Deps: 128, 41, 64, 308, 274

ROOT PgSelectSingle{19}ᐸpropertiesᐳ[274]"):::bucket + Bucket23("Bucket 23 (nullableBoundary)
Deps: 274, 128, 41, 64, 308

ROOT PgSelectSingle{19}ᐸpropertiesᐳ[274]"):::bucket classDef bucket23 stroke:#ff1493 class Bucket23,PgClassExpression276,List277,Lambda278,PgClassExpression280,PgClassExpression281,PgSelectSingle288,RemapKeys359 bucket23 - Bucket24("Bucket 24 (nullableBoundary)
Deps: 41, 64, 308, 288, 359

ROOT PgSelectSingle{23}ᐸstreetsᐳ[288]"):::bucket + Bucket24("Bucket 24 (nullableBoundary)
Deps: 288, 41, 359, 64, 308

ROOT PgSelectSingle{23}ᐸstreetsᐳ[288]"):::bucket classDef bucket24 stroke:#808000 class Bucket24,PgClassExpression290,List291,Lambda292,PgClassExpression294,Access358 bucket24 Bucket25("Bucket 25 (listItem)
Deps: 64

ROOT __Item{25}ᐸ358ᐳ[310]"):::bucket classDef bucket25 stroke:#dda0dd class Bucket25,__Item310,PgSelectSingle311 bucket25 - Bucket26("Bucket 26 (nullableBoundary)
Deps: 64, 311

ROOT PgSelectSingle{25}ᐸbuildingsᐳ[311]"):::bucket + Bucket26("Bucket 26 (nullableBoundary)
Deps: 311, 64

ROOT PgSelectSingle{25}ᐸbuildingsᐳ[311]"):::bucket classDef bucket26 stroke:#ff0000 class Bucket26,PgClassExpression313,List314,Lambda315,PgClassExpression317 bucket26 Bucket27("Bucket 27 (nullableBoundary)
Deps: 325, 23

ROOT PgSelectSingleᐸhousesᐳ[325]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/queries/v4/streamLoads.mermaid b/postgraphile/postgraphile/__tests__/queries/v4/streamLoads.mermaid index c0dc7e4063..9e50516ec2 100644 --- a/postgraphile/postgraphile/__tests__/queries/v4/streamLoads.mermaid +++ b/postgraphile/postgraphile/__tests__/queries/v4/streamLoads.mermaid @@ -52,7 +52,7 @@ graph TD Bucket2("Bucket 2 (listItem)
Deps: 18

ROOT __Item{2}ᐸ20ᐳ[21]"):::bucket classDef bucket2 stroke:#7f007f class Bucket2,__Item21,PgSelectSingle22 bucket2 - Bucket3("Bucket 3 (nullableBoundary)
Deps: 18, 22

ROOT PgSelectSingle{2}ᐸpersonᐳ[22]
1:
ᐳ: PgClassExpression[23]
2: PgSelect[29]"):::bucket + Bucket3("Bucket 3 (nullableBoundary)
Deps: 22, 18

ROOT PgSelectSingle{2}ᐸpersonᐳ[22]
1:
ᐳ: PgClassExpression[23]
2: PgSelect[29]"):::bucket classDef bucket3 stroke:#ffa500 class Bucket3,PgClassExpression23,PgSelect29 bucket3 Bucket4("Bucket 4 (listItem)
ROOT __Item{4}ᐸ29ᐳ[33]"):::bucket diff --git a/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.1.export.mjs index ad19a90b6e..90b8d9531f 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.1.export.mjs @@ -30740,7 +30740,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30756,7 +30756,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33254,7 +33254,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33270,7 +33270,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33692,7 +33692,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33708,7 +33708,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34329,7 +34329,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34345,7 +34345,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35414,7 +35414,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35430,7 +35430,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35535,7 +35535,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35551,7 +35551,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35656,7 +35656,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35672,7 +35672,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35777,7 +35777,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35793,7 +35793,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35898,7 +35898,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35914,7 +35914,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36019,7 +36019,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36035,7 +36035,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36558,7 +36558,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36574,7 +36574,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36736,7 +36736,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36752,7 +36752,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36914,7 +36914,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36930,7 +36930,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37149,7 +37149,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37165,7 +37165,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37441,7 +37441,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37457,7 +37457,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38008,7 +38008,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38024,7 +38024,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38549,7 +38549,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38565,7 +38565,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38841,7 +38841,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38857,7 +38857,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.inheritence.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.inheritence.1.export.mjs index a6155fccfb..848795b444 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.inheritence.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.inheritence.1.export.mjs @@ -1807,7 +1807,7 @@ export const plans = { const attribute = userFileCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1823,7 +1823,7 @@ export const plans = { const attribute = userFileCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -2042,7 +2042,7 @@ export const plans = { const attribute = fileCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -2058,7 +2058,7 @@ export const plans = { const attribute = fileCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -2220,7 +2220,7 @@ export const plans = { const attribute = userCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -2236,7 +2236,7 @@ export const plans = { const attribute = userCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.nested_arrays.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.nested_arrays.1.export.mjs index d29c8580c9..7f7b9bea33 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.nested_arrays.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.nested_arrays.1.export.mjs @@ -976,7 +976,7 @@ export const plans = { const attribute = tCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -992,7 +992,7 @@ export const plans = { const attribute = tCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.subscriptions.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.subscriptions.1.export.mjs index ad19a90b6e..90b8d9531f 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.subscriptions.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/defaultOptions.subscriptions.1.export.mjs @@ -30740,7 +30740,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30756,7 +30756,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33254,7 +33254,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33270,7 +33270,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33692,7 +33692,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33708,7 +33708,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34329,7 +34329,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34345,7 +34345,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35414,7 +35414,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35430,7 +35430,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35535,7 +35535,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35551,7 +35551,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35656,7 +35656,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35672,7 +35672,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35777,7 +35777,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35793,7 +35793,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35898,7 +35898,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35914,7 +35914,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36019,7 +36019,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36035,7 +36035,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36558,7 +36558,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36574,7 +36574,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36736,7 +36736,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36752,7 +36752,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36914,7 +36914,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36930,7 +36930,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37149,7 +37149,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37165,7 +37165,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37441,7 +37441,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37457,7 +37457,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38008,7 +38008,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38024,7 +38024,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38549,7 +38549,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38565,7 +38565,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38841,7 +38841,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38857,7 +38857,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/enum_tables.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/enum_tables.1.export.mjs index 1d003377a8..322bb08498 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/enum_tables.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/enum_tables.1.export.mjs @@ -2368,7 +2368,7 @@ export const plans = { const attribute = letterDescriptionsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -2384,7 +2384,7 @@ export const plans = { const attribute = letterDescriptionsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -2660,7 +2660,7 @@ export const plans = { const attribute = referencingTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -2676,7 +2676,7 @@ export const plans = { const attribute = referencingTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/foreignKey-smart-tag-autofix.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/foreignKey-smart-tag-autofix.1.export.mjs index 2845d728d7..9957152a0c 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/foreignKey-smart-tag-autofix.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/foreignKey-smart-tag-autofix.1.export.mjs @@ -16046,7 +16046,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16062,7 +16062,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16734,7 +16734,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16750,7 +16750,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16969,7 +16969,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16985,7 +16985,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17785,7 +17785,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17801,7 +17801,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17963,7 +17963,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17979,7 +17979,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18504,7 +18504,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18520,7 +18520,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18796,7 +18796,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18812,7 +18812,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/foreignKey-smart-tag-good.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/foreignKey-smart-tag-good.1.export.mjs index f123f9fedf..8e35320594 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/foreignKey-smart-tag-good.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/foreignKey-smart-tag-good.1.export.mjs @@ -16098,7 +16098,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16114,7 +16114,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16786,7 +16786,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16802,7 +16802,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17021,7 +17021,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17037,7 +17037,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17837,7 +17837,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17853,7 +17853,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18015,7 +18015,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18031,7 +18031,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18556,7 +18556,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18572,7 +18572,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18848,7 +18848,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18864,7 +18864,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/function-clash-with-tags-file-workaround.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/function-clash-with-tags-file-workaround.1.export.mjs index eaf0f44936..672029c57d 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/function-clash-with-tags-file-workaround.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/function-clash-with-tags-file-workaround.1.export.mjs @@ -30629,7 +30629,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30645,7 +30645,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33143,7 +33143,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33159,7 +33159,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33581,7 +33581,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33597,7 +33597,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34218,7 +34218,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34234,7 +34234,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35303,7 +35303,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35319,7 +35319,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35424,7 +35424,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35440,7 +35440,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35545,7 +35545,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35561,7 +35561,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35666,7 +35666,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35682,7 +35682,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35787,7 +35787,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35803,7 +35803,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35908,7 +35908,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35924,7 +35924,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36447,7 +36447,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36463,7 +36463,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36625,7 +36625,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36641,7 +36641,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36803,7 +36803,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36819,7 +36819,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37038,7 +37038,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37054,7 +37054,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37330,7 +37330,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37346,7 +37346,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37897,7 +37897,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37913,7 +37913,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38438,7 +38438,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38454,7 +38454,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38730,7 +38730,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38746,7 +38746,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/function-clash.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/function-clash.1.export.mjs index faf876a14f..c2e749bd68 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/function-clash.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/function-clash.1.export.mjs @@ -30768,7 +30768,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30784,7 +30784,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33282,7 +33282,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33298,7 +33298,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33720,7 +33720,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33736,7 +33736,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34357,7 +34357,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34373,7 +34373,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35442,7 +35442,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35458,7 +35458,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35563,7 +35563,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35579,7 +35579,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35684,7 +35684,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35700,7 +35700,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35805,7 +35805,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35821,7 +35821,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35926,7 +35926,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35942,7 +35942,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36047,7 +36047,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36063,7 +36063,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36586,7 +36586,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36602,7 +36602,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36764,7 +36764,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36780,7 +36780,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36942,7 +36942,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36958,7 +36958,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37177,7 +37177,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37193,7 +37193,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37469,7 +37469,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37485,7 +37485,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38036,7 +38036,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38052,7 +38052,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38577,7 +38577,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38593,7 +38593,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38869,7 +38869,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38885,7 +38885,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/geometry.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/geometry.1.export.mjs index 4dadfde22e..f895d384d2 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/geometry.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/geometry.1.export.mjs @@ -940,7 +940,7 @@ export const plans = { const attribute = geomCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -956,7 +956,7 @@ export const plans = { const attribute = geomCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/indexes.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/indexes.1.export.mjs index bd024cbde1..e017225644 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/indexes.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/indexes.1.export.mjs @@ -30205,7 +30205,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30221,7 +30221,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30386,7 +30386,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30402,7 +30402,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30552,7 +30552,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30568,7 +30568,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30787,7 +30787,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30803,7 +30803,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31483,7 +31483,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31499,7 +31499,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31604,7 +31604,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31620,7 +31620,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31725,7 +31725,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31741,7 +31741,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31846,7 +31846,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31862,7 +31862,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31967,7 +31967,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31983,7 +31983,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32088,7 +32088,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32104,7 +32104,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32393,7 +32393,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32409,7 +32409,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32514,7 +32514,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32530,7 +32530,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32635,7 +32635,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32651,7 +32651,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32756,7 +32756,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32772,7 +32772,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32877,7 +32877,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32893,7 +32893,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33043,7 +33043,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33059,7 +33059,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33240,7 +33240,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33256,7 +33256,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33418,7 +33418,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33434,7 +33434,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/indexes.index_expressions.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/indexes.index_expressions.1.export.mjs index 661218c52d..cb016dfad7 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/indexes.index_expressions.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/indexes.index_expressions.1.export.mjs @@ -514,7 +514,7 @@ export const plans = { const attribute = employeeCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -530,7 +530,7 @@ export const plans = { const attribute = employeeCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/inflect-core.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/inflect-core.1.export.mjs index 494a8d1361..f3a93d0c2f 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/inflect-core.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/inflect-core.1.export.mjs @@ -30745,7 +30745,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30761,7 +30761,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33259,7 +33259,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33275,7 +33275,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33697,7 +33697,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33713,7 +33713,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34334,7 +34334,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34350,7 +34350,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35419,7 +35419,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35435,7 +35435,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35540,7 +35540,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35556,7 +35556,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35661,7 +35661,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35677,7 +35677,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35782,7 +35782,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35798,7 +35798,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35903,7 +35903,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35919,7 +35919,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36024,7 +36024,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36040,7 +36040,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36563,7 +36563,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36579,7 +36579,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36741,7 +36741,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36757,7 +36757,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36919,7 +36919,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36935,7 +36935,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37154,7 +37154,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37170,7 +37170,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37446,7 +37446,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37462,7 +37462,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38013,7 +38013,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38029,7 +38029,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38554,7 +38554,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38570,7 +38570,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38846,7 +38846,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38862,7 +38862,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/js-reserved.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/js-reserved.1.export.mjs index d72069c63f..5e47485e03 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/js-reserved.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/js-reserved.1.export.mjs @@ -6980,7 +6980,7 @@ export const plans = { const attribute = machineCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6996,7 +6996,7 @@ export const plans = { const attribute = machineCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -7215,7 +7215,7 @@ export const plans = { const attribute = relationalItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -7231,7 +7231,7 @@ export const plans = { const attribute = relationalItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -9212,7 +9212,7 @@ export const plans = { const attribute = relationalTopicsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -9228,7 +9228,7 @@ export const plans = { const attribute = relationalTopicsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -9504,7 +9504,7 @@ export const plans = { const attribute = __proto__Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -9520,7 +9520,7 @@ export const plans = { const attribute = __proto__Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -9739,7 +9739,7 @@ export const plans = { const attribute = buildingCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -9755,7 +9755,7 @@ export const plans = { const attribute = buildingCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -9974,7 +9974,7 @@ export const plans = { const attribute = constructorCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -9990,7 +9990,7 @@ export const plans = { const attribute = constructorCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -10209,7 +10209,7 @@ export const plans = { const attribute = cropCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -10225,7 +10225,7 @@ export const plans = { const attribute = cropCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -10444,7 +10444,7 @@ export const plans = { const attribute = materialCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -10460,7 +10460,7 @@ export const plans = { const attribute = materialCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -10679,7 +10679,7 @@ export const plans = { const attribute = nullCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -10695,7 +10695,7 @@ export const plans = { const attribute = nullCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -10914,7 +10914,7 @@ export const plans = { const attribute = projectCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -10930,7 +10930,7 @@ export const plans = { const attribute = projectCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -11149,7 +11149,7 @@ export const plans = { const attribute = relationalStatusCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -11165,7 +11165,7 @@ export const plans = { const attribute = relationalStatusCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -11498,7 +11498,7 @@ export const plans = { const attribute = yieldCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -11514,7 +11514,7 @@ export const plans = { const attribute = yieldCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -11733,7 +11733,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -11749,7 +11749,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/jwt.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/jwt.1.export.mjs index 95256b358b..461204c0e6 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/jwt.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/jwt.1.export.mjs @@ -5757,7 +5757,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5773,7 +5773,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/network_types.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/network_types.1.export.mjs index 1978923c0f..a0c8ed5d48 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/network_types.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/network_types.1.export.mjs @@ -748,7 +748,7 @@ export const plans = { const attribute = networkCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -764,7 +764,7 @@ export const plans = { const attribute = networkCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/network_types.custom.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/network_types.custom.1.export.mjs index 25c9b29e42..388179753c 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/network_types.custom.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/network_types.custom.1.export.mjs @@ -754,7 +754,7 @@ export const plans = { const attribute = networkCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -770,7 +770,7 @@ export const plans = { const attribute = networkCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/noDefaultMutations.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/noDefaultMutations.1.export.mjs index 47ad029c03..9f0385f0f4 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/noDefaultMutations.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/noDefaultMutations.1.export.mjs @@ -14277,7 +14277,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -14293,7 +14293,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -14965,7 +14965,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -14981,7 +14981,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15838,7 +15838,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15854,7 +15854,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16016,7 +16016,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16032,7 +16032,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16194,7 +16194,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16210,7 +16210,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16735,7 +16735,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16751,7 +16751,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17027,7 +17027,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17043,7 +17043,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.1.export.mjs index 9950993367..9f66642e7a 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.1.export.mjs @@ -4552,7 +4552,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4568,7 +4568,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4771,7 +4771,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4787,7 +4787,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5151,7 +5151,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5167,7 +5167,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5481,7 +5481,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5497,7 +5497,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5659,7 +5659,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5675,7 +5675,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5837,7 +5837,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5853,7 +5853,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.1.export.mjs index fff94dffcb..d988c17e66 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.1.export.mjs @@ -4554,7 +4554,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4570,7 +4570,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4773,7 +4773,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4789,7 +4789,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5153,7 +5153,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5169,7 +5169,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5483,7 +5483,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5499,7 +5499,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5661,7 +5661,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5677,7 +5677,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5839,7 +5839,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5855,7 +5855,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.execute.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.execute.1.export.mjs index 2051bea3dc..cadde0032d 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.execute.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.execute.1.export.mjs @@ -4429,7 +4429,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4445,7 +4445,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4648,7 +4648,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4664,7 +4664,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4994,7 +4994,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5010,7 +5010,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5324,7 +5324,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5340,7 +5340,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5502,7 +5502,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5518,7 +5518,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5680,7 +5680,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5696,7 +5696,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.loads-title.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.loads-title.1.export.mjs index a5cdfd5794..9f9d412ce9 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.loads-title.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.loads-title.1.export.mjs @@ -4549,7 +4549,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4565,7 +4565,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4768,7 +4768,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4784,7 +4784,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5148,7 +5148,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5164,7 +5164,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5478,7 +5478,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5494,7 +5494,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5656,7 +5656,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5672,7 +5672,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5834,7 +5834,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5850,7 +5850,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.shows-title-asterisk.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.shows-title-asterisk.1.export.mjs index d333726957..b7fa59e944 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.shows-title-asterisk.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.shows-title-asterisk.1.export.mjs @@ -4536,7 +4536,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4552,7 +4552,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4698,7 +4698,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4714,7 +4714,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5021,7 +5021,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5037,7 +5037,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5351,7 +5351,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5367,7 +5367,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5529,7 +5529,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5545,7 +5545,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5707,7 +5707,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5723,7 +5723,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.title-order.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.title-order.1.export.mjs index 2b8d0e347c..057bab5a35 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.title-order.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.title-order.1.export.mjs @@ -4553,7 +4553,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4569,7 +4569,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4738,7 +4738,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4754,7 +4754,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5118,7 +5118,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5134,7 +5134,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5448,7 +5448,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5464,7 +5464,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5626,7 +5626,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5642,7 +5642,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5804,7 +5804,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5820,7 +5820,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.update-title.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.update-title.1.export.mjs index 484018095c..673d61be7a 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.update-title.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitcolumns.update-title.1.export.mjs @@ -4554,7 +4554,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4570,7 +4570,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4773,7 +4773,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4789,7 +4789,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5153,7 +5153,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5169,7 +5169,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5483,7 +5483,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5499,7 +5499,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5661,7 +5661,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5677,7 +5677,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5839,7 +5839,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5855,7 +5855,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.1.export.mjs index 4f2c9efe56..f674c1aff9 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.1.export.mjs @@ -4359,7 +4359,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4375,7 +4375,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4578,7 +4578,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4594,7 +4594,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4958,7 +4958,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4974,7 +4974,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5288,7 +5288,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5304,7 +5304,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5466,7 +5466,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5482,7 +5482,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5644,7 +5644,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5660,7 +5660,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.constraints.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.constraints.1.export.mjs index dedac9df9d..1cbdead211 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.constraints.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.constraints.1.export.mjs @@ -4555,7 +4555,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4571,7 +4571,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4733,7 +4733,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4749,7 +4749,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4886,7 +4886,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4902,7 +4902,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5121,7 +5121,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5137,7 +5137,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5356,7 +5356,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5372,7 +5372,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5591,7 +5591,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5607,7 +5607,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-asterisk.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-asterisk.1.export.mjs index 29e54375fe..2226547d10 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-asterisk.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-asterisk.1.export.mjs @@ -3642,7 +3642,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -3658,7 +3658,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -3988,7 +3988,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4004,7 +4004,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4166,7 +4166,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4182,7 +4182,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4401,7 +4401,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4417,7 +4417,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-create.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-create.1.export.mjs index 9873accd1f..dfdd112ebe 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-create.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-create.1.export.mjs @@ -4510,7 +4510,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4526,7 +4526,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4729,7 +4729,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4745,7 +4745,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5109,7 +5109,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5125,7 +5125,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5439,7 +5439,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5455,7 +5455,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5617,7 +5617,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5633,7 +5633,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5795,7 +5795,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5811,7 +5811,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-delete.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-delete.1.export.mjs index 574bbc4bcf..471d7b2688 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-delete.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-delete.1.export.mjs @@ -4491,7 +4491,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4507,7 +4507,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4710,7 +4710,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4726,7 +4726,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5090,7 +5090,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5106,7 +5106,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5420,7 +5420,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5436,7 +5436,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5598,7 +5598,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5614,7 +5614,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5776,7 +5776,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5792,7 +5792,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-loads.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-loads.1.export.mjs index 7224818dde..cc24e570b2 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-loads.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-loads.1.export.mjs @@ -4149,7 +4149,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4165,7 +4165,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4368,7 +4368,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4384,7 +4384,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4748,7 +4748,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4764,7 +4764,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5078,7 +5078,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5094,7 +5094,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5256,7 +5256,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5272,7 +5272,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-update.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-update.1.export.mjs index cf111d2dcc..5034489877 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-update.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.films-update.1.export.mjs @@ -4476,7 +4476,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4492,7 +4492,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4695,7 +4695,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4711,7 +4711,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5075,7 +5075,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5091,7 +5091,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5405,7 +5405,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5421,7 +5421,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5583,7 +5583,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5599,7 +5599,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5761,7 +5761,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5777,7 +5777,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.shows-order.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.shows-order.1.export.mjs index cf1ea24ecc..76c6d95271 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.shows-order.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/omit-rename.omitstuff.shows-order.1.export.mjs @@ -4503,7 +4503,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4519,7 +4519,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4963,7 +4963,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4979,7 +4979,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5293,7 +5293,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5309,7 +5309,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5471,7 +5471,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5487,7 +5487,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5649,7 +5649,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5665,7 +5665,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/partitions.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/partitions.1.export.mjs index c1f34c3aef..3679427f25 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/partitions.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/partitions.1.export.mjs @@ -1375,7 +1375,7 @@ export const plans = { const attribute = measurementsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1391,7 +1391,7 @@ export const plans = { const attribute = measurementsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1667,7 +1667,7 @@ export const plans = { const attribute = usersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1683,7 +1683,7 @@ export const plans = { const attribute = usersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/pg11.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/pg11.1.export.mjs index a6188e93bf..721c4f5591 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/pg11.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/pg11.1.export.mjs @@ -2648,7 +2648,7 @@ export const plans = { const attribute = alwaysAsIdentityCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -2664,7 +2664,7 @@ export const plans = { const attribute = alwaysAsIdentityCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -2826,7 +2826,7 @@ export const plans = { const attribute = byDefaultAsIdentityCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -2842,7 +2842,7 @@ export const plans = { const attribute = byDefaultAsIdentityCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -3004,7 +3004,7 @@ export const plans = { const attribute = networkCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -3020,7 +3020,7 @@ export const plans = { const attribute = networkCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -3353,7 +3353,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -3369,7 +3369,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/pg11.custom.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/pg11.custom.1.export.mjs index 5ee5f2c104..6a5a9f0a6b 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/pg11.custom.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/pg11.custom.1.export.mjs @@ -2657,7 +2657,7 @@ export const plans = { const attribute = alwaysAsIdentityCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -2673,7 +2673,7 @@ export const plans = { const attribute = alwaysAsIdentityCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -2835,7 +2835,7 @@ export const plans = { const attribute = byDefaultAsIdentityCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -2851,7 +2851,7 @@ export const plans = { const attribute = byDefaultAsIdentityCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -3013,7 +3013,7 @@ export const plans = { const attribute = networkCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -3029,7 +3029,7 @@ export const plans = { const attribute = networkCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -3362,7 +3362,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -3378,7 +3378,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/polymorphic.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/polymorphic.1.export.mjs index bbd63838c3..0817d956f5 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/polymorphic.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/polymorphic.1.export.mjs @@ -14895,7 +14895,7 @@ export const plans = { const attribute = logEntriesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -14911,7 +14911,7 @@ export const plans = { const attribute = logEntriesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15598,7 +15598,7 @@ export const plans = { const attribute = awsApplicationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15614,7 +15614,7 @@ export const plans = { const attribute = awsApplicationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16150,7 +16150,7 @@ export const plans = { const attribute = gcpApplicationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16166,7 +16166,7 @@ export const plans = { const attribute = gcpApplicationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16565,7 +16565,7 @@ export const plans = { const attribute = singleTableItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16581,7 +16581,7 @@ export const plans = { const attribute = singleTableItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17298,7 +17298,7 @@ export const plans = { const attribute = relationalItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17314,7 +17314,7 @@ export const plans = { const attribute = relationalItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18184,7 +18184,7 @@ export const plans = { const attribute = singleTableItemRelationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18200,7 +18200,7 @@ export const plans = { const attribute = singleTableItemRelationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18394,7 +18394,7 @@ export const plans = { const attribute = singleTableItemRelationCompositePksCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18410,7 +18410,7 @@ export const plans = { const attribute = singleTableItemRelationCompositePksCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -20517,7 +20517,7 @@ export const plans = { const attribute = relationalItemRelationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -20533,7 +20533,7 @@ export const plans = { const attribute = relationalItemRelationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -20727,7 +20727,7 @@ export const plans = { const attribute = relationalItemRelationCompositePksCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -20743,7 +20743,7 @@ export const plans = { const attribute = relationalItemRelationCompositePksCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -24881,7 +24881,7 @@ export const plans = { const attribute = organizationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -24897,7 +24897,7 @@ export const plans = { const attribute = organizationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -25059,7 +25059,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -25075,7 +25075,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -25262,7 +25262,7 @@ export const plans = { const attribute = relationalChecklistsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -25278,7 +25278,7 @@ export const plans = { const attribute = relationalChecklistsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -25953,7 +25953,7 @@ export const plans = { const attribute = relationalTopicsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -25969,7 +25969,7 @@ export const plans = { const attribute = relationalTopicsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -26644,7 +26644,7 @@ export const plans = { const attribute = relationalChecklistItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -26660,7 +26660,7 @@ export const plans = { const attribute = relationalChecklistItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -27392,7 +27392,7 @@ export const plans = { const attribute = relationalDividersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -27408,7 +27408,7 @@ export const plans = { const attribute = relationalDividersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -28140,7 +28140,7 @@ export const plans = { const attribute = relationalPostsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -28156,7 +28156,7 @@ export const plans = { const attribute = relationalPostsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -28945,7 +28945,7 @@ export const plans = { const attribute = firstPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -28961,7 +28961,7 @@ export const plans = { const attribute = firstPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -29237,7 +29237,7 @@ export const plans = { const attribute = thirdPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -29253,7 +29253,7 @@ export const plans = { const attribute = thirdPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/rbac.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/rbac.1.export.mjs index b50784c635..e12726f96d 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/rbac.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/rbac.1.export.mjs @@ -10764,7 +10764,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -10780,7 +10780,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -11102,7 +11102,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -11118,7 +11118,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -11280,7 +11280,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -11296,7 +11296,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -11572,7 +11572,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -11588,7 +11588,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/rbac.ignore.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/rbac.ignore.1.export.mjs index ad19a90b6e..90b8d9531f 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/rbac.ignore.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/rbac.ignore.1.export.mjs @@ -30740,7 +30740,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30756,7 +30756,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33254,7 +33254,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33270,7 +33270,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33692,7 +33692,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33708,7 +33708,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34329,7 +34329,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34345,7 +34345,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35414,7 +35414,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35430,7 +35430,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35535,7 +35535,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35551,7 +35551,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35656,7 +35656,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35672,7 +35672,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35777,7 +35777,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35793,7 +35793,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35898,7 +35898,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35914,7 +35914,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36019,7 +36019,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36035,7 +36035,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36558,7 +36558,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36574,7 +36574,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36736,7 +36736,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36752,7 +36752,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36914,7 +36914,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36930,7 +36930,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37149,7 +37149,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37165,7 +37165,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37441,7 +37441,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37457,7 +37457,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38008,7 +38008,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38024,7 +38024,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38549,7 +38549,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38565,7 +38565,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38841,7 +38841,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38857,7 +38857,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/refs.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/refs.1.export.mjs index a2edb3b4f2..81ad07f9f3 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/refs.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/refs.1.export.mjs @@ -826,7 +826,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -842,7 +842,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1004,7 +1004,7 @@ export const plans = { const attribute = postsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1020,7 +1020,7 @@ export const plans = { const attribute = postsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/relay.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/relay.1.export.mjs index 305e539741..359ffb522c 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/relay.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/relay.1.export.mjs @@ -4118,7 +4118,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4134,7 +4134,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4473,7 +4473,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4489,7 +4489,7 @@ export const plans = { const attribute = tvEpisodesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4610,7 +4610,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4626,7 +4626,7 @@ export const plans = { const attribute = tvShowsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4858,7 +4858,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4874,7 +4874,7 @@ export const plans = { const attribute = filmsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4979,7 +4979,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4995,7 +4995,7 @@ export const plans = { const attribute = studiosCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5100,7 +5100,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5116,7 +5116,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/relay1.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/relay1.1.export.mjs index c7320a2ef7..2f835c37d3 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/relay1.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/relay1.1.export.mjs @@ -15903,7 +15903,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15919,7 +15919,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16591,7 +16591,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16607,7 +16607,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17464,7 +17464,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17480,7 +17480,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17642,7 +17642,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17658,7 +17658,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17820,7 +17820,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17836,7 +17836,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18361,7 +18361,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18377,7 +18377,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18653,7 +18653,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18669,7 +18669,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.1.export.mjs index 2a5f35fdb8..2c0594dc94 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.1.export.mjs @@ -16770,7 +16770,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16786,7 +16786,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17458,7 +17458,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17474,7 +17474,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18306,7 +18306,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18322,7 +18322,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18484,7 +18484,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18500,7 +18500,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18662,7 +18662,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18678,7 +18678,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -19203,7 +19203,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -19219,7 +19219,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -19495,7 +19495,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -19511,7 +19511,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.omit-pets-simple.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.omit-pets-simple.1.export.mjs index edcd9c3e8c..736d2f4f34 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.omit-pets-simple.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.omit-pets-simple.1.export.mjs @@ -1469,7 +1469,7 @@ export const plans = { const attribute = petsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1485,7 +1485,7 @@ export const plans = { const attribute = petsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1704,7 +1704,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1720,7 +1720,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.only-people-omit.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.only-people-omit.1.export.mjs index 8f404d9d88..306a57cd35 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.only-people-omit.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.only-people-omit.1.export.mjs @@ -1326,7 +1326,7 @@ export const plans = { const attribute = petsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1342,7 +1342,7 @@ export const plans = { const attribute = petsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1576,7 +1576,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1592,7 +1592,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.only.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.only.1.export.mjs index 42ec8e32e3..7446912395 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.only.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.only.1.export.mjs @@ -14417,7 +14417,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -14433,7 +14433,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15055,7 +15055,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15071,7 +15071,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15728,7 +15728,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15744,7 +15744,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15881,7 +15881,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15897,7 +15897,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16034,7 +16034,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16050,7 +16050,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16525,7 +16525,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16541,7 +16541,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16792,7 +16792,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16808,7 +16808,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.pets-simple.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.pets-simple.1.export.mjs index 31768309c6..930b17e00a 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.pets-simple.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/simple-collections.pets-simple.1.export.mjs @@ -1478,7 +1478,7 @@ export const plans = { const attribute = petsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1494,7 +1494,7 @@ export const plans = { const attribute = petsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1713,7 +1713,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -1729,7 +1729,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/simplePrint.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/simplePrint.export.mjs index ad19a90b6e..90b8d9531f 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/simplePrint.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/simplePrint.export.mjs @@ -30740,7 +30740,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30756,7 +30756,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33254,7 +33254,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33270,7 +33270,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33692,7 +33692,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33708,7 +33708,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34329,7 +34329,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34345,7 +34345,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35414,7 +35414,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35430,7 +35430,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35535,7 +35535,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35551,7 +35551,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35656,7 +35656,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35672,7 +35672,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35777,7 +35777,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35793,7 +35793,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35898,7 +35898,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35914,7 +35914,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36019,7 +36019,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36035,7 +36035,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36558,7 +36558,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36574,7 +36574,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36736,7 +36736,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36752,7 +36752,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36914,7 +36914,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36930,7 +36930,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37149,7 +37149,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37165,7 +37165,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37441,7 +37441,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -37457,7 +37457,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38008,7 +38008,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38024,7 +38024,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38549,7 +38549,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38565,7 +38565,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38841,7 +38841,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -38857,7 +38857,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/skipNodePlugin.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/skipNodePlugin.1.export.mjs index e252dacf51..e07c47b23a 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/skipNodePlugin.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/skipNodePlugin.1.export.mjs @@ -28696,7 +28696,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -28712,7 +28712,7 @@ export const plans = { const attribute = typesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31210,7 +31210,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31226,7 +31226,7 @@ export const plans = { const attribute = personCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31648,7 +31648,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31664,7 +31664,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32277,7 +32277,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32293,7 +32293,7 @@ export const plans = { const attribute = compoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33338,7 +33338,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33354,7 +33354,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33459,7 +33459,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33475,7 +33475,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33580,7 +33580,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33596,7 +33596,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33701,7 +33701,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33717,7 +33717,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33822,7 +33822,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33838,7 +33838,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33943,7 +33943,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33959,7 +33959,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34482,7 +34482,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34498,7 +34498,7 @@ export const plans = { const attribute = myTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34660,7 +34660,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34676,7 +34676,7 @@ export const plans = { const attribute = personSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34838,7 +34838,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34854,7 +34854,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35073,7 +35073,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35089,7 +35089,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35365,7 +35365,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35381,7 +35381,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35932,7 +35932,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35948,7 +35948,7 @@ export const plans = { const attribute = nullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36473,7 +36473,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36489,7 +36489,7 @@ export const plans = { const attribute = leftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36765,7 +36765,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36781,7 +36781,7 @@ export const plans = { const attribute = issue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/skipNodePlugin.polymorphic.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/skipNodePlugin.polymorphic.1.export.mjs index 122ef31279..0a435aa3af 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/skipNodePlugin.polymorphic.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/skipNodePlugin.polymorphic.1.export.mjs @@ -13088,7 +13088,7 @@ export const plans = { const attribute = logEntriesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -13104,7 +13104,7 @@ export const plans = { const attribute = logEntriesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -13787,7 +13787,7 @@ export const plans = { const attribute = awsApplicationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -13803,7 +13803,7 @@ export const plans = { const attribute = awsApplicationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -14335,7 +14335,7 @@ export const plans = { const attribute = gcpApplicationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -14351,7 +14351,7 @@ export const plans = { const attribute = gcpApplicationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -14750,7 +14750,7 @@ export const plans = { const attribute = singleTableItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -14766,7 +14766,7 @@ export const plans = { const attribute = singleTableItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15475,7 +15475,7 @@ export const plans = { const attribute = relationalItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15491,7 +15491,7 @@ export const plans = { const attribute = relationalItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16353,7 +16353,7 @@ export const plans = { const attribute = singleTableItemRelationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16369,7 +16369,7 @@ export const plans = { const attribute = singleTableItemRelationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16563,7 +16563,7 @@ export const plans = { const attribute = singleTableItemRelationCompositePksCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16579,7 +16579,7 @@ export const plans = { const attribute = singleTableItemRelationCompositePksCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18662,7 +18662,7 @@ export const plans = { const attribute = relationalItemRelationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18678,7 +18678,7 @@ export const plans = { const attribute = relationalItemRelationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18872,7 +18872,7 @@ export const plans = { const attribute = relationalItemRelationCompositePksCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18888,7 +18888,7 @@ export const plans = { const attribute = relationalItemRelationCompositePksCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -22792,7 +22792,7 @@ export const plans = { const attribute = organizationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -22808,7 +22808,7 @@ export const plans = { const attribute = organizationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -22970,7 +22970,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -22986,7 +22986,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -23173,7 +23173,7 @@ export const plans = { const attribute = relationalChecklistsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -23189,7 +23189,7 @@ export const plans = { const attribute = relationalChecklistsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -23864,7 +23864,7 @@ export const plans = { const attribute = relationalTopicsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -23880,7 +23880,7 @@ export const plans = { const attribute = relationalTopicsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -24555,7 +24555,7 @@ export const plans = { const attribute = relationalChecklistItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -24571,7 +24571,7 @@ export const plans = { const attribute = relationalChecklistItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -25303,7 +25303,7 @@ export const plans = { const attribute = relationalDividersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -25319,7 +25319,7 @@ export const plans = { const attribute = relationalDividersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -26051,7 +26051,7 @@ export const plans = { const attribute = relationalPostsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -26067,7 +26067,7 @@ export const plans = { const attribute = relationalPostsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -26856,7 +26856,7 @@ export const plans = { const attribute = firstPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -26872,7 +26872,7 @@ export const plans = { const attribute = firstPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -27148,7 +27148,7 @@ export const plans = { const attribute = thirdPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -27164,7 +27164,7 @@ export const plans = { const attribute = thirdPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.1.export.mjs index f703b1d42b..843c5f056d 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.1.export.mjs @@ -4435,7 +4435,7 @@ export const plans = { const attribute = offersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4451,7 +4451,7 @@ export const plans = { const attribute = offersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5240,7 +5240,7 @@ export const plans = { const attribute = housesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5256,7 +5256,7 @@ export const plans = { const attribute = housesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5687,7 +5687,7 @@ export const plans = { const attribute = streetPropertyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5703,7 +5703,7 @@ export const plans = { const attribute = streetPropertyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5922,7 +5922,7 @@ export const plans = { const attribute = buildingsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5938,7 +5938,7 @@ export const plans = { const attribute = buildingsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6255,7 +6255,7 @@ export const plans = { const attribute = propertiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6271,7 +6271,7 @@ export const plans = { const attribute = propertiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6490,7 +6490,7 @@ export const plans = { const attribute = postsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6506,7 +6506,7 @@ export const plans = { const attribute = postsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6611,7 +6611,7 @@ export const plans = { const attribute = streetsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6627,7 +6627,7 @@ export const plans = { const attribute = streetsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.post.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.post.1.export.mjs index ec8d5a1686..b8a8bbc6bd 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.post.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.post.1.export.mjs @@ -4957,7 +4957,7 @@ export const plans = { const attribute = housesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4973,7 +4973,7 @@ export const plans = { const attribute = housesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5404,7 +5404,7 @@ export const plans = { const attribute = streetPropertyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5420,7 +5420,7 @@ export const plans = { const attribute = streetPropertyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5639,7 +5639,7 @@ export const plans = { const attribute = buildingsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5655,7 +5655,7 @@ export const plans = { const attribute = buildingsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5972,7 +5972,7 @@ export const plans = { const attribute = propertiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5988,7 +5988,7 @@ export const plans = { const attribute = propertiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6207,7 +6207,7 @@ export const plans = { const attribute = postsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6223,7 +6223,7 @@ export const plans = { const attribute = postsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6328,7 +6328,7 @@ export const plans = { const attribute = offersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6344,7 +6344,7 @@ export const plans = { const attribute = offersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6506,7 +6506,7 @@ export const plans = { const attribute = streetsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6522,7 +6522,7 @@ export const plans = { const attribute = streetsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.post_view.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.post_view.1.export.mjs index 8b5839c408..d14b37e878 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.post_view.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.post_view.1.export.mjs @@ -4435,7 +4435,7 @@ export const plans = { const attribute = offersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4451,7 +4451,7 @@ export const plans = { const attribute = offersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5240,7 +5240,7 @@ export const plans = { const attribute = housesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5256,7 +5256,7 @@ export const plans = { const attribute = housesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5687,7 +5687,7 @@ export const plans = { const attribute = streetPropertyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5703,7 +5703,7 @@ export const plans = { const attribute = streetPropertyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5922,7 +5922,7 @@ export const plans = { const attribute = buildingsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5938,7 +5938,7 @@ export const plans = { const attribute = buildingsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6255,7 +6255,7 @@ export const plans = { const attribute = propertiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6271,7 +6271,7 @@ export const plans = { const attribute = propertiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6490,7 +6490,7 @@ export const plans = { const attribute = postsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6506,7 +6506,7 @@ export const plans = { const attribute = postsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6611,7 +6611,7 @@ export const plans = { const attribute = streetsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6627,7 +6627,7 @@ export const plans = { const attribute = streetsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.post_view_no_pk.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.post_view_no_pk.1.export.mjs index fae4b856b3..5fa55f3cff 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.post_view_no_pk.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.post_view_no_pk.1.export.mjs @@ -4217,7 +4217,7 @@ export const plans = { const attribute = offersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4233,7 +4233,7 @@ export const plans = { const attribute = offersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5022,7 +5022,7 @@ export const plans = { const attribute = housesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5038,7 +5038,7 @@ export const plans = { const attribute = housesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5469,7 +5469,7 @@ export const plans = { const attribute = streetPropertyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5485,7 +5485,7 @@ export const plans = { const attribute = streetPropertyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5704,7 +5704,7 @@ export const plans = { const attribute = buildingsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5720,7 +5720,7 @@ export const plans = { const attribute = buildingsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6037,7 +6037,7 @@ export const plans = { const attribute = propertiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6053,7 +6053,7 @@ export const plans = { const attribute = propertiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6361,7 +6361,7 @@ export const plans = { const attribute = streetsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6377,7 +6377,7 @@ export const plans = { const attribute = streetsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.view_fake_unique.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.view_fake_unique.1.export.mjs index fb6dd232c0..1b165a5204 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.view_fake_unique.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.view_fake_unique.1.export.mjs @@ -4306,7 +4306,7 @@ export const plans = { const attribute = offersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4322,7 +4322,7 @@ export const plans = { const attribute = offersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5111,7 +5111,7 @@ export const plans = { const attribute = housesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5127,7 +5127,7 @@ export const plans = { const attribute = housesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5558,7 +5558,7 @@ export const plans = { const attribute = streetPropertyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5574,7 +5574,7 @@ export const plans = { const attribute = streetPropertyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5793,7 +5793,7 @@ export const plans = { const attribute = buildingsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5809,7 +5809,7 @@ export const plans = { const attribute = buildingsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6126,7 +6126,7 @@ export const plans = { const attribute = propertiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6142,7 +6142,7 @@ export const plans = { const attribute = propertiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6450,7 +6450,7 @@ export const plans = { const attribute = streetsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -6466,7 +6466,7 @@ export const plans = { const attribute = streetsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.view_fake_unique_pk.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.view_fake_unique_pk.1.export.mjs index 0436a3d2dc..9a2c06436e 100644 --- a/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.view_fake_unique_pk.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v4/smart_comment_relations.view_fake_unique_pk.1.export.mjs @@ -4278,7 +4278,7 @@ export const plans = { const attribute = offersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4294,7 +4294,7 @@ export const plans = { const attribute = offersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4812,7 +4812,7 @@ export const plans = { const attribute = streetPropertyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -4828,7 +4828,7 @@ export const plans = { const attribute = streetPropertyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5079,7 +5079,7 @@ export const plans = { const attribute = buildingsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5095,7 +5095,7 @@ export const plans = { const attribute = buildingsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5412,7 +5412,7 @@ export const plans = { const attribute = propertiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5428,7 +5428,7 @@ export const plans = { const attribute = propertiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5675,7 +5675,7 @@ export const plans = { const attribute = postsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5691,7 +5691,7 @@ export const plans = { const attribute = postsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5796,7 +5796,7 @@ export const plans = { const attribute = streetsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5812,7 +5812,7 @@ export const plans = { const attribute = streetsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5974,7 +5974,7 @@ export const plans = { const attribute = housesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -5990,7 +5990,7 @@ export const plans = { const attribute = housesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v5/skipNodePlugin.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v5/skipNodePlugin.1.export.mjs index d9ce647dbb..a593675280 100644 --- a/postgraphile/postgraphile/__tests__/schema/v5/skipNodePlugin.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v5/skipNodePlugin.1.export.mjs @@ -29109,7 +29109,7 @@ export const plans = { const attribute = bTypesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -29125,7 +29125,7 @@ export const plans = { const attribute = bTypesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31089,7 +31089,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31105,7 +31105,7 @@ export const plans = { const attribute = postCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31641,7 +31641,7 @@ export const plans = { const attribute = cCompoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -31657,7 +31657,7 @@ export const plans = { const attribute = cCompoundKeyCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32448,7 +32448,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32464,7 +32464,7 @@ export const plans = { const attribute = inputsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32569,7 +32569,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32585,7 +32585,7 @@ export const plans = { const attribute = patchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32690,7 +32690,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32706,7 +32706,7 @@ export const plans = { const attribute = reservedCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32811,7 +32811,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32827,7 +32827,7 @@ export const plans = { const attribute = reservedPatchsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32932,7 +32932,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -32948,7 +32948,7 @@ export const plans = { const attribute = reservedInputCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33053,7 +33053,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33069,7 +33069,7 @@ export const plans = { const attribute = defaultValueCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33738,7 +33738,7 @@ export const plans = { const attribute = cMyTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33754,7 +33754,7 @@ export const plans = { const attribute = cMyTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33916,7 +33916,7 @@ export const plans = { const attribute = cPersonSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -33932,7 +33932,7 @@ export const plans = { const attribute = cPersonSecretCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34094,7 +34094,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34110,7 +34110,7 @@ export const plans = { const attribute = viewTableCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34604,7 +34604,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34620,7 +34620,7 @@ export const plans = { const attribute = similarTable1Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34896,7 +34896,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -34912,7 +34912,7 @@ export const plans = { const attribute = similarTable2Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35188,7 +35188,7 @@ export const plans = { const attribute = cNullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35204,7 +35204,7 @@ export const plans = { const attribute = cNullTestRecordCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35729,7 +35729,7 @@ export const plans = { const attribute = cLeftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -35745,7 +35745,7 @@ export const plans = { const attribute = cLeftArmCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36021,7 +36021,7 @@ export const plans = { const attribute = cIssue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36037,7 +36037,7 @@ export const plans = { const attribute = cIssue756Codec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36174,7 +36174,7 @@ export const plans = { const attribute = cPersonCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -36190,7 +36190,7 @@ export const plans = { const attribute = cPersonCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" diff --git a/postgraphile/postgraphile/__tests__/schema/v5/skipNodePlugin.polymorphic.1.export.mjs b/postgraphile/postgraphile/__tests__/schema/v5/skipNodePlugin.polymorphic.1.export.mjs index e000b61862..9aecad8859 100644 --- a/postgraphile/postgraphile/__tests__/schema/v5/skipNodePlugin.polymorphic.1.export.mjs +++ b/postgraphile/postgraphile/__tests__/schema/v5/skipNodePlugin.polymorphic.1.export.mjs @@ -14496,7 +14496,7 @@ export const plans = { const attribute = logEntriesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -14512,7 +14512,7 @@ export const plans = { const attribute = logEntriesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15393,7 +15393,7 @@ export const plans = { const attribute = awsApplicationFirstPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15409,7 +15409,7 @@ export const plans = { const attribute = awsApplicationFirstPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15835,7 +15835,7 @@ export const plans = { const attribute = gcpApplicationFirstPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -15851,7 +15851,7 @@ export const plans = { const attribute = gcpApplicationFirstPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16305,7 +16305,7 @@ export const plans = { const attribute = awsApplicationThirdPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16321,7 +16321,7 @@ export const plans = { const attribute = awsApplicationThirdPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16458,7 +16458,7 @@ export const plans = { const attribute = gcpApplicationThirdPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -16474,7 +16474,7 @@ export const plans = { const attribute = gcpApplicationThirdPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17003,7 +17003,7 @@ export const plans = { const attribute = awsApplicationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17019,7 +17019,7 @@ export const plans = { const attribute = awsApplicationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17409,7 +17409,7 @@ export const plans = { const attribute = gcpApplicationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17425,7 +17425,7 @@ export const plans = { const attribute = gcpApplicationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17824,7 +17824,7 @@ export const plans = { const attribute = singleTableItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -17840,7 +17840,7 @@ export const plans = { const attribute = singleTableItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18549,7 +18549,7 @@ export const plans = { const attribute = relationalItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -18565,7 +18565,7 @@ export const plans = { const attribute = relationalItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -19249,7 +19249,7 @@ export const plans = { const attribute = singleTableItemRelationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -19265,7 +19265,7 @@ export const plans = { const attribute = singleTableItemRelationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -19459,7 +19459,7 @@ export const plans = { const attribute = singleTableItemRelationCompositePksCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -19475,7 +19475,7 @@ export const plans = { const attribute = singleTableItemRelationCompositePksCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -21558,7 +21558,7 @@ export const plans = { const attribute = relationalItemRelationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -21574,7 +21574,7 @@ export const plans = { const attribute = relationalItemRelationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -21768,7 +21768,7 @@ export const plans = { const attribute = relationalItemRelationCompositePksCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -21784,7 +21784,7 @@ export const plans = { const attribute = relationalItemRelationCompositePksCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -25712,7 +25712,7 @@ export const plans = { const attribute = organizationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -25728,7 +25728,7 @@ export const plans = { const attribute = organizationsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -25890,7 +25890,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -25906,7 +25906,7 @@ export const plans = { const attribute = peopleCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -26068,7 +26068,7 @@ export const plans = { const attribute = prioritiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -26084,7 +26084,7 @@ export const plans = { const attribute = prioritiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -26246,7 +26246,7 @@ export const plans = { const attribute = relationalChecklistsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -26262,7 +26262,7 @@ export const plans = { const attribute = relationalChecklistsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -26937,7 +26937,7 @@ export const plans = { const attribute = relationalTopicsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -26953,7 +26953,7 @@ export const plans = { const attribute = relationalTopicsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -27628,7 +27628,7 @@ export const plans = { const attribute = relationalChecklistItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -27644,7 +27644,7 @@ export const plans = { const attribute = relationalChecklistItemsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -28376,7 +28376,7 @@ export const plans = { const attribute = relationalDividersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -28392,7 +28392,7 @@ export const plans = { const attribute = relationalDividersCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -29124,7 +29124,7 @@ export const plans = { const attribute = relationalPostsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -29140,7 +29140,7 @@ export const plans = { const attribute = relationalPostsCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -29929,7 +29929,7 @@ export const plans = { const attribute = firstPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -29945,7 +29945,7 @@ export const plans = { const attribute = firstPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30221,7 +30221,7 @@ export const plans = { const attribute = thirdPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "ASC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST" @@ -30237,7 +30237,7 @@ export const plans = { const attribute = thirdPartyVulnerabilitiesCodec.attributes[attributeName]; step.orderBy({ codec: attribute.codec, - fragment: sql`${step.alias}.${sql.identifier(attributeName)}`, + fragment: sql`${step}.${sql.identifier(attributeName)}`, direction: "DESC", ...(undefined != null ? { nulls: undefined ? "LAST" : "FIRST"