Skip to content

Commit c737037

Browse files
committed
addressing PR comments
1 parent d1a1b17 commit c737037

2 files changed

Lines changed: 3 additions & 15 deletions

File tree

packages/orm/src/client/crud/dialects/base-dialect.ts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,7 +1150,7 @@ export abstract class BaseCrudDialect<Schema extends SchemaDef> {
11501150
const descendants = getDelegateDescendantModels(this.schema, model);
11511151
for (const subModel of descendants) {
11521152
result = this.buildDelegateJoin(model, modelAlias, subModel.name, result);
1153-
result = result.select((eb) => {
1153+
result = result.select(() => {
11541154
const jsonObject: Record<string, Expression<any>> = {};
11551155
for (const field of Object.keys(subModel.fields)) {
11561156
if (
@@ -1159,19 +1159,7 @@ export abstract class BaseCrudDialect<Schema extends SchemaDef> {
11591159
) {
11601160
continue;
11611161
}
1162-
const subFieldDef = requireField(this.schema, subModel.name, field);
1163-
const castSqlType = this.hasNativeTypeAttribute(subFieldDef)
1164-
? this.getSqlType(subFieldDef.type)
1165-
: undefined;
1166-
if (castSqlType) {
1167-
const castType = subFieldDef.array
1168-
? sql`${sql.raw(castSqlType)}[]`
1169-
: sql.raw(castSqlType);
1170-
jsonObject[field] =
1171-
sql`CAST(${sql.ref(`${subModel.name}.${field}`)} AS ${castType})`;
1172-
} else {
1173-
jsonObject[field] = eb.ref(`${subModel.name}.${field}`);
1174-
}
1162+
jsonObject[field] = this.fieldRef(subModel.name, field, subModel.name);
11751163
}
11761164
return this.buildJsonObject(jsonObject).as(`${DELEGATE_JOINED_FIELD_PREFIX}${subModel.name}`);
11771165
});

tests/regression/test/issue-2394.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ model ExchangeRequest {
3333
@@deny('post-update', before().status == status) // triggers buildValuesTableSelect
3434
}
3535
`,
36-
{ provider: 'postgresql', usePrismaPush: true, debug: true },
36+
{ provider: 'postgresql', usePrismaPush: true },
3737
);
3838

3939
const request = await db.exchangeRequest.create({ data: { status: 'pending' } });

0 commit comments

Comments
 (0)