From 4c83c4a61cd5569385458d11270b7ecf69c17868 Mon Sep 17 00:00:00 2001 From: Nikolas Date: Thu, 16 Nov 2023 16:55:13 +0100 Subject: [PATCH 01/10] Update 01-rest.md (#5460) --- .../050-overview/300-prisma-in-your-stack/01-rest.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/200-concepts/050-overview/300-prisma-in-your-stack/01-rest.md b/content/200-concepts/050-overview/300-prisma-in-your-stack/01-rest.md index c82244a52c..47673b7a76 100644 --- a/content/200-concepts/050-overview/300-prisma-in-your-stack/01-rest.md +++ b/content/200-concepts/050-overview/300-prisma-in-your-stack/01-rest.md @@ -30,7 +30,8 @@ Here's a non-exhaustive list of libraries and frameworks you can use with Prisma - [Polka](https://github.com/lukeed/polka) - [Micro](https://github.com/zeit/micro) - [Feathers](https://feathersjs.com/) - +- [Remix](https://remix.run/) + ## REST API server example Assume you have a Prisma schema that looks similar to this: From 9727760ca4c6b801b9a1119f7656e23497c49fc6 Mon Sep 17 00:00:00 2001 From: Bruno Crosier Date: Thu, 16 Nov 2023 16:52:25 +0000 Subject: [PATCH 02/10] Make it clear that the code is an example of an incorrect schema (#4934) --- .../100-components/01-prisma-schema/06-relations/index.mdx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/content/200-concepts/100-components/01-prisma-schema/06-relations/index.mdx b/content/200-concepts/100-components/01-prisma-schema/06-relations/index.mdx index 8f678823a7..6c7441ca57 100644 --- a/content/200-concepts/100-components/01-prisma-schema/06-relations/index.mdx +++ b/content/200-concepts/100-components/01-prisma-schema/06-relations/index.mdx @@ -479,6 +479,8 @@ When you define two relations between the same two models, you need to add the ` ```prisma +// NOTE: This schema is intentionally incorrect. See below for a working solution. + model User { id Int @id @default(autoincrement()) name String? From 1a59eb86a72d0e9f4af86b88f798359862c3a8e7 Mon Sep 17 00:00:00 2001 From: Nikolas Date: Thu, 16 Nov 2023 19:15:40 +0100 Subject: [PATCH 03/10] Update 100-editor-setup.mdx (#5462) --- .../300-guides/125-development-environment/100-editor-setup.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/300-guides/125-development-environment/100-editor-setup.mdx b/content/300-guides/125-development-environment/100-editor-setup.mdx index 50e60e46cd..8bf05ee66b 100644 --- a/content/300-guides/125-development-environment/100-editor-setup.mdx +++ b/content/300-guides/125-development-environment/100-editor-setup.mdx @@ -55,7 +55,7 @@ You can install the official [Prisma VS Code extension](https://marketplace.visu #### inshellisense -You can get IDE-style autocompletions for Prisma CLI using [`inshellisense`](https://github.com/microsoft/inshellisense/tree/main). It supports: bash, zsh, fish, pwsh, powershell (Windows Powershell). +You can get IDE-style autocompletion for Prisma CLI using [`inshellisense`](https://github.com/microsoft/inshellisense/tree/main). It supports: bash, zsh, fish, pwsh, powershell (Windows Powershell). To install, run: From 1535c240927bf9e0b6c0b994848c4c3a5dc0c575 Mon Sep 17 00:00:00 2001 From: Nikolas Date: Thu, 16 Nov 2023 19:16:19 +0100 Subject: [PATCH 04/10] Update cSpell.json (#5463) --- cSpell.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cSpell.json b/cSpell.json index 13b402dc94..b4528b92e0 100644 --- a/cSpell.json +++ b/cSpell.json @@ -56,7 +56,8 @@ "Replibyte", "Snaplet", "Kysely", - "Turso" + "Turso", + "inshellisense" ], "ignoreWords": [ "Ania", From b79d0acf29b046c183573fae867e7e2d5269a4a5 Mon Sep 17 00:00:00 2001 From: Nikolas Date: Thu, 16 Nov 2023 19:19:03 +0100 Subject: [PATCH 05/10] Update cSpell.json (#5464) --- cSpell.json | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/cSpell.json b/cSpell.json index b4528b92e0..054c9665f7 100644 --- a/cSpell.json +++ b/cSpell.json @@ -57,7 +57,22 @@ "Snaplet", "Kysely", "Turso", - "inshellisense" + "inshellisense", + "Formbricks", + "Openform", + "Documenso", + "Docusign", + "ghostfolio", + "Scholarsome", + "Dittofeed", + "Webstudio", + "Dyrector", + "Coolify", + "hostable", + "Rallly", + "Dundring", + "Letterpad", + "Hitori" ], "ignoreWords": [ "Ania", From 72b3e97617a445b7616c821abfcc0ed517b14839 Mon Sep 17 00:00:00 2001 From: Jan Piotrowski Date: Thu, 16 Nov 2023 20:34:41 +0100 Subject: [PATCH 06/10] fix(referential-actions): Remove bolding of emojis (#4133) Co-authored-by: Alex Ruheni <33921841+ruheni@users.noreply.github.com> --- .../06-relations/410-referential-actions/index.mdx | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/content/200-concepts/100-components/01-prisma-schema/06-relations/410-referential-actions/index.mdx b/content/200-concepts/100-components/01-prisma-schema/06-relations/410-referential-actions/index.mdx index 6e9cc0ed72..81974a1c83 100644 --- a/content/200-concepts/100-components/01-prisma-schema/06-relations/410-referential-actions/index.mdx +++ b/content/200-concepts/100-components/01-prisma-schema/06-relations/410-referential-actions/index.mdx @@ -152,12 +152,13 @@ The following table shows which referential action each database supports. | Database | Cascade | Restrict | NoAction | SetNull | SetDefault | | :---------- | :------ | :------- | :------- | :------ | :--------- | -| PostgreSQL | **✔️** | **✔️** | **✔️** | **✔️**⌘ | **✔️** | -| MySQL | **✔️** | **✔️** | **✔️** | **✔️** | ❌ (✔️†) | -| SQLite | **✔️** | **✔️** | **✔️** | **✔️** | **✔️** | -| SQL Server | **✔️** | **❌**‡ | **✔️** | **✔️** | **✔️** | -| CockroachDB | **✔️** | **✔️** | **✔️** | **✔️** | **✔️** | -| MongoDB†† | **✔️** | **✔️** | **✔️** | **✔️** | **❌** | +| PostgreSQL | ✔️ | ✔️ | ✔️ | ✔️⌘ | ✔️ | +| MySQL | ✔️ | ✔️ | ✔️ | ✔️ | ❌ (✔️†) | +| SQLite | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | +| SQL Server | ✔️ | ❌‡ | ✔️ | ✔️ | ✔️ | +| CockroachDB | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | +| MongoDB†† | ✔️ | ✔️ | ✔️ | ✔️ | ❌ | + - † See [special cases for MySQL](#mysql). - ⌘ See [special cases for PostgreSQL](#postgresql). From 1094a7f1cc95170d4e30497b0eeb5557045decb6 Mon Sep 17 00:00:00 2001 From: Jan Piotrowski Date: Thu, 16 Nov 2023 20:45:24 +0100 Subject: [PATCH 07/10] chore(prisma-client-reference): Mention which methods can use `distinct` (#5378) --- .../200-api-reference/050-prisma-client-reference.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/400-reference/200-api-reference/050-prisma-client-reference.mdx b/content/400-reference/200-api-reference/050-prisma-client-reference.mdx index 7f16e45725..88938a7be7 100644 --- a/content/400-reference/200-api-reference/050-prisma-client-reference.mdx +++ b/content/400-reference/200-api-reference/050-prisma-client-reference.mdx @@ -2454,7 +2454,7 @@ The following examples demonstrate how to use the [`validator`](/concepts/compon ### distinct -Deduplicate a list of records. See also: [Aggregation, grouping, and summarizing](/concepts/components/prisma-client/aggregation-grouping-summarizing#select-distinct) +Deduplicate a list of records from [`findMany`](#findmany) or [`findFirst`](#findfirst). See also: [Aggregation, grouping, and summarizing](/concepts/components/prisma-client/aggregation-grouping-summarizing#select-distinct) #### Examples From 358926e1513467f23290d194cc6cb2fe873d7dbf Mon Sep 17 00:00:00 2001 From: Ankur Datta <64993082+ankur-arch@users.noreply.github.com> Date: Fri, 17 Nov 2023 05:57:37 +0600 Subject: [PATCH 08/10] fix: remove legacy billing for data platform (#5458) * fix: add redirects for broken links --- vercel.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/vercel.json b/vercel.json index c2ffe27757..3eb266760a 100644 --- a/vercel.json +++ b/vercel.json @@ -1722,6 +1722,14 @@ { "source": "/docs/data-platform/classic-projects/platform/billing", "destination": "https://www.prisma.io/pricing" + }, + { + "source": "/docs/data-platform/classic-projects/platform/billing/plans-and-quotas", + "destination": "https://www.prisma.io/pricing" + }, + { + "source": "/docs/data-platform/classic-projects/platform/billing/manage-plans", + "destination": "https://www.prisma.io/pricing" } ] } From e0b55aabd3af3b841e21468f62f4af656b0a608f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Rudge?= Date: Fri, 17 Nov 2023 00:44:46 -0700 Subject: [PATCH 09/10] add prisma-generator-fake-data to 'Community generators' (#4606) Co-authored-by: Alex Ruheni <33921841+ruheni@users.noreply.github.com> Co-authored-by: Nikolas --- .../100-components/01-prisma-schema/03-generators.mdx | 1 + 1 file changed, 1 insertion(+) diff --git a/content/200-concepts/100-components/01-prisma-schema/03-generators.mdx b/content/200-concepts/100-components/01-prisma-schema/03-generators.mdx index c1f8bc6c91..503185a232 100644 --- a/content/200-concepts/100-components/01-prisma-schema/03-generators.mdx +++ b/content/200-concepts/100-components/01-prisma-schema/03-generators.mdx @@ -95,4 +95,5 @@ The following is a list of community created generators. If you want to create y - [`prisma-generator-graphql-typedef`](https://github.com/mavvy22/prisma-generator-graphql-typedef): Generates graphql schema. - [`prisma-markdown`](https://github.com/samchon/prisma-markdown): Generates markdown document composed with ERD diagrams and their descriptions. Supports pagination of ERD diagrams through `@namespace` comment tag. - [`prisma-models-graph`](https://github.com/dangchinh25/prisma-models-graph): Generates a bi-directional models graph for schema without strict relationship defined in the schema, works via a custom schema annotation. +- [`https://github.com/luisrudge/prisma-generator-fake-data`](https://github.com/luisrudge/prisma-generator-fake-data): Generates realistic-looking fake data for your Prisma models that can be used in unit/integration tests, demos, and more. From f8f8b88f476a918c294bc1aa98a95d830b2c6cbd Mon Sep 17 00:00:00 2001 From: Rogier van den Berg Date: Fri, 17 Nov 2023 08:45:32 +0100 Subject: [PATCH 10/10] Add docs --name flag for prisma migrate dev command (#4803) Co-authored-by: Nikolas --- .../400-reference/200-api-reference/200-command-reference.mdx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/content/400-reference/200-api-reference/200-command-reference.mdx b/content/400-reference/200-api-reference/200-command-reference.mdx index 93fd0d962e..d1a2db4863 100644 --- a/content/400-reference/200-api-reference/200-command-reference.mdx +++ b/content/400-reference/200-api-reference/200-command-reference.mdx @@ -1222,7 +1222,8 @@ See also: | `--create-only` | No | Creates a new migration based on the changes in the schema but does not apply that migration. Run `migrate dev` to apply migration. | | | `--skip-seed` | No | Skip triggering seed | | | `--skip-generate` | No | Skip triggering generators (for example, Prisma Client) | | -| `--help` / `--h` | No | Displays the help message | +| `--name` / `-n` | No | Name the migration (e.g. `prisma migrate dev --name added_job_title`) | | +| `--help` / `-h` | No | Displays the help message |