Merge branch 'main' into main

Author: AmanVarshney01

cSpell.json

@@ -52,6 +52,7 @@
     "Openform",
     "Overfetching",
     "pgbouncer",
+    "elysia",
     "planetscale",
     "pooler",
     "poolers",
@@ -123,7 +124,8 @@
     "Dreamies",
     "Treatos",
     "Svetlana",
-    "Queenie"
+    "Queenie",
+    "Linktree"
   ],
   "ignoreWords": [
     "Aiven",
@@ -169,7 +171,8 @@
     "Sevalla's",
     "Dataguide",
     "justinellingwood",
-    "Millis"
+    "Millis",
+    "Linktree"
   ],
   "patterns": [
     {

content/200-orm/050-overview/500-databases/200-database-drivers.mdx

@@ -172,14 +172,14 @@ Let's assume you have `output` in your Prisma schema set to `../generated/prisma
 ```prisma
 generator client {
   provider = "prisma-client"
-  output   = "../src/generated/client"
+  output   = "../src/generated/prisma"
 }
 ```
 
 You can reference Prisma Client using a relative path from your application code:
 
 ```ts
-import { PrismaClient } from '../generated/prisma/client'
+import { PrismaClient } from './generated/prisma/client'
 
 const client = new PrismaClient()
 ```

content/200-orm/050-overview/500-databases/300-postgresql.mdx

@@ -160,8 +160,15 @@ As an example, if you want to connect to a schema called `myschema`, set the con
 postgresql://USER:PASSWORD@HOST:PORT/DATABASE?schema=myschema&connection_limit=5&socket_timeout=3
 ```
 
-:::tip[Prisma ORM v7 connection pooling]
-In Prisma ORM v7, [driver adapters](/orm/overview/databases/database-drivers) are the default for relational databases. Connection pooling is handled by the Node.js driver you provide (like `pg`), not by Prisma's connection URL parameters. See the [connection pool guide](/orm/prisma-client/setup-and-configuration/databases-connections/connection-pool) for v7 defaults and configuration.
+:::warning[Prisma ORM v7: Connection pool defaults have changed]
+
+In Prisma ORM v7, [driver adapters](/orm/overview/databases/database-drivers) are the default for relational databases. Connection pooling is now handled by the `pg` driver, which has **different defaults** than Prisma ORM v6:
+
+- **Connection timeout**: `0` (no timeout) vs. v6's `5s`
+- **Idle timeout**: `10s` vs. v6's `300s`
+
+If you experience timeout issues after upgrading, you may need to configure your driver adapter to match v6 behavior. See the [connection pool guide](/orm/prisma-client/setup-and-configuration/databases-connections/connection-pool#postgresql-using-the-pg-driver-adapter) for detailed configuration examples.
+
 :::
 
 ### Configuring an SSL connection

content/200-orm/050-overview/500-databases/400-mysql.mdx

@@ -130,8 +130,15 @@ As an example, if you want to set the connection pool size to `5` and configure
 mysql://USER:PASSWORD@HOST:PORT/DATABASE?connection_limit=5&socket_timeout=3
 ```
 
-:::tip[Prisma ORM v7 connection pooling]
-In Prisma ORM v7, [driver adapters](/orm/overview/databases/database-drivers) are the default for relational databases. Connection pooling is handled by the Node.js driver you provide (like `mariadb`), not by Prisma's connection URL parameters. See the [connection pool guide](/orm/prisma-client/setup-and-configuration/databases-connections/connection-pool) for v7 defaults and configuration.
+:::warning[Prisma ORM v7: Connection pool defaults have changed]
+
+In Prisma ORM v7, [driver adapters](/orm/overview/databases/database-drivers) are the default for relational databases. Connection pooling is now handled by the `mariadb` driver, which has **different defaults** than Prisma ORM v6:
+
+- **Connection timeout**: `1s` vs. v6's `5s`
+- **Idle timeout**: `1800s` vs. v6's `300s`
+
+If you experience timeout issues after upgrading, you may need to configure your driver adapter to match v6 behavior. See the [connection pool guide](/orm/prisma-client/setup-and-configuration/databases-connections/connection-pool#mysql-or-mariadb-using-the-mariadb-driver) for detailed configuration examples.
+
 :::
 
 ### Configuring an SSL connection

content/200-orm/050-overview/500-databases/800-sql-server/index.mdx

@@ -131,8 +131,15 @@ sqlserver://HOST[:PORT];database=DATABASE;user={MyServer/MyUser};password={ThisI
 | `trustServerCertificate`                                                              | No                | `false`            | Configures whether to trust the server certificate.                                                                                                                                                                                                                                                                                                                                                                                                        |
 | `trustServerCertificateCA`                                                            | No                |                    | A path to a certificate authority file to be used instead of the system certificates to authorize the server certificate. Must be either in `pem`, `crt` or `der` format. Cannot be used together with `trustServerCertificate` parameter.                                                                                                                                                                                                                 |
 
-:::tip[Prisma ORM v7 connection pooling]
-In Prisma ORM v7, [driver adapters](/orm/overview/databases/database-drivers) are the default for relational databases. Connection pooling is handled by the Node.js driver you provide (like `mssql`), not by Prisma's connection URL parameters. See the [connection pool guide](/orm/prisma-client/setup-and-configuration/databases-connections/connection-pool) for v7 defaults and configuration.
+:::warning[Prisma ORM v7: Connection pool defaults have changed]
+
+In Prisma ORM v7, [driver adapters](/orm/overview/databases/database-drivers) are the default for relational databases. Connection pooling is now handled by the `mssql` driver, which has **different defaults** than Prisma ORM v6:
+
+- **Connection timeout**: `15s` vs. v6's `5s`
+- **Idle timeout**: `30s` vs. v6's `300s`
+
+If you experience timeout issues after upgrading, you may need to configure your driver adapter to match v6 behavior. See the [connection pool guide](/orm/prisma-client/setup-and-configuration/databases-connections/connection-pool#sql-server-using-the-mssql-driver) for detailed configuration examples.
+
 :::
 
 ### Using [integrated security](https://learn.microsoft.com/en-us/previous-versions/dotnet/framework/data/adonet/sql/authentication-in-sql-server) (Windows only)

content/200-orm/050-overview/500-databases/840-cockroachdb.mdx

@@ -90,7 +90,7 @@ model User {
 
 For compatibility with existing databases, you may sometimes still need to generate a fixed sequence of integer key values. In these cases, you can use Prisma ORM's inbuilt [`sequence()`](/orm/reference/prisma-schema-reference#sequence) function for CockroachDB. For a list of available options for the `sequence()` function, see our [reference documentation](/orm/reference/prisma-schema-reference#sequence).
 
-For more information on generating database keys, see CockroachDB's [Primary key best practices](https://www.cockroachlabs.com/docs/v21.2/schema-design-table#primary-key-best-practices) guide.
+For more information on generating database keys, see CockroachDB's [Primary key best practices](https://www.cockroachlabs.com/docs/stable/schema-design-table#select-primary-key-columns) guide.
 
 ## Example
 

content/200-orm/100-prisma-schema/10-overview/04-location.mdx

@@ -85,7 +85,7 @@ You can do this in either of three ways:
   import 'dotenv/config'
 
   export default defineConfig({
-    schema: 'prisma/schema.prisma',
+    schema: 'prisma/',
     migrations: {
       path: 'prisma/migrations',
       seed: 'tsx prisma/seed.ts',

content/200-orm/100-prisma-schema/10-overview/index.mdx

@@ -59,8 +59,8 @@ model Post {
   updatedAt DateTime @updatedAt
   published Boolean  @default(false)
   title     String   @db.VarChar(255)
-  author    User?    @relation(fields: [authorId], references: [id])
-  authorId  Int?
+  author    User     @relation(fields: [authorId], references: [id])
+  authorId  Int
 }
 
 enum Role {
@@ -97,7 +97,7 @@ model Post {
   updatedAt DateTime @updatedAt
   published Boolean  @default(false)
   title     String
-  author    User?    @relation(fields: [authorId], references: [id])
+  author    User     @relation(fields: [authorId], references: [id])
   authorId  String   @db.ObjectId
 }
 

content/200-orm/100-prisma-schema/20-data-model/10-models.mdx

@@ -407,8 +407,8 @@ model Comment {
   id     Int
   // Other fields
   //highlight-next-line
-  post   Post? @relation(fields: [postId], references: [id]) // A comment can have one post
-  postId Int?
+  post   Post @relation(fields: [postId], references: [id]) // A comment can have one post
+  postId Int
 }
 ```
 
@@ -424,11 +424,11 @@ model Post {
 }
 
 model Comment {
-  id     String  @id @default(auto()) @map("_id") @db.Objectid
+  id     String @id @default(auto()) @map("_id") @db.Objectid
   // Other fields
   //highlight-next-line
-  post   Post?   @relation(fields: [postId], references: [id]) // A comment can have one post
-  postId String? @db.ObjectId
+  post   Post   @relation(fields: [postId], references: [id]) // A comment can have one post
+  postId String @db.ObjectId
 }
 ```
 

content/200-orm/100-prisma-schema/20-data-model/30-indexes.mdx

@@ -42,6 +42,10 @@ You can configure indexes, unique constraints, and primary key constraints with
   - Available on the `@id`, `@@id`, `@unique`, `@@unique` and `@@index` attributes
   - SQL Server only
 
+- The [`map` argument](#configuring-the-name-of-indexes-with-map) allows you to specify a custom name for the index or constraint in the underlying database
+  - Available on the `@id`, `@@id`, `@unique`, `@@unique` and `@@index` attributes
+  - Supported in all databases
+
 See the linked sections for details of which version each feature was first introduced in.
 
 ### Configuring the length of indexes with `length` (MySQL)
@@ -202,9 +206,9 @@ model Example {
   id    Int  @id
   value Json
   //    ^ field type matching the operator class
-  //                  ^ operator class      ^ index type
 
   @@index([value(ops: JsonbPathOps)], type: Gin)
+  //                  ^ operator class      ^ index type
 }
 ```
 
@@ -340,9 +344,9 @@ model Example {
   id    Int @id
   value Int
   //    ^ field type matching the operator class
-  //                  ^ operator class      ^ index type
 
   @@index([value(ops: Int4BloomOps)], type: Brin)
+  //                  ^ operator class      ^ index type
 }
 ```
 
@@ -458,6 +462,54 @@ The default value of `clustered` for each attribute is as follows:
 
 A table can have at most one clustered index.
 
+### Configuring the name of indexes with `map`
+
+The `map` argument allows you to specify a custom name for the index or constraint in the underlying database. This is useful when you want to use a specific naming convention or when the auto-generated name doesn't meet your requirements.
+
+The `map` argument is available on the `@id`, `@@id`, `@unique`, `@@unique` and `@@index` attributes.
+
+As an example, the following model configures a custom name for the index on the `title` field:
+
+```prisma file=schema.prisma showLineNumbers
+model Post {
+  id    Int    @id
+  title String
+
+  @@index([title], map: "my_custom_index_name")
+}
+```
+
+This translates to the following SQL command (PostgreSQL example):
+
+```sql
+CREATE INDEX "my_custom_index_name" ON "Post" ("title");
+```
+
+Without the `map` argument, Prisma would generate a default name like `Post_title_idx`.
+
+The `map` argument can also be used on unique constraints:
+
+```prisma file=schema.prisma showLineNumbers
+model User {
+  id    Int    @id
+  email String @unique(map: "unique_user_email")
+}
+```
+
+And on composite indexes and constraints:
+
+```prisma file=schema.prisma showLineNumbers
+model Post {
+  id        Int    @id
+  title     String
+  author    String
+  createdAt DateTime
+
+  @@index([author, createdAt], map: "posts_author_date_idx")
+  @@unique([title, author], map: "posts_title_author_unique")
+}
+```
+
 ### Upgrading from previous versions
 
 :::warning