Fix query gen for dataview when link targeting object type with acces…

…s policy shares name with computed link (#285)
edgedb · Nov 9, 2023 · b5d2143 · b5d2143
1 parent f19ca24
commit b5d2143
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/shared/studio/tabs/dataview/state/index.ts b/shared/studio/tabs/dataview/state/index.ts
@@ -1040,13 +1040,21 @@ export class DataInspector extends Model({
             if (this.omittedLinks.has(field.name)) {
               return `__count_${field.queryName} := <int64>{}`;
             }
+            const typeUnionNames = resolveObjectTypeUnion(
+              this.objectType!
+            ).map((t) => t.escapedName);
             return `__count_${field.queryName} := (for g in (
               group ${
                 field.targetHasSelectAccessPolicy && field.required
                   ? `(
                 with sourceId := .id
                 select ${field.escapedTypename}
-                filter .<${field.escapedName}.id = sourceId
+                filter ${typeUnionNames
+                  .map(
+                    (name) =>
+                      `.<${field.escapedName}[is ${name}].id = sourceId`
+                  )
+                  .join(" or ")}
               )`
                   : selectName
               }