Merge branch 'main' into driver-adapter-docs-improvements

prisma · Nov 17, 2023 · 252b063 · 252b063
2 parents 5d3d9a7 + f8f8b88
commit 252b063
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 11 deletions.
diff --git a/cSpell.json b/cSpell.json
@@ -56,7 +56,23 @@
     "Replibyte",
     "Snaplet",
     "Kysely",
-    "Turso"
+    "Turso",
+    "inshellisense",
+    "Formbricks",
+    "Openform",
+    "Documenso",
+    "Docusign",
+    "ghostfolio",
+    "Scholarsome",
+    "Dittofeed",
+    "Webstudio",
+    "Dyrector",
+    "Coolify",
+    "hostable",
+    "Rallly",
+    "Dundring",
+    "Letterpad",
+    "Hitori"
   ],
   "ignoreWords": [
     "Ania",

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
@@ -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:

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
@@ -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.
 
diff --git a/.../100-components/01-prisma-schema/06-relations/410-referential-actions/index.mdx b/.../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).

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
@@ -479,6 +479,8 @@ When you define two relations between the same two models, you need to add the `
 <tab>
 
 ```prisma
+// NOTE: This schema is intentionally incorrect. See below for a working solution.
+
 model User {
   id           Int     @id @default(autoincrement())
   name         String?

diff --git 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:
 

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
@@ -2454,7 +2454,7 @@ The following examples demonstrate how to use the [`validator`](/concepts/compon
 
 ### <inlinecode>distinct</inlinecode>
 
-Deduplicate a list of records. See also: [Aggregation, grouping, and summarizing](/concepts/components/prisma-client/aggregation-grouping-summarizing#select-distinct) <span class="concept"></span>
+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) <span class="concept"></span>
 
 #### Examples
 

diff --git 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                                                                                                           |
 
 <Admonition type="info">
 

diff --git 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"
     }
   ]
 }