Merge branch 'main' into patch-1

Author: aidankmcalister

cSpell.json

@@ -126,7 +126,8 @@
     "PGSSLMODE",
     "pgloader",
     "unikernel",
-    "Mikro"
+    "Mikro",
+    "databaseto"
   ],
   "patterns": [
     {

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

@@ -54,6 +54,8 @@ You can connect to your database using a Node.js-based driver from Prisma Client
 - SQLite
   - [`better-sqlite3`](/orm/overview/databases/sqlite#using-the-better-sqlite3-driver)
   - [`libSQL`](/orm/overview/databases/turso#how-to-connect-and-query-a-turso-database) (Turso)
+- MSSQL
+  - [`node-mssql`](/orm/overview/databases/sql-server#using-the-node-mssql-driver)
 
 ### Serverless driver adapters
 

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

@@ -6,12 +6,8 @@ tocDepth: 4
 toc_max_heading_level: 4
 ---
 
-<TopBlock>
-
 The Microsoft SQL Server data source connector connects Prisma ORM to a [Microsoft SQL Server](https://learn.microsoft.com/en-us/sql/sql-server/?view=sql-server-ver15) database server.
 
-</TopBlock>
-
 ## Example
 
 To connect to a Microsoft SQL Server database, you need to configure a [`datasource`](/orm/prisma-schema/overview/data-sources) block in your [Prisma schema](/orm/prisma-schema):
@@ -28,6 +24,72 @@ The fields passed to the `datasource` block are:
 - `provider`: Specifies the `sqlserver` data source connector.
 - `url`: Specifies the [connection URL](#connection-details) for the Microsoft SQL Server database. In this case, an [environment variable is used](/orm/prisma-schema/overview#accessing-environment-variables-from-the-schema) to provide the connection URL.
 
+
+## Using the `node-mssql` driver
+
+As of [`v5.4.0`](https://github.com/prisma/prisma/releases/tag/5.4.0), you can use Prisma ORM with database drivers from the JavaScript ecosystem (instead of using Prisma ORM's built-in drivers). You can do this by using a [driver adapter](/orm/overview/databases/database-drivers).
+
+For SQLite, [`node-mssql`](https://github.com/tediousjs/node-mssql) is one of the most popular drivers in the JavaScript ecosystem. 
+
+This section explains how you can use it with Prisma ORM and the `@prisma/adapter-mssql` driver adapter.
+
+### 1. Enable the `driverAdapters` Preview feature flag
+
+Since driver adapters are currently in [Preview](/orm/more/releases#preview), you need to enable its feature flag on the `datasource` block in your Prisma schema:
+
+```prisma file=schema.prisma
+generator client {
+  provider        = "prisma-client-js"
+  previewFeatures = ["driverAdapters"]
+}
+
+datasource db {
+  provider = "sqlserver"
+  url      = env("DATABASE_URL")
+}
+```
+
+Once you have added the feature flag to your schema, re-generate Prisma Client:
+
+```terminal
+npx prisma generate
+```
+
+### 2. Install the dependencies
+
+Next, install Prisma ORM's driver adapter for `node-mssql`:
+
+```terminal
+npm install @prisma/adapter-mssql
+```
+
+### 3. Instantiate Prisma Client using the driver adapter
+
+Finally, when you instantiate Prisma Client, you need to pass an instance of Prisma ORM's driver adapter to the `PrismaClient` constructor:
+
+```ts
+import { PrismaMssql } from '@prisma/adapter-mssql'
+import { PrismaClient } from '@prisma/client'
+
+const config = {
+  server: 'localhost',
+  port: 1433,
+  database: 'mydb',
+  user: 'sa',
+  password: 'mypassword',
+  options: {
+    encrypt: true, // Use this if you're on Windows Azure
+    trustServerCertificate: true, // Use this if you're using self-signed certificates
+  },
+}
+
+const adapter = new PrismaMssql(config)
+const prisma = new PrismaClient({ adapter })
+```
+
+
+
+
 ## Connection details
 
 The connection URL used to connect to an Microsoft SQL Server database follows the [JDBC standard](https://learn.microsoft.com/en-us/sql/connect/jdbc/building-the-connection-url?view=sql-server-ver15).

content/200-orm/050-overview/500-databases/850-planetscale.mdx

@@ -6,14 +6,10 @@ tocDepth: 3
 toc: true
 ---
 
-<TopBlock>
-
 Prisma and [PlanetScale](https://planetscale.com/) together provide a development arena that optimizes rapid, type-safe development of data access applications, using Prisma's ORM and PlanetScale's highly scalable MySQL-based platform.
 
 This document discusses the concepts behind using Prisma ORM and PlanetScale, explains the commonalities and differences between PlanetScale and other database providers, and leads you through the process for configuring your application to integrate with PlanetScale.
 
-</TopBlock>
-
 ## What is PlanetScale?
 
 PlanetScale uses the [Vitess](https://vitess.io/) database clustering system to provide a MySQL-compatible database platform. Features include:
@@ -71,7 +67,7 @@ In Prisma ORM versions 3.1.1 and later, you can [emulate relations in Prisma Cli
 
 To enable emulation of relations in Prisma Client, set the `relationMode` field to `"prisma"` in the `datasource` block:
 
-```prisma file=schema.prisma showLineNumbers
+```prisma file=schema.prisma
 datasource db {
   provider     = "mysql"
   url          = env("DATABASE_URL")
@@ -91,7 +87,7 @@ If you use relations in your Prisma schema with the default `"foreignKeys"` opti
 
 When [you emulate relations in Prisma Client](#option-1-emulate-relations-in-prisma-client), you need to create your own indexes. As an example of a situation where you would want to add an index, take this schema for a blog with posts and comments:
 
-```prisma file=schema.prisma showLineNumbers
+```prisma file=schema.prisma
 model Post {
   id       Int       @id @default(autoincrement())
   title    String
@@ -112,7 +108,7 @@ The `postId` field in the `Comment` model refers to the corresponding `id` field
 
 To avoid this, you can define an index on the `postId` field using [Prisma ORM's `@@index` argument](/orm/reference/prisma-schema-reference#index):
 
-```prisma file=schema.prisma highlight=15;add showLineNumbers
+```prisma file=schema.prisma highlight=15;add
 model Post {
   id       Int       @id @default(autoincrement())
   title    String
@@ -150,7 +146,7 @@ You can then use Prisma ORM and define relations in your Prisma schema without t
 
 In that case, you can define a relation as with other database that supports foreign key constraints, for example:
 
-```prisma file=schema.prisma showLineNumbers
+```prisma file=schema.prisma
 model Post {
   id       Int       @id @default(autoincrement())
   title    String
@@ -182,7 +178,7 @@ As an example, let's say you decide to decide to add a new `excerpt` field to th
 
 Next, add the following to your `schema.prisma` file:
 
-```prisma file=schema.prisma highlight=5;edit showLineNumbers
+```prisma file=schema.prisma highlight=5;edit
 model Post {
   id       Int       @id @default(autoincrement())
   title    String
@@ -213,13 +209,13 @@ Once you are happy with your changes on your development branch, you can open a
 
 For more examples, see PlanetScale's tutorial on [automatic migrations with Prisma ORM](https://planetscale.com/docs/prisma/automatic-prisma-migrations) using `db push`.
 
-## How to add in missing relations after Introspection
+## How to add in missing relations after introspection
 
 > **Note**: This section is only relevant if you use `relationMode = "prisma"` to emulate foreign key constraints with Prisma ORM. If you enabled foreign key constraints in your PlanetScale database, you can ignore this section.
 
 After introspecting with `npx prisma db pull`, the schema you get may be missing some relations. For example, the following schema is missing a relation between the `User` and `Post` models:
 
-```prisma file=schema.prisma showLineNumbers
+```prisma file=schema.prisma
 model Post {
   id        Int      @id @default(autoincrement())
   createdAt DateTime @default(now())
@@ -239,7 +235,7 @@ model User {
 
 In this case you need to add the relation in manually:
 
-```prisma file=schema.prisma highlight=6,16;add showLineNumbers
+```prisma file=schema.prisma highlight=6,16;add
 model Post {
   id        Int      @id @default(autoincrement())
   createdAt DateTime @default(now())
@@ -263,6 +259,44 @@ model User {
 
 For a more detailed example, see the [Getting Started guide for PlanetScale](/getting-started/setup-prisma/add-to-existing-project/relational-databases/introspection-typescript-planetscale).
 
+## How to define shard keys in your Prisma schema (Preview)
+
+[Sharding](https://planetscale.com/docs/vitess/sharding) is a popular technique to scale up when database load grows. 
+
+As of [v6.10.0](https://github.com/prisma/prisma/releases/tag/6.10.0), Prisma ORM supports sharding on PlanetScale natively (as a [Preview](/orm/more/releases#preview) feature) via the [`@shardKey`](/orm/reference/prisma-schema-reference#shardkey) and [`@@shardKey`](/orm/reference/prisma-schema-reference#shardkey-1) attributes in the Prisma schema which you can apply to the fields in your models that should serve as shard keys in your database setup.
+
+In order to use the shard key attributes, you need to specify the `shardKeys` Preview feature on your `generator`:
+
+```prisma
+generator client {
+  provider = "prisma-client-js"
+  output = "../generated/prisma"
+  previewFeatures = ["shardKeys"]
+}
+```
+
+Now you can use the `@shardKey` and `@@shardKey` attributes:
+
+**Single-column shard key**
+
+```prisma
+model User {
+  id     String @default(uuid())
+  region String @shardKey
+}
+```
+
+**Multi-column shard key**
+
+```prisma
+model User {
+  id         String @default(uuid())
+  country    String
+  customerId String
+  @@shardKey([country, customerId])
+}
+```
+
 ## How to use the PlanetScale serverless driver with Prisma ORM (Preview)
 
 The [PlanetScale serverless driver](https://planetscale.com/docs/tutorials/planetscale-serverless-driver) provides a way of communicating with your database and executing queries over HTTP.

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

@@ -161,16 +161,35 @@ In the future, you can safely include the generated directory in version control
 
 #### 4. Use Prisma Client in your application
 
-After generating the Prisma Client, import the types from the path you specified:
+#### Importing Prisma Client
+
+After generating the Prisma Client, import it from the path you specified:
 
 ```ts file=src/index.ts
-import { PrismaClient } from "./generated/prisma/client"
+import { PrismaClient } from "./generated/prisma/client.js"
 
 const prisma = new PrismaClient()
 ```
 
 Prisma Client is now ready to use in your project.
 
+#### Importing generated model types
+
+If you're importing types generated for your models, you can do so as follows:
+
+```ts file=src/index.ts
+import { User, Post } from "./generated/prisma/models.js"
+```
+
+#### Importing generated enum types
+
+
+If you're importing types generated for your enums, you can do so as follows:
+
+```ts file=src/index.ts
+import { Role } from "./generated/prisma/enums.js"
+```
+
 ### Field reference
 
 Use the following options in the `generator client { ... }` block. Only `output` is required. The other fields have defaults or are inferred from your environment and `tsconfig.json`.
@@ -223,7 +242,6 @@ generated/
     ├── client.ts
     ├── commonInputTypes.ts
     ├── enums.ts
-    ├── index.ts
     ├── internal
     │   ├── class.ts
     │   └── prismaNamespace.ts