Skip to content

Commit f74b6ee

Browse files
authored
fix(orm): allow null for select/include/omit (#402)
* fix(orm): allow `null` for select/include/omit * update
1 parent e4885b0 commit f74b6ee

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

packages/orm/src/client/crud-types.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,9 +452,9 @@ export type OmitInput<Schema extends SchemaDef, Model extends GetModels<Schema>>
452452
};
453453

454454
export type SelectIncludeOmit<Schema extends SchemaDef, Model extends GetModels<Schema>, AllowCount extends boolean> = {
455-
select?: SelectInput<Schema, Model, AllowCount, boolean>;
456-
include?: IncludeInput<Schema, Model, AllowCount>;
457-
omit?: OmitInput<Schema, Model>;
455+
select?: SelectInput<Schema, Model, AllowCount, boolean> | null;
456+
include?: IncludeInput<Schema, Model, AllowCount> | null;
457+
omit?: OmitInput<Schema, Model> | null;
458458
};
459459

460460
export type SelectInput<

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,7 @@ export abstract class BaseCrudDialect<Schema extends SchemaDef> {
863863
buildSelectAllFields(
864864
model: string,
865865
query: SelectQueryBuilder<any, any, any>,
866-
omit: Record<string, boolean | undefined> | undefined,
866+
omit: Record<string, boolean | undefined> | undefined | null,
867867
modelAlias: string,
868868
) {
869869
const modelDef = requireModel(this.schema, model);

packages/orm/src/client/crud/validator/index.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,9 @@ export class InputValidator<Schema extends SchemaDef> {
266266
fields['where'] = where.optional();
267267
}
268268

269-
fields['select'] = this.makeSelectSchema(model).optional();
270-
fields['include'] = this.makeIncludeSchema(model).optional();
271-
fields['omit'] = this.makeOmitSchema(model).optional();
269+
fields['select'] = this.makeSelectSchema(model).optional().nullable();
270+
fields['include'] = this.makeIncludeSchema(model).optional().nullable();
271+
fields['omit'] = this.makeOmitSchema(model).optional().nullable();
272272

273273
if (!options.unique) {
274274
fields['skip'] = this.makeSkipSchema().optional();

0 commit comments

Comments
 (0)