From a7e975e760f898ec537ba6f1d37302af7990b6cb Mon Sep 17 00:00:00 2001 From: Jeroen van Baarsen Date: Mon, 17 May 2021 00:25:28 +0200 Subject: [PATCH] Rename default datasource (#1941) * Rename default datasource When looking in the documentation for experimental features (For example using DB native types) you need to add a previewFeatures flag to the Generate block, and then in the docs they use `@db.*` everywhere. So as an example if you'd want to use the Postgres native Date field you get something like this: `createdAt DateTime @default(now()) @db.Date` Since we use `DS`as a default datasource it can trip users up a bit since `@DS.Date` is not a valid Prisma line (Somehow they don't like the uppercase datasource). So if we would already rename it to `datasource db {}` we would make it easier for users in the future * rename prisma datasource: docs, test, fixture, mod Co-authored-by: David Price --- .../commands/generate/scaffold/__tests__/fixtures/schema.prisma | 2 +- .../src/commands/generate/sdl/__tests__/fixtures/schema.prisma | 2 +- .../commands/generate/service/__tests__/fixtures/schema.prisma | 2 +- packages/cli/src/lib/__tests__/fixtures/schema.prisma | 2 +- packages/create-redwood-app/template/api/db/schema.prisma | 2 +- .../integration/01-tutorial/codemods/Step4_1_DbSchema.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/schema.prisma b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/schema.prisma index ba40b76548f1..c53963669ac8 100644 --- a/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/schema.prisma +++ b/packages/cli/src/commands/generate/scaffold/__tests__/fixtures/schema.prisma @@ -1,4 +1,4 @@ -datasource DS { +datasource db { provider = "postgresql" url = env("DB_HOST") } diff --git a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/schema.prisma b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/schema.prisma index 62c4a75946d8..eb9343de49b5 100644 --- a/packages/cli/src/commands/generate/sdl/__tests__/fixtures/schema.prisma +++ b/packages/cli/src/commands/generate/sdl/__tests__/fixtures/schema.prisma @@ -1,4 +1,4 @@ -datasource DS { +datasource db { provider = "mysql" url = env("DB_HOST") } diff --git a/packages/cli/src/commands/generate/service/__tests__/fixtures/schema.prisma b/packages/cli/src/commands/generate/service/__tests__/fixtures/schema.prisma index 237b22bfeb3c..0ff38a677d74 100644 --- a/packages/cli/src/commands/generate/service/__tests__/fixtures/schema.prisma +++ b/packages/cli/src/commands/generate/service/__tests__/fixtures/schema.prisma @@ -1,4 +1,4 @@ -datasource DS { +datasource db { provider = "postgresql" url = env("DB_HOST") } diff --git a/packages/cli/src/lib/__tests__/fixtures/schema.prisma b/packages/cli/src/lib/__tests__/fixtures/schema.prisma index 73220b2cb181..39b4a912846f 100644 --- a/packages/cli/src/lib/__tests__/fixtures/schema.prisma +++ b/packages/cli/src/lib/__tests__/fixtures/schema.prisma @@ -1,4 +1,4 @@ -datasource DS { +datasource db { provider = "sqlite" url = env("DB_HOST") } diff --git a/packages/create-redwood-app/template/api/db/schema.prisma b/packages/create-redwood-app/template/api/db/schema.prisma index 291504d62e6b..3dea71a68f23 100644 --- a/packages/create-redwood-app/template/api/db/schema.prisma +++ b/packages/create-redwood-app/template/api/db/schema.prisma @@ -1,4 +1,4 @@ -datasource DS { +datasource db { provider = "sqlite" url = env("DATABASE_URL") } diff --git a/tasks/e2e/cypress/integration/01-tutorial/codemods/Step4_1_DbSchema.js b/tasks/e2e/cypress/integration/01-tutorial/codemods/Step4_1_DbSchema.js index 3cb710b296e7..6afbf7620579 100644 --- a/tasks/e2e/cypress/integration/01-tutorial/codemods/Step4_1_DbSchema.js +++ b/tasks/e2e/cypress/integration/01-tutorial/codemods/Step4_1_DbSchema.js @@ -1,7 +1,7 @@ export default ` // api/db/schema.prisma -datasource DS { +datasource db { provider = "sqlite" url = env("DATABASE_URL") }