From ddb6b1df9345842c43ea478bb3504eb43285b91d Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Sun, 14 Apr 2024 15:58:24 +0800 Subject: [PATCH 1/2] chore: format generated PLS automatically by default --- packages/schema/src/plugins/prisma/schema-generator.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/schema/src/plugins/prisma/schema-generator.ts b/packages/schema/src/plugins/prisma/schema-generator.ts index d7a62f0d0..1e5cdb318 100644 --- a/packages/schema/src/plugins/prisma/schema-generator.ts +++ b/packages/schema/src/plugins/prisma/schema-generator.ts @@ -141,7 +141,7 @@ export class PrismaSchemaGenerator { } await writeFile(outFile, this.PRELUDE + prisma.toString()); - if (options.format === true) { + if (options.format !== false) { try { // run 'prisma format' await execPackage(`prisma format --schema ${outFile}`, { stdio: 'ignore' }); From 58edd322d6a589157efc9526e26746fc96013391 Mon Sep 17 00:00:00 2001 From: ymc9 <104139426+ymc9@users.noreply.github.com> Date: Sun, 14 Apr 2024 17:04:24 +0800 Subject: [PATCH 2/2] fix tests --- packages/schema/tests/generator/prisma-generator.test.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/schema/tests/generator/prisma-generator.test.ts b/packages/schema/tests/generator/prisma-generator.test.ts index 70c59fc0f..5e629bc2a 100644 --- a/packages/schema/tests/generator/prisma-generator.test.ts +++ b/packages/schema/tests/generator/prisma-generator.test.ts @@ -36,7 +36,7 @@ describe('Prisma generator test', () => { directUrl = env("DATABASE_URL") shadowDatabaseUrl = env("DATABASE_URL") extensions = [pg_trgm, postgis(version: "3.3.2"), uuid_ossp(map: "uuid-ossp", schema: "extensions")] - schemas = ["auth", "public"] + schemas = ["auth", "public"] } generator client { @@ -44,6 +44,10 @@ describe('Prisma generator test', () => { previewFeatures = ["multiSchema", "postgresqlExtensions"] } + plugin prisma { + provider = '@core/prisma' + } + model User { id String @id @@ -56,6 +60,7 @@ describe('Prisma generator test', () => { provider: '@core/prisma', schemaPath: 'schema.zmodel', output: 'schema.prisma', + format: false, }); const content = fs.readFileSync('schema.prisma', 'utf-8'); @@ -97,6 +102,7 @@ describe('Prisma generator test', () => { provider: '@core/prisma', schemaPath: 'schema.zmodel', output: name, + format: false, }); const content = fs.readFileSync(name, 'utf-8'); @@ -328,6 +334,7 @@ describe('Prisma generator test', () => { schemaPath: 'schema.zmodel', output: name, generateClient: false, + format: false, }); const content = fs.readFileSync(name, 'utf-8');