Merge branch 'main' into feat/DC-4631-dropdown-toc

Author: carlagn

content/200-orm/100-prisma-schema/20-data-model/65-externally-managed-tables.mdx

@@ -115,7 +115,31 @@ Relationships from an external table to a managed table, where the external tabl
 
 ## Example
 
-Assume you have the following tables in a PostgreSQL database in the default `public` schema:
+Assume you have the following Prisma schema which only contains the `posts` table:
+
+```prisma
+generator client {
+  provider = "prisma-client-js"
+  // ...
+}
+
+datasource db {
+  provider = "postgresql"
+  // ...
+}
+
+model posts {
+  id          Int       @id @default(autoincrement())
+  created_at  DateTime  @default(now())
+  title       String
+  content     String?
+}
+```
+
+You have created that `posts` table already via a prior migration. 
+You now also have a `users` table and `role` enum in your database which you want to treat as externally managed.
+
+So the tables in your PostgreSQL database in the default `public` schema look like this:
 
 ```sql
 -- Enum used by users table
@@ -126,7 +150,7 @@ CREATE TABLE users (
   id SERIAL PRIMARY KEY,
   username VARCHAR(50) NOT NULL UNIQUE,
   email VARCHAR(100) NOT NULL UNIQUE,
-  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
   role role
 );
 
@@ -139,17 +163,6 @@ CREATE TABLE posts (
 );
 ```
 
-The Prisma schema only contains the `posts` table at this point:
-
-```prisma
-model posts {
-  id          Int       @id @default(autoincrement())
-  created_at  DateTime  @default(now())
-  title       String
-  content     String?
-}
-```
-
 ### 1. Declaring externally managed tables in Prisma Config
 
 Enable use of externally managed tables via the `tables.external` property:
@@ -242,7 +255,7 @@ model posts {
   title      String    @db.VarChar(200)
   content    String?
   // add-start
-  author     user @relation(fields: [authorId], references: [id])
+  author     users @relation(fields: [author_id], references: [id])
   author_id  Int
   // add-end
 }
@@ -254,7 +267,7 @@ model users {
   created_at DateTime? @default(now()) @db.Timestamp(6)
   role       role
   // add-start
-  posts Post[]
+  posts      posts[]
   // add-end
 }
 

content/250-postgres/100-introduction/250-overview.mdx

@@ -35,7 +35,7 @@ Spend limits are available on the Pro plan and higher. Please note that the spen
 
 ### Restarting your database when changing your subscription
 
-When changing your subscription from Starter to Pro/Business or from Pro/Business to Start, your database instance is being restarted. This may cause a downtime of ~1second.
+When changing your subscription from Free to Starter/Pro/Business or from Starter/Pro/Business to Free, your database instance is being restarted. This may cause a downtime of ~1second.
 
 :::note
 This is temporary. In the future, there won't be any downtime when up- or downgrading a plan.

content/250-postgres/1200-more/1000-faq.mdx

@@ -161,7 +161,7 @@ We will use the following equations to estimate the monthly bill:
 
 ```
 total_ops            = MAUs x actions_per_user_per_day x 30      
-billable_ops         = total_ops - 100_000
+billable_ops         = total_ops - included_ops_for_plan
 ops_cost             = (billable_ops ÷ 1_000_000) x plan_rate
 
 billable_storage_GB  = storage_used_GB - free_storage_for_plan
@@ -176,23 +176,26 @@ You can use your own MAU count, activity level, and storage used to project cost
 
 :::
 
-We will associate each workload with a plan and its corresponding pricing details, for example, the **Starter plan** for the small workload, the **Pro plan** for the medium workload, and the **Business Annual plan** for the large workload. Then we will apply the equations to the example workloads to generate a rough estimate of a monthly bill. For example:
+We will associate each workload with a paid plan and its corresponding pricing details, for example, the **Starter plan** for the small workload, the **Pro plan** for the medium workload, and the **Business plan** for the large workload. Then we will apply the equations to the example workloads to generate a rough estimate of a monthly bill. For example:
 
 :::note[Pricing details]
 
 Here are the details for each pricing plan:
 
-- **Starter plan** - \$18 per million operations
-  - Base plan fee - \$0 per month
-  - Storage - 1 GB free then \$2 per additional GB
-- **Pro plan** - \$8 per million operations
+- **Starter plan** - \$8 per million operations
+  - Base plan fee - \$10 per month
+  - Included operations - 1,000,000
+  - Storage - 10 GB free then \$2 per additional GB
+- **Pro plan** - \$2 per million operations
   - Base plan fee - \$49.00 per month
-  - Storage - 5 GB free then \$1.5 per additional GB
-- **Business Annual plan** - \$4 per million operations in the 50-100M/month usage bracket
+  - Included operations - 10,000,000
+  - Storage - 50 GB free then \$1.5 per additional GB
+- **Business plan** - \$1 per million operations
   - Base plan fee - \$129.00 per month
-  - Storage - 10 GB free then \$1 per additional GB
+  - Included operations - 50,000,000
+  - Storage - 100 GB free then \$1 per additional GB
 
-You can also learn more about the pricing details for each plan on the [pricing page](https://www.prisma.io/pricing?utm_source=docs).
+We also have a Free plan, but we are leaving it out in the following calculations because it's intended for evaluation only and is not meant for production workloads. You can also learn more about the pricing details for each plan on the [pricing page](https://www.prisma.io/pricing?utm_source=docs).
 
 :::
 
@@ -201,36 +204,36 @@ You can also learn more about the pricing details for each plan on the [pricing
 A hobby or early-stage side-project with ~`500` MAUs. Each user performs ~`10` actions per day, and the entire database uses ~`0.5` GB of storage. Based on the assumptions, you would calculate the monthly bill using the following equations:
 
 - `total_ops` = `500` x `10` x `30` = `150000`
-- `billable_ops` = `50000`
-- `ops_cost` = (`50000` ÷ `1000000`) x $`18` = $`0.90`
-- `storage_cost` = $`0` (0.5 GB is below the 1 GB free tier)
-- `base_plan_fee` = $`0`
+- `billable_ops` = `0` (150,000 operations is below the 1 million free operations)
+- `ops_cost` = $`0` 
+- `storage_cost` = $`0` (0.5 GB is below the 10 GB storage already included)
+- `base_plan_fee` = $`10`
 
-`total_monthly_cost` = $`0.90` per month
+`total_monthly_cost` = $`10.00` per month
 
 **Example of a medium workload on the Pro plan**:
 
 A growing SaaS product serving ~`5000` MAUs. Power users average ~`40` actions per day, and the app stores ~`6` GB of data. Based on the assumptions, you would calculate the monthly bill using the following equations:
 
 - `total_ops` = `5000` x `40` x `30` = `6000000`
-- `billable_ops` = `5900000`
-- `ops_cost` = (`5900000` ÷ `1000000`) = `5.9` x $`8` = $`47.20`
-- `storage_cost` = (`6` GB - `5` GB) x $`1.50` = $`1.50`
+- `billable_ops` = `0` (6 million operations is below the 10 million free operations) 
+- `ops_cost` = $`0`
+- `storage_cost` = $`0` (6 GB is below the 50 GB storage already included)
 - `base_plan_fee` = $`49.00`
 
-`total_monthly_cost` = $`47.20` + $`1.50` + $`49.00` = $`97.70` per month
+`total_monthly_cost` = $`49.00` per month
 
-**Example of a large workload on the Business Annual plan**:
+**Example of a large workload on the Business plan**:
 
 A production-grade, consumer-facing application handling ~`50000` MAUs. Heavy usage with ~`60` actions per user per day drives significant traffic, and the dataset reaches ~`40` GB.  Based on the assumptions, you would calculate the monthly bill using the following equations:
 
 - `total_ops` = `50000` x `60` x `30` = `90000000`
-- `billable_ops` = `89900000`
-- `ops_cost` = (`89900000` ÷ `1000000`) = `89.9` x $`4` = $`359.6`
-- `storage_cost` = (`40` GB - `10` GB) x $`1` = $`30.00`
+- `billable_ops` = `90000000` - `50000000` = `40000000`
+- `ops_cost` = (`40000000` ÷ `1000000`) = `40.00` x $`1` = $`40.00`
+- `storage_cost` = $`0.00` (40 GB is below the 100 GB storage already included)
 - `base_plan_fee` = $`129.00`
 
-`total_monthly_cost` = $`359.6` + $`30.00` + $`129.00` = $`518.60` per month
+`total_monthly_cost` = $`40.00` + $`129.00` = $`169.00` per month
 
 ### Are cached operations billed the same?
 
@@ -330,11 +333,11 @@ Using on-demand cache invalidation in these scenarios helps keep only the necess
 
 Yes, you can increase your Prisma Postgres limits based on your subscription plan. Here are the configurable limits:
 
-| Limit                          | Starter           | Pro Plan          | Business Plan     | 
-|--------------------------------|-------------------|-------------------|-------------------|
-| **Query timeout**              | Up to 10 seconds  | Up to 20 seconds  | Up to 60 seconds  |
-| **Interactive transactions timeout** | Up to 15 seconds  | Up to 30 seconds  | Up to 90 seconds  |
-| **Response size**              | Up to 5 MB        | Up to 10 MB       | Up to 20 MB       |
+| Limit                                | Free             | Starter           | Pro Plan          | Business Plan     |
+|--------------------------------------|------------------|-------------------|-------------------|-------------------|
+| **Query timeout**                    | Up to 10 seconds  | Up to 10 seconds  | Up to 20 seconds  | Up to 60 seconds  |
+| **Interactive transactions timeout** | Up to 15 seconds  | Up to 15 seconds  | Up to 30 seconds  | Up to 90 seconds  |
+| **Response size**                    | Up to 5 MB       | Up to 5 MB        | Up to 10 MB       | Up to 20 MB       |
 
 Check the [pricing page](https://www.prisma.io/pricing) for more details on the available plans and their corresponding limits.
 

content/250-postgres/300-database/400-connection-pooling.mdx

@@ -25,6 +25,7 @@ Currently, Prisma Postgres allows a maximum of 10 concurrent database connection
 
 If you're using **your own database** with Prisma Accelerate, the connection limits differ:
 
+- **Free plan**: Maximum of `10` connections.
 - **Starter plan**: Maximum of `10` connections. This is often sufficient for most workloads, but if you're expecting high traffic or intensive compute operations, you may want to [increase this limit](#configuring-the-connection-pool-size).
 - **Pro plan**: Supports up to `100` concurrent connections.
 - **Business plan**: Supports up to `1000` concurrent connections.
@@ -68,9 +69,9 @@ You can configure the minimum and maximum query response size, query duration, a
 
 Prisma Postgres has a default global timeout of `10s` for each query, configurable using the slider labeled **Query duration**, based on your subscription plan:
 
-| Plan     | Starter       | Pro          | Business      |
-|----------|---------------|--------------|---------------|
-| Query timeout  | Up to `10` seconds | Up to `20` seconds | Up to `60` seconds |
+| Plan          | Free            | Starter         | Pro            | Business        |
+|---------------|-----------------|-----------------|----------------|-----------------|
+| Query timeout | Up to `10` seconds | Up to `10` seconds | Up to `20` seconds | Up to `60` seconds |
 
 See the [error reference](/postgres/database/error-reference#p6004-querytimeout) and our [pricing page](https://www.prisma.io/pricing) for more information.
 
@@ -83,9 +84,9 @@ While you can increase the query timeout, it's recommended to inspect and optimi
 
 Prisma Postgres has a default global timeout of `15s` for each [interactive transaction](/orm/prisma-client/queries/transactions#interactive-transactions), configurable using the slider labeled **Transaction duration**, based on your subscription plan:
 
-| Plan                       | Starter       | Pro          | Business      |
-|----------------------------|---------------|--------------|---------------|
-| Interactive transaction limit | Up to `15` seconds | Up to `30` seconds | Up to `90` seconds |
+| Plan                          | Free           | Starter       | Pro          | Business      |
+|-------------------------------|----------------|---------------|--------------|---------------|
+| Interactive transaction limit | Up to `15` seconds | Up to `15` seconds | Up to `30` seconds | Up to `90` seconds |
 
 See the [error reference](/postgres/database/error-reference#p6004-querytimeout) and our [pricing page](https://www.prisma.io/pricing#accelerate) for more information.
 
@@ -112,9 +113,9 @@ While you can increase the interactive transaction timeout limit, it's recommend
 
 Prisma Postgres has a default global response size limit of `5MB`, configurable using the slider labeled **Response size**, based on your subscription plan:
 
-| Plan     | Starter       | Pro          | Business      |
-|----------|---------------|--------------|---------------|
-| Query size | Up to `5MB`     | Up to `10MB`   | Up to `20MB`    |
+| Plan       | Free         | Starter       | Pro          | Business      |
+|------------|--------------|---------------|--------------|---------------|
+| Query size | Up to `5MB`  | Up to `5MB`   | Up to `10MB` | Up to `20MB`  |
 
 See the [error reference](/postgres/database/error-reference#p6009-responsesizelimitexceeded) and our [pricing page](https://www.prisma.io/pricing#accelerate) for more information.
 
@@ -143,13 +144,14 @@ This distributed model allows your application to handle increased traffic by sp
 
 ### Enabling Autoscaling
 
-Autoscaling is automatically enabled **when your Accelerate connection limit is set above the default (10)**. This feature is **not available on the Starter plan**.
+Autoscaling is automatically enabled **when your Accelerate connection limit is set above the default (10)**. This feature is **not available on the Free or Starter plan**.
 
 Your environment's maximum connection limit is based on your [Prisma Data Platform plan](https://www.prisma.io/pricing):
 
 | Plan        | Max Connection Limit                 |
 |-------------|--------------------------------------|
-| Starter     | `10`                                   |
-| Pro         | `100`                                  |
-| Business    | `1000`                                 |
+| Free        | `10`                                   |
+| Starter     | `10`                                  |
+| Pro         | `100`                                 |
+| Business    | `1000`                                |
 | Enterprise  | [Contact Us](mailto:sales@prisma.io) |

content/250-postgres/300-database/525-postgres-extensions.mdx

@@ -12,6 +12,12 @@ sidebar_class_name: early-access-badge
 Prisma Postgres supports the following [PostgreSQL extensions](https://www.postgresql.org/docs/current/sql-createextension.html):
 
 - [`pgvector`](https://github.com/pgvector/pgvector)
+- [`pg_stat_statements`](https://www.postgresql.org/docs/current/pgstatstatements.html)
+- [`citext`](https://www.postgresql.org/docs/current/citext.html)
+- [`pg_trgm`](https://www.postgresql.org/docs/current/pgtrgm.html)
+- [`fuzzystrmatch`](https://www.postgresql.org/docs/current/fuzzystrmatch.html)
+- [`unaccent`](https://www.postgresql.org/docs/current/unaccent.html)
+- [`pg_search`](https://pgxn.org/dist/pg_search)
 
 Support for [more extensions](#other-extensions-are-coming-soon) will follow soon. If there are specific extensions you'd like to see in Prisma Postgres, [fill out this form](https://pris.ly/i-want-extensions).
 
@@ -161,7 +167,6 @@ Support for the following extensions is going to come soon:
 
 - [`pgcrypto`](https://www.postgresql.org/docs/current/pgcrypto.html)
 - [`postgis`](https://postgis.net/)
-- [`pg_search`](https://www.paradedb.com/blog/introducing_search)
 - [`contrib`](https://www.postgresql.org/docs/current/contrib.html) extensions
 
 If there are specific extensions you'd like to see, [fill out this form](https://pris.ly/i-want-extensions).

content/250-postgres/300-database/650-direct-connections.mdx

@@ -58,18 +58,18 @@ Prisma Postgres closes idle connections after an extended period of time. If tha
 
 While direct connections are in Early Access, the following connection limits apply:
 
-|                                      | Starter (Free)   | Pro              | Business         |
-| ------------------------------------ | ---------------- | ---------------- | ---------------- |
-| **Connection limit**                 | Max 20           | Max 20           | Max 20          |
+|                                      | Free             | Starter          | Pro              | Business         |
+| ------------------------------------ | ---------------- | ---------------- | ---------------- | ---------------- |
+| **Connection limit**                 | Max 10            | Max 10           | Max 50           | Max 100           |
 
 ### Query and transaction timeouts
 
 While direct connections are in Early Access, the following timeouts apply:
 
-|                                      | Starter (Free)   | Pro              | Business         |
-| ------------------------------------ | ---------------- | ---------------- | ---------------- |
-| **Query timeout**                    | Up to 10 seconds | Up to 10 seconds | Up to 10 seconds |
-| **Interactive transactions timeout** | Up to 15 seconds | Up to 15 seconds | Up to 15 seconds |
+|                                      | Free             | Starter          | Pro              | Business         |
+| ------------------------------------ | ---------------- | ---------------- | ---------------- | ---------------- |
+| **Query timeout**                    | Up to 10 seconds  | Up to 10 seconds | Up to 10 seconds | Up to 10 seconds |
+| **Interactive transactions timeout** | Up to 15 seconds  | Up to 15 seconds | Up to 15 seconds | Up to 15 seconds |
 
 ### Limited user permissions
 

content/300-accelerate/600-faq.mdx

@@ -157,11 +157,11 @@ If you don't need [interactive transactions](/orm/prisma-client/queries/transact
 
 Yes, you can increase your Accelerate limits based on your subscription plan. Here are the configurable limits:
 
-| Limit                                | Starter          | Pro Plan         | Business Plan    |
-| ------------------------------------ | ---------------- | ---------------- | ---------------- |
-| **Query timeout**                    | Up to 10 seconds | Up to 20 seconds | Up to 60 seconds |
-| **Interactive transactions timeout** | Up to 15 seconds | Up to 30 seconds | Up to 90 seconds |
-| **Response size**                    | Up to 5 MB       | Up to 10 MB      | Up to 20 MB      |
+| Limit                                | Free             | Starter          | Pro Plan         | Business Plan    |
+| ------------------------------------ | ---------------- | ---------------- | ---------------- | ---------------- |
+| **Query timeout**                    | Up to 10 seconds  | Up to 10 seconds | Up to 20 seconds | Up to 60 seconds |
+| **Interactive transactions timeout** | Up to 15 seconds  | Up to 15 seconds | Up to 30 seconds | Up to 90 seconds |
+| **Response size**                    | Up to 5 MB       | Up to 5 MB       | Up to 10 MB      | Up to 20 MB      |
 
 Check the [pricing page](https://www.prisma.io/pricing#accelerate) for more details on the available plans and their corresponding limits.
 

content/500-platform/10-about.mdx

@@ -110,13 +110,11 @@ The **Database** tab in the left panel of a project environment lets you configu
 
 ## Billing
 
-The [subscription plan](https://www.prisma.io/pricing?utm_source=docs&utm_medium=platform-docs) you select in your workspace determines how many projects and environments you can create in that workspace:
+The [subscription plan](https://www.prisma.io/pricing?utm_source=docs&utm_medium=platform-docs) you select in your workspace determines how many databases you can create in that workspace:
 
-|                  | **Starter** | **Pro**     | **Business** | **Enterprise** |
-| ---------------- | :---------- | ----------- | ------------ | -------------- |
-| **Projects**     | 5           | 60          | 180          | Custom         |
-| **Environments** | 2 / project | 6 / project | 12 / project | Custom         |
-| **Databases**    | 10          | 60          | 180          | Custom         |
+|                  | **Free**    | **Starter** | **Pro**     | **Business** | **Enterprise** |
+| ---------------- | ----------- | ----------- | ----------- | ------------ | -------------- |
+| **Databases**    | 5           | 10          | 100          | 1000          | Custom         |
 
 ### Per-workspace billing
 

content/800-guides/210-shopify.mdx

@@ -671,4 +671,4 @@ Now that you have a working Shopify app connected to a Prisma Postgres database,
 ### More Info
 
 - [Prisma Documentation](/orm/overview/introduction)
-- [Shopify Dev Documentation](https://shopify.dev/docs/)
+- [Shopify Dev Documentation](https://shopify.dev/docs)