Skip to content

refactor: avoid creating nested query when mapping names #211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 27, 2025
Merged

refactor: avoid creating nested query when mapping names #211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0209d16
refactor: avoid creating nested query when mapping names
ymc9 Aug 27, 2025
91be56d
address pr comments
ymc9 Aug 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/runtime/src/client/crud/dialects/postgresql.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export class PostgresCrudDialect<Schema extends SchemaDef> extends BaseCrudDiale
): SelectQueryBuilder<any, any, any> {
const joinedQuery = this.buildRelationJSON(model, query, relationField, parentAlias, payload);

return joinedQuery.select(`${parentAlias}$${relationField}.$j as ${relationField}`);
return joinedQuery.select(`${parentAlias}$${relationField}.$t as ${relationField}`);
}

private buildRelationJSON(
Expand Down Expand Up @@ -176,9 +176,9 @@ export class PostgresCrudDialect<Schema extends SchemaDef> extends BaseCrudDiale
if (relationFieldDef.array) {
return eb.fn
.coalesce(sql`jsonb_agg(jsonb_build_object(${sql.join(objArgs)}))`, sql`'[]'::jsonb`)
.as('$j');
.as('$t');
} else {
return sql`jsonb_build_object(${sql.join(objArgs)})`.as('$j');
return sql`jsonb_build_object(${sql.join(objArgs)})`.as('$t');
}
});

Expand Down Expand Up @@ -242,7 +242,7 @@ export class PostgresCrudDialect<Schema extends SchemaDef> extends BaseCrudDiale
const fieldDef = requireField(this.schema, relationModel, field);
const fieldValue = fieldDef.relation
? // reference the synthesized JSON field
eb.ref(`${parentAlias}$${relationField}$${field}.$j`)
eb.ref(`${parentAlias}$${relationField}$${field}.$t`)
: // reference a plain field
this.fieldRef(relationModel, field, eb, undefined, false);
return [sql.lit(field), fieldValue];
Expand All @@ -260,7 +260,7 @@ export class PostgresCrudDialect<Schema extends SchemaDef> extends BaseCrudDiale
.map(([field]) => [
sql.lit(field),
// reference the synthesized JSON field
eb.ref(`${parentAlias}$${relationField}$${field}.$j`),
eb.ref(`${parentAlias}$${relationField}$${field}.$t`),
])
.flatMap((v) => v),
);
Expand Down
4 changes: 2 additions & 2 deletions packages/runtime/src/client/crud/dialects/sqlite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,9 @@ export class SqliteCrudDialect<Schema extends SchemaDef> extends BaseCrudDialect
if (relationFieldDef.array) {
return eb.fn
.coalesce(sql`json_group_array(json_object(${sql.join(objArgs)}))`, sql`json_array()`)
.as('$j');
.as('$t');
} else {
return sql`json_object(${sql.join(objArgs)})`.as('data');
return sql`json_object(${sql.join(objArgs)})`.as('$t');
}
});

Expand Down
Loading