Skip to content

fix: misc fixes #88

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 1 commit into from
Jul 11, 2025
Merged

fix: misc fixes #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions packages/cli/src/actions/db.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ async function runPush(options: Options) {
const cmd = [
'prisma db push',
` --schema "${prismaSchemaFile}"`,
options.acceptDataLoss && ' --accept-data-loss',
options.forceReset && ' --force-reset',
options.acceptDataLoss ? ' --accept-data-loss' : '',
options.forceReset ? ' --force-reset' : '',
' --skip-generate',
].join('');

Expand Down
21 changes: 7 additions & 14 deletions packages/cli/src/actions/migrate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ async function runDev(prismaSchemaFile: string, options: DevOptions) {
'prisma migrate dev',
` --schema "${prismaSchemaFile}"`,
' --skip-generate',
options.name && ` --name ${options.name}`,
options.createOnly && ' --create-only',
options.name ? ` --name ${options.name}` : '',
options.createOnly ? ' --create-only' : '',
].join('');

await execPackage(cmd);
Expand All @@ -69,11 +69,9 @@ async function runDev(prismaSchemaFile: string, options: DevOptions) {

async function runReset(prismaSchemaFile: string, options: ResetOptions) {
try {
const cmd = [
'prisma migrate reset',
` --schema "${prismaSchemaFile}"`,
options.force && ' --force',
].join('');
const cmd = ['prisma migrate reset', ` --schema "${prismaSchemaFile}"`, options.force ? ' --force' : ''].join(
'',
);

await execPackage(cmd);
} catch (err) {
Expand All @@ -83,10 +81,7 @@ async function runReset(prismaSchemaFile: string, options: ResetOptions) {

async function runDeploy(prismaSchemaFile: string, _options: DeployOptions) {
try {
const cmd = [
'prisma migrate deploy',
` --schema "${prismaSchemaFile}"`,
].join('');
const cmd = ['prisma migrate deploy', ` --schema "${prismaSchemaFile}"`].join('');

await execPackage(cmd);
} catch (err) {
Expand All @@ -96,9 +91,7 @@ async function runDeploy(prismaSchemaFile: string, _options: DeployOptions) {

async function runStatus(prismaSchemaFile: string, _options: StatusOptions) {
try {
await execPackage(`prisma migrate status --schema "${prismaSchemaFile}"`, {
stdio: 'inherit',
});
await execPackage(`prisma migrate status --schema "${prismaSchemaFile}"`);
} catch (err) {
handleSubProcessError(err);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/runtime/src/client/client-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { CountOperationHandler } from './crud/operations/count';
import { CreateOperationHandler } from './crud/operations/create';
import { DeleteOperationHandler } from './crud/operations/delete';
import { FindOperationHandler } from './crud/operations/find';
import { GroupByeOperationHandler } from './crud/operations/group-by';
import { GroupByOperationHandler } from './crud/operations/group-by';
import { UpdateOperationHandler } from './crud/operations/update';
import { InputValidator } from './crud/validator';
import { NotFoundError, QueryError } from './errors';
Expand Down Expand Up @@ -504,7 +504,7 @@ function createModelCrudHandler<Schema extends SchemaDef, Model extends GetModel
},

groupBy: (args: unknown) => {
return createPromise('groupBy', args, new GroupByeOperationHandler(client, model, inputValidator));
return createPromise('groupBy', args, new GroupByOperationHandler(client, model, inputValidator));
},
} as ModelOperations<Schema, Model>;
}
2 changes: 1 addition & 1 deletion packages/runtime/src/client/crud/operations/group-by.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { SchemaDef } from '../../../schema';
import { getField } from '../../query-utils';
import { BaseOperationHandler } from './base';

export class GroupByeOperationHandler<Schema extends SchemaDef> extends BaseOperationHandler<Schema> {
export class GroupByOperationHandler<Schema extends SchemaDef> extends BaseOperationHandler<Schema> {
async handle(_operation: 'groupBy', args: unknown | undefined) {
// normalize args to strip `undefined` fields
const normalizedArgs = this.normalizeArgs(args);
Expand Down