{props.meta?.tocVideo && !!tocVideoPreview && (
+
{props.meta.tocVideo}
)}
diff --git a/apps/docs/pages/guides/auth/row-level-security.mdx b/apps/docs/pages/guides/auth/row-level-security.mdx
index 148c62ad2152f..2a3ba432e2488 100644
--- a/apps/docs/pages/guides/auth/row-level-security.mdx
+++ b/apps/docs/pages/guides/auth/row-level-security.mdx
@@ -3,8 +3,9 @@ import Layout from '~/layouts/DefaultGuideLayout'
export const meta = {
id: 'row-level-security',
title: 'Row Level Security',
- description: 'Secure your data using Postgres Row Level Security.',
- video: 'https://www.youtube.com/v/Ow_Uzedfohk',
+ description: 'Using Row Level Security with Supabase Auth.',
+ subtitle: 'Using Row Level Security with Supabase Auth.',
+ tocVideo: 'Ow_Uzedfohk',
}
When you need granular authorization rules, nothing beats PostgreSQL's [Row Level Security (RLS)](https://www.postgresql.org/docs/current/ddl-rowsecurity.html).
@@ -55,30 +56,6 @@ Returns the JWT of the user making the request.
Here are some examples to show you the power of PostgreSQL's RLS.
-### Allow read access
-
-```sql
--- 1. Create table
-create table profiles (
- id uuid references auth.users,
- avatar_url text
-);
-
--- 2. Enable RLS
-alter table profiles
- enable row level security;
-
--- 3. Create Policy
-create policy "Public profiles are viewable by everyone."
- on profiles for select using (
- true
- );
-```
-
-1. Creates a table called `profiles` in the public schema (default schema).
-2. Enables Row Level Security.
-3. Creates a policy which allows all `select` queries to run.
-
### Restrict updates
```sql
@@ -210,31 +187,6 @@ create policy "Only Blizzard staff can update leaderboard"
);
```
-### Time to live for rows
-
-Policies can also be used to implement TTL or time to live feature that you see in Instagram stories or Snapchat.
-In the following example, rows of `stories` table are available only if they have been created within the last 24 hours.
-
-```sql
--- 1. Create table
-create table if not exists stories (
- id uuid not null primary key DEFAULT uuid_generate_v4(),
- created_at timestamp with time zone default timezone('utc' :: text, now()) not null,
- content text not null
-);
-
--- 2. Enable RLS
-alter table stories
- enable row level security;
-
--- 3. Create Policy
-create policy "Stories are live for a day"
- on stories
- for select using (
- created_at > (current_timestamp - interval '1 day')
- );
-```
-
### Advanced policies
Use the full power of SQL to build extremely advanced rules.
@@ -285,17 +237,20 @@ using (
);
```
-## Tips
-
-### You don't have to use policies
+## Using external authorization systems
-You can also put your authorization rules in your middleware, similar to how you would create security rules with any other `backend <-> middleware <-> frontend` architecture. You can use Edge Functions to run this architecture, or you can use your favorite server framework, like Rails, Django, Node.js, Phoenix, or Laravel.
+If you want to use another authorization method for your applications that's also fine. Supabase is "just Postgres", so if your application works with Postgres, then it also works with Supabase. If you take this path, don't put your tables in the `public` schema - instead create a new schema for your tables and functions:
-Policies are a tool. In the case of "serverless/Jamstack" setups, they are especially effective because you don't have to deploy any middleware at all and can use the javascript libraries directly from the browser.
+```sql
+create schema private;
-That said, if you want to use another authorization method for your applications that's also fine. Supabase is "just Postgres", so if your application works with Postgres, then it also works with Supabase.
+create table private.employees (
+ id serial primary key,
+ name text
+);
+```
-If you plan to use this approach make sure to enable RLS for your tables. Then use the `service_role` key (for our client libraries) or the `postgres` role - both of these can bypass RLS. You don't need to create any policies with this approach, simply enabling RLS is sufficient:
+If you do put anything in the `public` schema, make sure to enable RLS (you don't need to add any policies):
```sql
create table profiles (
@@ -306,6 +261,9 @@ create table profiles (
alter table profiles enable row level security;
```
+This makes the tables inaccessible via the [Serverless APIs](/docs/guides/api).
+
+
### Never use a service key on the client
Supabase provides special "Service" keys, which can be used to bypass all RLS.
diff --git a/apps/docs/pages/guides/database/full-text-search.mdx b/apps/docs/pages/guides/database/full-text-search.mdx
index 430bddc471c74..14981b182e394 100644
--- a/apps/docs/pages/guides/database/full-text-search.mdx
+++ b/apps/docs/pages/guides/database/full-text-search.mdx
@@ -4,7 +4,8 @@ export const meta = {
id: 'full-text-search',
title: 'Full Text Search',
description: 'How to use full text search in PostgreSQL.',
- video: 'https://www.youtube.com/v/b-mgca_2Oe4',
+ subtitle: 'How to use full text search in PostgreSQL.',
+ tocVideo: 'b-mgca_2Oe4',
}
Postgres has built-in functions to handle `Full Text Search` queries. This is like a "search engine" within Postgres.
diff --git a/apps/docs/pages/guides/database/inspect.mdx b/apps/docs/pages/guides/database/inspect.mdx
index 7cf71d50fd862..5b747333c04f2 100644
--- a/apps/docs/pages/guides/database/inspect.mdx
+++ b/apps/docs/pages/guides/database/inspect.mdx
@@ -2,7 +2,7 @@ import Layout from '~/layouts/DefaultGuideLayout'
export const meta = {
id: 'json',
- title: 'Analyzing efficiency and performance from the terminal',
+ title: 'Debugging and monitoring',
description:
'Inspecting your Postgres database for common issues around disk, query performance, index, locks, and more using the terminal.',
}
diff --git a/apps/docs/pages/guides/database/managing-passwords.mdx b/apps/docs/pages/guides/database/managing-passwords.mdx
index f96c00437ac6c..4fc8c3a8b36c7 100644
--- a/apps/docs/pages/guides/database/managing-passwords.mdx
+++ b/apps/docs/pages/guides/database/managing-passwords.mdx
@@ -6,7 +6,7 @@ export const meta = {
description: 'How to change your PostgreSQL database password.',
}
-Your PostgreSQL database is the core of your Supabase project, so it's important that it has a strong, secure password at all times.
+Your Postgres database is the core of your Supabase project, so it's important that it has a strong, secure password at all times.
If you use special symbols in your postgres password, you must remember to [percent-encode](https://en.wikipedia.org/wiki/Percent-encoding) your password later if using the postgres connection string e.g. `postgresql://postgres:p%3Dword@db.cvwawazfelidkloqmbma.supabase.co:5432/postgres`
diff --git a/apps/docs/pages/guides/database/postgres/configuration.mdx b/apps/docs/pages/guides/database/postgres/configuration.mdx
new file mode 100644
index 0000000000000..77305c0e9f5dc
--- /dev/null
+++ b/apps/docs/pages/guides/database/postgres/configuration.mdx
@@ -0,0 +1,110 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+ id: 'postgres-configuration',
+ title: 'Database configuration',
+ slug: 'postgres-configuration',
+ description: 'Updating the default congfiguration for your Postgres database.',
+ subtitle: 'Updating the default congfiguration for your Postgres database.',
+}
+
+Postgres provides a set of sensible defaults for you database size. In some cases, these defaults can be updated. We do not recommend changing these defaults unless you know what you're doing.
+
+## Timeouts
+
+By default, Supabase limits the maximum statement execution time to _8 seconds_ for users accessing the API. Additionally, all users are subject to a global limit of _2 minutes_. This serves as a backstop against resource exhaustion due to either poorly written queries, or abusive usage.
+
+### Changing the default timeout
+
+The timeout values were picked as a reasonable default for the majority of use-cases, but can be modified using the [`alter role`](https://www.postgresql.org/docs/current/sql-alterrole.html) statement:
+
+```sql
+-- For API users
+alter role authenticator set statement_timeout = '15s';
+```
+
+You can also update the statement timeout for a session:
+
+```sql
+set statement_timeout to 60000; -- 1 minute in milliseconds
+```
+
+### Statement Optimization
+
+All Supabase projects come with the [`pg_stat_statements`](https://www.postgresql.org/docs/current/pgstatstatements.html) extension installed, which tracks planning and execution statistics for all statements executed against it. These statistics can be used in order to diagnose the performance of your project.
+
+This data can further be used in conjunction with the [`explain`](https://www.postgresql.org/docs/current/using-explain.html) functionality of Postgres to optimize your usage.
+
+## Managing Timezones
+
+Every Supabase database is set to UTC timezone by default. We strongly recommend keeping it this way, even if your users are in a different location.
+This is because it makes it much easier to calculate differences between timezones if you adopt the mental model that "everything in my database is in UTC time".
+
+### Change timezone
+
+
+
+
+```sql
+alter database postgres
+set timezone to 'America/New_York';
+```
+
+
+
+
+### Full list of timezones
+
+Get a full list of timezones supported by your database. This will return the following columns:
+
+- `name`: Time zone name
+- `abbrev`: Time zone abbreviation
+- `utc_offset`: Offset from UTC (positive means east of Greenwich)
+- `is_dst`: True if currently observing daylight savings
+
+
+
+
+```sql
+select name, abbrev, utc_offset, is_dst
+from pg_timezone_names()
+order by name;
+```
+
+
+
+
+### Search for a specific timezone
+
+Use `ilike` (case insensitive search) to find specific timezones.
+
+
+
+
+```sql
+select *
+from pg_timezone_names()
+where name ilike '%york%';
+```
+
+
+
+
+export const Page = ({ children }) =>
+
+export default Page
diff --git a/apps/docs/pages/guides/database/postgres-roles.mdx b/apps/docs/pages/guides/database/postgres/roles.mdx
similarity index 72%
rename from apps/docs/pages/guides/database/postgres-roles.mdx
rename to apps/docs/pages/guides/database/postgres/roles.mdx
index b2e68cc71651c..c8c4af2395c16 100644
--- a/apps/docs/pages/guides/database/postgres-roles.mdx
+++ b/apps/docs/pages/guides/database/postgres/roles.mdx
@@ -13,11 +13,11 @@ PostgreSQL manages database access permissions using the concept of roles. Gener
In PostgreSQL, roles can function as users or groups of users. Users are roles with login privileges, while groups (also known as role groups) are roles that don't have login privileges but can be used to manage permissions for multiple users.
-## Superuser Roles
+## Superuser roles
The superuser role has unrestricted access to the database system. Typically these roles will be able to bypass all security measures (like Row Level Security). Be cautious when granting superuser privileges as it can potentially lead to security risks.
-## Creating Roles
+## Creating roles
You can create a role using the `create role` command:
@@ -25,6 +25,31 @@ You can create a role using the `create role` command:
create role "role_name";
```
+## Creating users
+
+Roles and users are essentially the same in Postgres, however if you want to use password-logins for a specific role, then you can use `WITH LOGIN PASSWORD`:
+
+```sql
+create role "role_name" with login 'extremely_secure_password';
+```
+
+## Passwords
+
+Your Postgres database is the core of your Supabase project, so it's important that every role has a strong, secure password at all times. Here are some tips for creating a secure password:
+
+- Use a password manager to generate it.
+- Make a long password (12 characters at least).
+- Don't use any common dictionary words.
+- Use both upper and lower case characters, numbers, and special symbols.
+
+### Special symbols in passwords
+
+If you use special symbols in your Postgres password, you must remember to [percent-encode](https://en.wikipedia.org/wiki/Percent-encoding) your password later if using the Postgres connection string e.g. `postgresql://postgres:p%3Dword@db.xxx.supabase.co:5432/postgres`.
+
+## Changing your project password
+
+When you created your project you were also asked to enter a password. This is actually the password for the `postgres` role in your database. You can update this from the Dashboard under the [database settings](https://supabase.com/dashboard/project/_/settings/database) page. You should _never_ give this to 3rd-party service unless you absolutely trust them. Instead, we recommend that you create a new user for every service that you want to give access too. This will also help you with debugging - you can see every query that each role is executing in your database within `pg_stat_statements`.
+
## Granting Permissions
Roles can be granted various permissions on database objects using the `GRANT` command. Permissions include `SELECT`, `INSERT`, `UPDATE`, and `DELETE`. You can configure access to almost any object inside your database - including tables, views, functions, and triggers.
diff --git a/apps/docs/pages/guides/database/postgres/row-level-security.mdx b/apps/docs/pages/guides/database/postgres/row-level-security.mdx
new file mode 100644
index 0000000000000..56cb2c5478cbc
--- /dev/null
+++ b/apps/docs/pages/guides/database/postgres/row-level-security.mdx
@@ -0,0 +1,127 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+ id: 'row-level-security',
+ title: 'Row Level Security',
+ description: 'Secure your data using Postgres Row Level Security.',
+ subtitle: 'Secure your data using Postgres Row Level Security.',
+}
+
+When you need granular authorization rules, nothing beats Postgres's [Row Level Security (RLS)](https://www.postgresql.org/docs/current/ddl-rowsecurity.html).
+
+## Row Level Security in Supabase
+
+RLS is incredibly powerful and flexible, allowing you to write complex SQL rules that fit your unique business needs. RLS can be [combined with Supabase Auth](/docs/guides/auth/row-level-security) for end-to-end user security from the browser to the database.
+
+Alternatively, RLS can provide "[defence in depth](
)" to protect your data from malicious actors if you're using your own tooling with the Postgres database we provide.
+
+## Policies
+
+[Policies](https://www.postgresql.org/docs/current/sql-createpolicy.html) are Postgres's rule engine. Policies are easy to understand once you get the hang of them. Each policy is attached to a table, and the policy is executed every time a table is accessed.
+
+You can just think of them as adding a `WHERE` clause to every query. For example a policy like this ...
+
+```sql
+create policy "Individuals can view their own todos."
+on todos for select
+using ( auth.uid() = user_id );
+```
+
+.. would translate to this whenever a user tries to select from the todos table:
+
+```sql
+select *
+from todos
+where auth.uid() = todos.user_id;
+-- Policy is implicitly added.
+```
+
+## Enabling Row Level Security
+
+You can enable RLS for any table using the `enable row level security` command:
+
+```sql
+alter table "table_name" enable row level security;
+```
+
+Once you have enabled RLS, no data will be accessible until you create policies.
+
+## Creating Policies
+
+Policies are simply SQL logic that you attach to a Postgres table. You can attach as many policies as you want to each table.
+
+Supabase provides some [helpers](/docs/guides/auth/row-level-security#helper-functions) that simplify RLS if you're using Supabase Auth. We'll use these helpers to illustrate some basic Policies:
+
+### SELECT Policies
+
+You can specify select policies with the `using` command.
+
+Let's say you have a table called `profiles` in the public schema and you want enable read access to everyone.
+
+```sql
+-- 1. Create table
+create table profiles (
+ id uuid primary key,
+ user_id references auth.users,
+ avatar_url text
+);
+
+-- 2. Enable RLS
+alter table profiles enable row level security;
+
+-- 3. Create Policy
+create policy "Public profiles are visible to everyone."
+on profiles for select
+to anon -- the Postgres Role (recommended)
+using ( true ); -- the actual Policy
+```
+
+Alternatively if you only wanted users to be able to see their own profiles:
+
+```sql
+create policy "Profiles are viewable by everyone."
+on profiles
+for select using ( auth.uid() = user_id );
+```
+
+### INSERT Policies
+
+You can specify select policies with the `with check` command.
+
+Let's say you have a table called `profiles` in the public schema and you only want users to be able to create a profile for themselves. In that case, we want to check their User ID matches the value that they are trying to insert:
+
+```sql
+-- 1. Create table
+create table profiles (
+ id uuid primary key,
+ user_id references auth.users,
+ avatar_url text
+);
+
+-- 2. Enable RLS
+alter table profiles enable row level security;
+
+-- 3. Create Policy
+create policy "Users can create a profile."
+on profiles for insert
+to authenticated -- the Postgres Role (recommended)
+using ( auth.id() = user_id ); -- the actual Policy
+```
+
+## Bypassing Row Level Security
+
+You can create [Postgres Roles](/docs/guides/database/postgres/roles) which can bypass Row Level Security using the "bypass RLS" privelege:
+
+```sql
+grant bypassrls on "table_name" to "role_name";
+```
+
+This can be useful for system-level access. You should _never_ share login credentials for any Postgres Role with this privelege.
+
+## RLS Performance
+
+TBD
+
+export const Page = ({ children }) =>
+
+export default Page
diff --git a/apps/docs/pages/guides/database/postgres/triggers.mdx b/apps/docs/pages/guides/database/postgres/triggers.mdx
new file mode 100644
index 0000000000000..f6c319280a2f4
--- /dev/null
+++ b/apps/docs/pages/guides/database/postgres/triggers.mdx
@@ -0,0 +1,122 @@
+import Layout from '~/layouts/DefaultGuideLayout'
+
+export const meta = {
+ id: 'postgres-triggers',
+ title: 'Postgres Triggers',
+ description: 'Automatically execute SQL on table events.',
+ subtitle: 'Automatically execute SQL on table events.',
+}
+
+In Postgres, a trigger executes a set of actions automatically on table events such as INSERTs, UPDATEs, DELETEs, or TRUNCATE operations.
+
+## Creating a Trigger
+
+Creating triggers involve 2 parts:
+
+1. A [Function](docs/guides/database/functions) which will be executed (called the Trigger Function)
+2. The actualTtrigger object, with parameters around when the trigger should be run.
+
+An example of a trigger is:
+
+```sql
+create trigger "trigger_name"
+after insert on "table_name"
+for each row
+execute statement trigger_function();
+```
+
+## Trigger Functions
+
+A trigger function is a user-defined [Function](docs/guides/database/functions) that Postgres executes when the trigger is fired.
+
+### Example trigger function
+
+Here is an example that updates `salary_log` whenever an employee's salary is updated:
+
+```sql
+-- Example: Update salary_log when salary is updated
+create function update_salary_log()
+returns trigger
+language plpgsql
+as $$
+begin
+ insert into salary_log(employee_id, old_salary, new_salary)
+ values (new.id, old.salary, new.salary);
+ return new;
+end;
+$$;
+
+create trigger salary_update_trigger
+after update on employees
+for each row
+exectute function update_salary_log();
+```
+
+### Trigger variables
+
+Trigger functions have access to several special variables that provide information about the context of the trigger event and the data being modified. In the example above you can see the values inserted into the salary log are `old.salary` and `new.salary` - in this case `old` specifies the previous values and `new` specifies the updated values.
+
+Here are some of the key variables and options available within trigger functions:
+
+- `TG_NAME`: The name of the trigger being fired.
+- `TG_WHEN`: The timing of the trigger event (`BEFORE` or `AFTER`).
+- `TG_OP`: The operation that triggered the event (`INSERT`, `UPDATE`, `DELETE`, or `TRUNCATE`).
+- `OLD`: A record variable holding the old row's data in `UPDATE` and `DELETE` triggers.
+- `NEW`: A record variable holding the new row's data in `UPDATE` and `INSERT` triggers.
+- `TG_LEVEL`: The trigger level (`ROW` or `STATEMENT`), indicating whether the trigger is row-level or statement-level.
+- `TG_RELID`: The object ID of the table on which the trigger is being fired.
+- `TG_TABLE_NAME`: The name of the table on which the trigger is being fired.
+- `TG_TABLE_SCHEMA`: The schema of the table on which the trigger is being fired.
+- `TG_ARGV`: An array of string arguments provided when creating the trigger.
+- `TG_NARGS`: The number of arguments in the `TG_ARGV` array.
+
+## Types of Triggers
+
+There are two types of trigger, `BEFORE` and `AFTER`:
+
+### Trigger before changes are made
+
+Executes before the triggering event.
+
+```sql
+create trigger before_insert_trigger
+before insert on orders
+for each row
+execute statement before_insert_function();
+```
+
+### Trigger after changed are made
+
+Executes after the triggering event.
+
+```sql
+create trigger after_delete_trigger
+after delete on customers
+for each row
+execute statement after_delete_function();
+```
+
+## Execution frequency
+
+There are two options available for executing triggers:
+
+- `for each row`: specifies that the trigger function should be executed once for each affected row.
+- `for each statement`: the trigger is executed once for the entire operation (eg, once on insert). This can be more efficient than `for each row` when dealing with multiple rows affected by a single SQL statement, as they allow you to perform calculations or updates on groups of rows at once.
+
+## Dropping a Trigger
+
+You can delete a trigger using the `drop trigger` command:
+
+```sql
+drop trigger "trigger_name" on "table_name";
+```
+
+## Resources
+
+- Official Postgres Docs: [Triggers](https://www.postgresql.org/docs/current/triggers.html)
+- Official Postgres Docs: [Overview of Trigger Behavior](https://www.postgresql.org/docs/current/trigger-definition.html)
+- Official Postgres Docs: [CREATE TRIGGER](https://www.postgresql.org/docs/current/sql-createtrigger.html)
+
+export const Page = ({ children }) =>
+
+export default Page
diff --git a/apps/docs/pages/guides/database/query-optimization.mdx b/apps/docs/pages/guides/database/query-optimization.mdx
index 3176c49adafe0..7dc76544c26f6 100644
--- a/apps/docs/pages/guides/database/query-optimization.mdx
+++ b/apps/docs/pages/guides/database/query-optimization.mdx
@@ -2,12 +2,12 @@ import Layout from '~/layouts/DefaultGuideLayout'
export const meta = {
title: 'Query Optimization',
- description: 'Choosing indexes',
+ description: 'Choosing indexes to improve your query performance.',
+ subtitle: 'Choosing indexes to improve your query performance.',
footerHelpType: 'postgres',
}
-When working with PostgreSQL, or any relational database, indexing is key to improving query performance.
-Aligning indexes with common query patterns can speed up data retrieval by an order of magnitude.
+When working with Postgres, or any relational database, indexing is key to improving query performance. Aligning indexes with common query patterns can speed up data retrieval by an order of magnitude.
This guide is intended to:
@@ -90,7 +90,7 @@ explain select * from customers where sign_up_date > 25;
### Use Appropriate Index Types
-PostgreSQL offers various index types like [B-tree, Hash, GIN, etc](https://www.postgresql.org/docs/current/indexes-types.html). Select the type that best suits your data and query pattern. Using the right index type can make a significant difference. For example, using a BRIN index on a field that always increases and lives within a table that updates infrequently - like `created_at` on an `orders` table - routinely results in indexes that are +10x smaller than the equivalent default B-tree index. That translates into better scalability.
+Postgres offers various index types like [B-tree, Hash, GIN, etc](https://www.Postgres.org/docs/current/indexes-types.html). Select the type that best suits your data and query pattern. Using the right index type can make a significant difference. For example, using a BRIN index on a field that always increases and lives within a table that updates infrequently - like `created_at` on an `orders` table - routinely results in indexes that are +10x smaller than the equivalent default B-tree index. That translates into better scalability.
```sql
create index idx_orders_created_at ON customers using brin(created_at);
@@ -127,7 +127,7 @@ analyze customers;
---
-By following this guide, you'll be able to discern where indexes can optimize queries and enhance your PostgreSQL performance. Remember that each database is unique, so always consider the specific context and use case of your queries.
+By following this guide, you'll be able to discern where indexes can optimize queries and enhance your Postgres performance. Remember that each database is unique, so always consider the specific context and use case of your queries.
export const Page = ({ children }) =>
diff --git a/apps/docs/pages/guides/database/timeouts.mdx b/apps/docs/pages/guides/database/timeouts.mdx
deleted file mode 100644
index 78bb850836f28..0000000000000
--- a/apps/docs/pages/guides/database/timeouts.mdx
+++ /dev/null
@@ -1,34 +0,0 @@
-import Layout from '~/layouts/DefaultGuideLayout'
-
-export const meta = {
- id: 'timeouts',
- title: 'Timeouts',
- description: 'Timeouts and optimization',
-}
-
-By default, Supabase limits the maximum statement execution time to _8 seconds_ for users accessing the API. Additionally, all users are subject to a global limit of _2 minutes_. This serves as a backstop against resource exhaustion due to either poorly written queries, or abusive usage.
-
-### Changing the default timeout
-
-The timeout values were picked as a reasonable default for the majority of use-cases, but can be modified using the [`alter role`](https://www.postgresql.org/docs/current/sql-alterrole.html) statement:
-
-```sql
--- For API users
-alter role authenticator set statement_timeout = '15s';
-```
-
-You can also update the statement timeout for a session:
-
-```sql
-set statement_timeout to 60000; -- 1 minute in milliseconds
-```
-
-### Statement Optimization
-
-All Supabase projects come with the [`pg_stat_statements`](https://www.postgresql.org/docs/current/pgstatstatements.html) extension installed, which tracks planning and execution statistics for all statements executed against it. These statistics can be used in order to diagnose the performance of your project.
-
-This data can further be used in conjunction with the [`explain`](https://www.postgresql.org/docs/current/using-explain.html) functionality of Postgres to optimize your usage.
-
-export const Page = ({ children }) =>
-
-export default Page
diff --git a/apps/docs/pages/guides/database/webhooks.mdx b/apps/docs/pages/guides/database/webhooks.mdx
index 3849f0aa30e90..3c821f8a77bac 100644
--- a/apps/docs/pages/guides/database/webhooks.mdx
+++ b/apps/docs/pages/guides/database/webhooks.mdx
@@ -4,24 +4,21 @@ export const meta = {
id: 'webhooks',
title: 'Database Webhooks',
description: 'Trigger external payloads on database events.',
- video: 'https://www.youtube.com/v/codAs9-NeHM',
+ subtitle: 'Trigger external payloads on database events.',
+ tocVideo: 'codAs9-NeHM',
}
Database Webhooks allow you to send real-time data from your database to another system whenever a table event occurs.
You can hook into three table events: `INSERT`, `UPDATE`, and `DELETE`. All events are fired _after_ a database row is changed.
+## Webhooks vs Triggers
+
Database Webhooks are very similar to triggers, and that's because Database Webhooks are just a convenience wrapper around triggers
using the [pg_net](/docs/guides/database/extensions/pgnet) extension. This extension is asynchronous, and therefore will not block your database changes for long-running network requests.
This video demonstrates how you can create a new customer in Stripe each time a row is inserted into a `profiles` table:
-
-
-Database Webhooks were previously known as Function Hooks.
-
-
-
+Buckets are distinct containers for files and folders. You can think of them like "super folders". Generally you would create distinct buckets for different Security and Access Rules. For example, you might keep all video files in a "video" bucket, and profile pictures in an "avatar" bucket.
## See also
diff --git a/apps/docs/pages/guides/storage/access-control.mdx b/apps/docs/pages/guides/storage/access-control.mdx
index 5079e23aebc53..ac3e2653f87b9 100644
--- a/apps/docs/pages/guides/storage/access-control.mdx
+++ b/apps/docs/pages/guides/storage/access-control.mdx
@@ -4,41 +4,23 @@ export const meta = {
id: 'storage-access-control',
title: 'Access Control',
description: 'Manage who can access your Supabase Storage files.',
- video: 'https://www.youtube.com/v/4ERX__Y908k',
+ subtitle: 'Manage who can access your Supabase Storage files.',
+ tocVideo: '4ERX__Y908k',
}
-Supabase Storage is integrated with your [Postgres Database](/docs/guides/database).
-This means that you can use the same [Row Level Security Policies](/docs/guides/auth#policies)
-for managing access to your files. Supabase Storage stores metadata in the `objects` and `buckets` table in the storage schema.
+Supabase Storage is integrated with your [Postgres Database](/docs/guides/database). This means that you can use the same [Row Level Security Policies](/docs/guides/auth#policies) for managing access to your files. Supabase Storage stores metadata in the `objects` and `buckets` table in the storage schema.
To allow read access to files, the RLS policy must allow users to `SELECT` the `objects` table and for uploading a new object, the RLS policy must grant users access to `INSERT` into the `objects` table and so on. The mapping between the different API calls and the database permissions required is documented in the [Reference docs](/docs/reference/javascript/storage-createbucket).
-
-
-Access control for Storage is mapped to CRUD operations on the `buckets` and `objects` table via RLS policies.
-
-
-
-
-
-
-
## Public and private buckets
-Storage buckets are private by default. For private buckets, you can access objects via the [download](/docs/reference/javascript/storage-from-download) method. This corresponds to `/object/auth/` API endpoint.
-Alternatively, you can create a publicly shareable URL with an expiry date using the [createSignedUrl](/docs/reference/javascript/storage-from-createsignedurl) method
-which calls the `/object/sign/` API.
+Storage buckets are private by default. For private buckets, you can access objects via the [download](/docs/reference/javascript/storage-from-download) method. This corresponds to `/object/auth/` API endpoint. Alternatively, you can create a publicly shareable URL with an expiry date using the [createSignedUrl](/docs/reference/javascript/storage-from-createsignedurl) method which calls the `/object/sign/` API.
+
+For public buckets, you can access the assets directly without a token or an Authorisation header. The [getPublicUrl](/docs/reference/javascript/storage-from-getpublicurl) helper method returns the full public URL for an asset. This calls the `/object/public/` API endpoint internally. While no authorization is required for accessing objects in a public bucket, proper [access control](#access-control) is required for other operations like uploading, deleting objects from public buckets as well. Public buckets also tend to have [better performance](/docs/guides/storage-cdn#public-vs-private-buckets).
-For public buckets, you can access the assets directly without a token or an Authorisation header. The [getPublicUrl](/docs/reference/javascript/storage-from-getpublicurl)
-helper method returns the full public URL for an asset. This calls the `/object/public/` API endpoint internally. While no authorization is required for accessing objects in a public bucket, proper [access control](#access-control) is required for other operations like uploading, deleting objects from public buckets as well. Public buckets also tend to have [better performance](/docs/guides/storage-cdn#public-vs-private-buckets).
+
+Advanced: reverse proxy
-
-Advanced: reverse proxy
The URLs returned are proxied through the API Proxy. They are prefixed by /storage/v1.
For example, on the hosted Platform they will be
@@ -54,9 +36,7 @@ You can access the storage API directly with the same endpoint. See the
-
-
-
-
## Get a public URL for a transformed image
You can pass a `transform` option to the functions you are currently using to interact with your objects. This returns the public URL that serves the resized image.
@@ -70,8 +62,7 @@ supabase.storage.from('bucket').download('image.jpg', {
## Automatic Image Optimisation (WebP)
-When using the image transformation API we will automatically find the best format supported by the browser and return that to the client, without any code change.
-For instance, if you use Chrome when viewing a jpeg image and using transformation options, you'll see that the content-type returned is `webp`.
+When using the image transformation API we will automatically find the best format supported by the browser and return that to the client, without any code change. For instance, if you use Chrome when viewing a jpeg image and using transformation options, you'll see that the content-type returned is `webp`.
As a result, this will lower the bandwidth that you send to your users and your application will load much faster.
@@ -81,8 +72,7 @@ As a result, this will lower the bandwidth that you send to your users and your
**Disabling automatic optimisation:**
-In case you'd like to return the original format of the image and **opt-out** from the automatic image optimization detection, you can pass the `format=origin` parameter when requesting a transformed image,
-this is also supported in the JavaScript SDK starting from v2.2.0
+In case you'd like to return the original format of the image and **opt-out** from the automatic image optimization detection, you can pass the `format=origin` parameter when requesting a transformed image, this is also supported in the JavaScript SDK starting from v2.2.0
```ts
await storage.from('bucket').download('image.jpeg', {
@@ -186,8 +176,7 @@ supabase.storage.from('bucket').download('image.jpg', {
## Self Hosting
-Our solution to image resizing and optimisation can be self-hosted as with any other Supabase product.
-Under the hood we use the awesome [Imgproxy](https://imgproxy.net/)
+Our solution to image resizing and optimisation can be self-hosted as with any other Supabase product. Under the hood we use the awesome [Imgproxy](https://imgproxy.net/)
#### Imgproxy Configuration:
diff --git a/apps/docs/pages/guides/storage/quickstart.mdx b/apps/docs/pages/guides/storage/quickstart.mdx
index b94c588ce4b10..8c05f43137f4f 100644
--- a/apps/docs/pages/guides/storage/quickstart.mdx
+++ b/apps/docs/pages/guides/storage/quickstart.mdx
@@ -17,8 +17,7 @@ File, Folder, and Bucket names **must follow** [AWS object key naming guidelines
## Create a bucket
-You can create a bucket using the Supabase Dashboard.
-Since the storage is interoperable with your Postgres database, you can also use SQL or our
+You can create a bucket using the Supabase Dashboard. Since the storage is interoperable with your Postgres database, you can also use SQL or our
client libraries. Here we create a bucket called "avatars":
Date: Thu, 24 Aug 2023 14:31:01 +0000
Subject: [PATCH 45/60] Update link to supalytics
---
apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx b/apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx
index 18621b0aa378e..3757afd6ca5c7 100644
--- a/apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx
+++ b/apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx
@@ -82,7 +82,7 @@ Openbin is a Pastebin clone built for command line warriors, with support for bo
### Runner Up
-[Supalytic](https://github.com/Ansh-Rathod/schedurio) - by [@suciptodev](https://twitter.com/suciptodev) and [@andreecy](https://github.com/andreecy)
+[Supalytic](https://github.com/suciptoid/supalytic) - by [@suciptodev](https://twitter.com/suciptodev) and [@andreecy](https://github.com/andreecy)
Supalytic is website analytic tracking alternative to Google Analytics. It built with svelte kit, supabase auth, database and deployed on cloudflare pages.
From c80850a2f2e8066fc45c559767061f7d3529601c Mon Sep 17 00:00:00 2001
From: Copple <10214025+kiwicopple@users.noreply.github.com>
Date: Thu, 24 Aug 2023 16:38:45 +0200
Subject: [PATCH 46/60] paragraphs
---
apps/docs/pages/guides/storage.mdx | 68 ++++++++++++++++++++++----
apps/docs/pages/guides/storage/cdn.mdx | 6 +--
2 files changed, 61 insertions(+), 13 deletions(-)
diff --git a/apps/docs/pages/guides/storage.mdx b/apps/docs/pages/guides/storage.mdx
index 0a4d067b87237..75a0ab17d6fbf 100644
--- a/apps/docs/pages/guides/storage.mdx
+++ b/apps/docs/pages/guides/storage.mdx
@@ -11,25 +11,75 @@ export const meta = {
Supabase Storage makes it simple to store and serve large files.
-## Files
+## Concepts
+
+### Files
Files can be any sort of media file. This includes images, GIFs, and videos. It is best practice to store files outside of your database because of their sizes. For security, HTML files are returned as plain text.
-## Folders
+### Folders
Folders are a way to organize your files (just like on your computer). There is no right or wrong way to organize your files. You can store them in whichever folder structure suits your project.
-## Buckets
+### Buckets
Buckets are distinct containers for files and folders. You can think of them like "super folders". Generally you would create distinct buckets for different Security and Access Rules. For example, you might keep all video files in a "video" bucket, and profile pictures in an "avatar" bucket.
-## See also
+## Examples
+
+Check out all of the AI [templates and examples](https://github.com/supabase/supabase/tree/master/examples/storage) in our GitHub repository.
+
+
+ {examples.map((x) => (
+
+ ))}
+
+ {integrations.map((x) => (
+
+ ))}
+
-Advanced: reverse proxy
-
-The URLs returned are proxied through the API Proxy. They are prefixed by /storage/v1.
-
-For example, on the hosted Platform they will be
+The URLs returned are proxied through the API Proxy. They are prefixed by /storage/v1. For example, on the hosted Platform they will be:
https://[project_ref].supabase.co/storage/v1/object/public/[id]
You can access the storage API directly with the same endpoint. See the API docs for a full list of operations available.
-
-
## Helper functions
-Supabase Storage provides SQL helper functions which you can use in your database queries and
-policies.
+Supabase Storage provides SQL helper functions which you can use in your database queries and RLS policies.
### `storage.filename()`
-Returns the name of a file.
+Returns the name of a file. For example, if your file is stored in `public/subfolder/avatar.png` it would return: `'avatar.png'`
+
+**Usage**
+
+This example demonstates how you would allow any user to download a file called `favicon.ico`:
```sql
-select storage.filename(name)
-from storage.objects;
+create policy "Allow authenticated uploads"
+on storage.objects
+for select
+to public
+using (
+ storage.filename(name)) = 'favicon.ico'
+);
```
-For example, if your file is stored in `public/subfolder/avatar.png` it would return:
+### `storage.foldername()`
-`'avatar.png'`
+Returns an array path, with all of the subfolders that a file belongs to. For example, if your file is stored in `public/subfolder/avatar.png` it would return: `[ 'public', 'subfolder' ]`
-### `storage.foldername()`
+**Usage**
-Returns an array path, with all of the subfolders that a file belongs to.
+This example demonstates how you would allow authenticated users to upload files to a folder called `private`:
```sql
-select storage.foldername(name)
-from storage.objects;
+create policy "Allow authenticated uploads"
+on storage.objects
+for insert
+to authenticated
+with check (
+ storage.foldername(name))[1] = 'private'
+);
```
-For example, if your file is stored in `public/subfolder/avatar.png` it would return:
+### `storage.extension()`
-`[ 'public', 'subfolder' ]`
+Returns the extension of a file. For example, if your file is stored in `public/subfolder/avatar.png` it would return: `'png'`
-### `storage.extension()`
+**Usage**
-Returns the extension of a file.
+This example demonstates how you would allow restrict uploads to only PNG files inside a bucket called `cats`:
```sql
-select storage.extension(name)
-from storage.objects;
+create policy "Only allow PNG uploads"
+on storage.objects
+for insert
+to authenticated
+with check (
+ bucket_id = 'cats' and storage.extension(name) = 'png'
+);
```
-For example, if your file is stored in `public/subfolder/avatar.png` it would return:
-
-`'png'`
+## Usage
----
+Row Level Security is extremely versatile, since it simply uses SQL to express access rules for your data. You can learn more about RLS in the [Database docs](/docs/guides/database/postgres/row-level-security).
-## Policy examples
+### Allowing public access to a bucket
-### Allow public access to a bucket
+Allow public access to any files in the "public" bucket:
```sql
--- 1. Allow public access to any files in the "public" bucket
create policy "Public Access"
on storage.objects for select
+to public
using ( bucket_id = 'public' );
```
-### Allow logged-in access to a bucket
+### Allowing logged-in access to a bucket
+
+Allow logged-in access to any files in the "restricted" bucket:
```sql
--- 1. Allow logged-in access to any files in the "restricted" bucket
create policy "Restricted Access"
on storage.objects for select
to authenticated
using ( bucket_id = 'restricted' );
```
-### Allow individual access to a file
+### Allowing individual access to a file
+
+Allow a user to access their own files:
```sql
--- 1. Allow a user to access their own files
create policy "Individual user Access"
on storage.objects for select
+to authenticated
using ( auth.uid() = owner );
```
+---
+
+{/* Finish with a video. This also appears in the Sidebar via the "tocVideo" metadata */}
+
+
+
+
+
export const Page = ({ children }) =>
export default Page
diff --git a/apps/docs/pages/guides/storage/image-transformations.mdx b/apps/docs/pages/guides/storage/image-transformations.mdx
index 49c7c2ad2f3c7..35ae84b840c75 100644
--- a/apps/docs/pages/guides/storage/image-transformations.mdx
+++ b/apps/docs/pages/guides/storage/image-transformations.mdx
@@ -201,6 +201,17 @@ ENABLE_IMAGE_TRANSFORMATION=true
IMGPROXY_URL=yourinternalimgproxyurl.internal.com
```
+{/* Finish with a video. This also appears in the Sidebar via the "tocVideo" metadata */}
+
+
+
+
+
export const Page = ({ children }) =>
export default Page
diff --git a/apps/docs/pages/guides/storage/quickstart.mdx b/apps/docs/pages/guides/storage/quickstart.mdx
index 8c05f43137f4f..c90e36f385d6f 100644
--- a/apps/docs/pages/guides/storage/quickstart.mdx
+++ b/apps/docs/pages/guides/storage/quickstart.mdx
@@ -4,11 +4,29 @@ export const meta = {
id: 'storage-quickstart',
title: 'Storage Quickstart',
description: 'Learn how to use Supabase to store and serve files.',
+ subtitle: 'Learn how to use Supabase to store and serve files.',
sidebar_label: 'Quickstart',
+ tocVideo: 'J9mTPY8rIXE',
}
This guide shows the basic functionality of Supabase Storage. Find a full [example application on GitHub](https://github.com/supabase/supabase/tree/master/examples/user-management/nextjs-user-management).
+## Concepts
+
+Supabase Storage consists of Files, Folders, and Buckets.
+
+### Files
+
+Files can be any sort of media file. This includes images, GIFs, and videos. It is best practice to store files outside of your database because of their sizes. For security, HTML files are returned as plain text.
+
+### Folders
+
+Folders are a way to organize your files (just like on your computer). There is no right or wrong way to organize your files. You can store them in whichever folder structure suits your project.
+
+### Buckets
+
+Buckets are distinct containers for files and folders. You can think of them like "super folders". Generally you would create distinct buckets for different Security and Access Rules. For example, you might keep all video files in a "video" bucket, and profile pictures in an "avatar" bucket.
+
File, Folder, and Bucket names **must follow** [AWS object key naming guidelines](https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html) and avoid use of any other characters.
@@ -204,11 +222,18 @@ create policy "Public Access"
-## See also
+---
+
+{/* Finish with a video. This also appears in the Sidebar via the "tocVideo" metadata */}
-- [Supabase Storage on GitHub](https://github.com/supabase/storage-api)
-- [Swagger API documentation](https://supabase.github.io/storage-api)
-- Official [JavaScript](/docs/reference/javascript/storage-createbucket) and [Dart](/docs/reference/dart/storage-createbucket) documentation
+
+
+
export const Page = ({ children }) =>
From e69d7faf538d1f3f2033c39ad70f70980517698a Mon Sep 17 00:00:00 2001
From: Andrew Smith
Date: Thu, 24 Aug 2023 15:33:23 +0000
Subject: [PATCH 51/60] Fix prettier issue
---
apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx b/apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx
index 8b6ef32229b0e..14563409cbd2e 100644
--- a/apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx
+++ b/apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx
@@ -120,7 +120,7 @@ If you're inspired to build, check out some of the latest resources:
- **[Supabase Storage Guide](https://supabase.com/docs/guides/storage)**
- **[Edge Functions Guide](https://supabase.com/docs/guides/functions)**
-## More Launch Week 8
+## More Launch Week 8
- [Day 1 - Hugging Face is now supported in Supabase](/blog/hugging-face-supabase)
- [Day 2 - Supabase Local Dev: migrations, branching, and observability](/blog/supabase-local-dev)
From 1491f80ce67e87e1947333f0b60f1ea1873fb128 Mon Sep 17 00:00:00 2001
From: Copple <10214025+kiwicopple@users.noreply.github.com>
Date: Thu, 24 Aug 2023 18:18:50 +0200
Subject: [PATCH 52/60] spelling
---
apps/docs/pages/guides/storage/access-control.mdx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/apps/docs/pages/guides/storage/access-control.mdx b/apps/docs/pages/guides/storage/access-control.mdx
index a0c938db1bab2..bfc6e7062aa5d 100644
--- a/apps/docs/pages/guides/storage/access-control.mdx
+++ b/apps/docs/pages/guides/storage/access-control.mdx
@@ -52,7 +52,7 @@ Returns the name of a file. For example, if your file is stored in `public/subfo
**Usage**
-This example demonstates how you would allow any user to download a file called `favicon.ico`:
+This example demonstrates how you would allow any user to download a file called `favicon.ico`:
```sql
create policy "Allow authenticated uploads"
@@ -70,7 +70,7 @@ Returns an array path, with all of the subfolders that a file belongs to. For ex
**Usage**
-This example demonstates how you would allow authenticated users to upload files to a folder called `private`:
+This example demonstrates how you would allow authenticated users to upload files to a folder called `private`:
```sql
create policy "Allow authenticated uploads"
@@ -88,7 +88,7 @@ Returns the extension of a file. For example, if your file is stored in `public/
**Usage**
-This example demonstates how you would allow restrict uploads to only PNG files inside a bucket called `cats`:
+This example demonstrates how you would allow restrict uploads to only PNG files inside a bucket called `cats`:
```sql
create policy "Only allow PNG uploads"
From 0486c55909bf9286812b816a41cd7fbaf2b64efa Mon Sep 17 00:00:00 2001
From: Copple <10214025+kiwicopple@users.noreply.github.com>
Date: Thu, 24 Aug 2023 18:19:53 +0200
Subject: [PATCH 53/60] Apply suggestions from code review
Co-authored-by: Fabrizio
---
apps/docs/pages/guides/storage.mdx | 6 +++---
apps/docs/pages/guides/storage/access-control.mdx | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/apps/docs/pages/guides/storage.mdx b/apps/docs/pages/guides/storage.mdx
index 838bb03e6e286..dcc8f0ee7d54b 100644
--- a/apps/docs/pages/guides/storage.mdx
+++ b/apps/docs/pages/guides/storage.mdx
@@ -8,15 +8,15 @@ export const meta = {
sidebar_label: 'Overview',
}
-Supabase Storage makes it simple to store and serve large files, providing a robust framework for file access controls.
+Supabase Storage makes it simple to upload and serve files of any size, providing a robust framework for file access controls.
## Features
-You can use Supabase Storage to store images, videos, documents, and any other file type. It provides includes a global CDN to reduce latency, serving your files from over 285 cities globally. Supabase Storage includes a built-in image resizer, so you can resize and compress your media files on the fly.
+You can use Supabase Storage to store images, videos, documents, and any other file type. Serve your assets with a global CDN to reduce latency from over 285 cities globally. Supabase Storage includes a built-in image optimizer, so you can resize and compress your media files on the fly.
## Examples
-Check out all of the AI [templates and examples](https://github.com/supabase/supabase/tree/master/examples/storage) in our GitHub repository.
+Check out all of the Storage [templates and examples](https://github.com/supabase/supabase/tree/master/examples/storage) in our GitHub repository.
{examples.map((x) => (
diff --git a/apps/docs/pages/guides/storage/access-control.mdx b/apps/docs/pages/guides/storage/access-control.mdx
index bfc6e7062aa5d..fc9532e6aef5d 100644
--- a/apps/docs/pages/guides/storage/access-control.mdx
+++ b/apps/docs/pages/guides/storage/access-control.mdx
@@ -10,7 +10,7 @@ export const meta = {
Supabase Storage is designed to work perfectly with [Postgres Row Level Security](/docs/guides/database/postgres/row-level-security) (RLS).
-You can use RLS to create [Policies](https://www.postgresql.org/docs/current/sql-createpolicy.html) that are incredibly powerful and flexible, allowing you to write complex SQL rules which fit your unique business needs.
+You can use RLS to create [Security Access Policies](https://www.postgresql.org/docs/current/sql-createpolicy.html) that are incredibly powerful and flexible, allowing you to restrict access based on your business needs.
## Policies
@@ -36,7 +36,7 @@ Storage buckets are private by default. For private buckets, you can access obje
For public buckets, you can access the assets directly without a token or an Authorisation header. The [getPublicUrl](/docs/reference/javascript/storage-from-getpublicurl) helper method returns the full public URL for an asset. This calls the `/object/public/` API endpoint internally. While no authorization is required for accessing objects in a public bucket, proper [access control](#access-control) is required for other operations like uploading, deleting objects from public buckets as well. Public buckets also tend to have [better performance](/docs/guides/storage-cdn#public-vs-private-buckets).
-The URLs returned are proxied through the API Proxy. They are prefixed by
/storage/v1. For example, on the hosted Platform they will be:
+The URLs to access storage endpoints are prefixed with
/storage/v1. For example, on the hosted Platform they will be:
https://[project_ref].supabase.co/storage/v1/object/public/[id]
From 335fe819f1261ebd0b280b47fd263fb5c1825089 Mon Sep 17 00:00:00 2001
From: Copple <10214025+kiwicopple@users.noreply.github.com>
Date: Thu, 24 Aug 2023 20:19:43 +0200
Subject: [PATCH 54/60] prettier
---
apps/docs/pages/guides/storage/access-control.mdx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/docs/pages/guides/storage/access-control.mdx b/apps/docs/pages/guides/storage/access-control.mdx
index fc9532e6aef5d..61407692596e6 100644
--- a/apps/docs/pages/guides/storage/access-control.mdx
+++ b/apps/docs/pages/guides/storage/access-control.mdx
@@ -10,7 +10,7 @@ export const meta = {
Supabase Storage is designed to work perfectly with [Postgres Row Level Security](/docs/guides/database/postgres/row-level-security) (RLS).
-You can use RLS to create [Security Access Policies](https://www.postgresql.org/docs/current/sql-createpolicy.html) that are incredibly powerful and flexible, allowing you to restrict access based on your business needs.
+You can use RLS to create [Security Access Policies](https://www.postgresql.org/docs/current/sql-createpolicy.html) that are incredibly powerful and flexible, allowing you to restrict access based on your business needs.
## Policies
From f44b6c11f39163d5a16322114261a79310479e01 Mon Sep 17 00:00:00 2001
From: Andrew Smith
Date: Thu, 24 Aug 2023 18:46:32 +0000
Subject: [PATCH 55/60] Correct the description of the supadraw entry
---
apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx b/apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx
index 14563409cbd2e..5da26324c8257 100644
--- a/apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx
+++ b/apps/www/_blog/2023-08-24-launch-week-8-hackathon-winners.mdx
@@ -102,7 +102,7 @@ Supalytic is a website analytic tracking alternative to Google Analytics. It is
[Supadraw - Draw like an artist](https://github.com/arbizen/supadraw) - by [@arbizzen](https://twitter.com/arbizzen)
-"Supadraw - Draw like an artist" is a simple game that plays a random song in reverse and you have to guess the name of the song.
+"Supadraw - Draw like an artist" is an online drawing tool to create drawing and share with other people. Like a drawing? Well there's a like button for you to show respect to your favorite artist. Want to bookmark a drawing? None's stopping you. Go ahead and bookmark your favorite drawings.
From bd147db95bd3868ff42a32c6561149672a66e309 Mon Sep 17 00:00:00 2001
From: Kang Ming
Date: Thu, 24 Aug 2023 12:44:13 -0700
Subject: [PATCH 56/60] fix: update password should logout other sessions
---
studio/components/interfaces/SignIn/ResetPasswordForm.tsx | 3 +++
1 file changed, 3 insertions(+)
diff --git a/studio/components/interfaces/SignIn/ResetPasswordForm.tsx b/studio/components/interfaces/SignIn/ResetPasswordForm.tsx
index 4acce9d8d055f..37f88ab4a82ae 100644
--- a/studio/components/interfaces/SignIn/ResetPasswordForm.tsx
+++ b/studio/components/interfaces/SignIn/ResetPasswordForm.tsx
@@ -23,6 +23,9 @@ const ResetPasswordForm = () => {
message: `Password saved successfully!`,
})
+ // logout all other sessions after changing password
+ await auth.signOut({ scope: 'others' })
+
await router.push('/projects')
} else {
ui.setNotification({
From 7ad9c1a7f478e164b3224bd6e437b0975828ee04 Mon Sep 17 00:00:00 2001
From: Alaister Young
Date: Fri, 25 Aug 2023 14:30:20 +1000
Subject: [PATCH 57/60] chore: update pg_get_tabledef (fixes camelCase table
names)
---
.../data/database/database-query-constants.ts | 71 +++++++++++++++----
1 file changed, 57 insertions(+), 14 deletions(-)
diff --git a/studio/data/database/database-query-constants.ts b/studio/data/database/database-query-constants.ts
index 9182c754036a0..f222e85a9bdef 100644
--- a/studio/data/database/database-query-constants.ts
+++ b/studio/data/database/database-query-constants.ts
@@ -25,7 +25,7 @@ export enum CONSTRAINT_TYPE {
export const CREATE_PG_GET_TABLEDEF_SQL = minify(
/* SQL */ `
DROP TYPE IF EXISTS pg_temp.tabledefs CASCADE;
- CREATE TYPE pg_temp.tabledefs AS ENUM ('PKEY_EXTERNAL','FKEYS_INTERNAL', 'FKEYS_EXTERNAL', 'FKEYS_COMMENTED', 'FKEYS_NONE', 'INCLUDE_TRIGGERS', 'NO_TRIGGERS');
+ CREATE TYPE pg_temp.tabledefs AS ENUM ('PKEY_INTERNAL','PKEY_EXTERNAL','FKEYS_INTERNAL', 'FKEYS_EXTERNAL', 'FKEYS_COMMENTED', 'FKEYS_NONE', 'INCLUDE_TRIGGERS', 'NO_TRIGGERS');
-- DROP FUNCTION pg_temp.pg_get_coldef(text,text,text,boolean);
CREATE OR REPLACE FUNCTION pg_temp.pg_get_coldef(
@@ -69,7 +69,7 @@ export const CREATE_PG_GET_TABLEDEF_SQL = minify(
AS
$$
DECLARE
- v_qualified text;
+ v_qualified text := '';
v_table_ddl text;
v_table_oid int;
v_colrec record;
@@ -99,11 +99,13 @@ export const CREATE_PG_GET_TABLEDEF_SQL = minify(
constraintelement text;
bSkip boolean;
bVerbose boolean := False;
+ v_cnt integer;
-- assume defaults for ENUMs at the getgo
pkcnt int := 0;
fkcnt int := 0;
trigcnt int := 0;
+ pktype tabledefs := 'PKEY_INTERNAL';
fktype tabledefs := 'FKEYS_INTERNAL';
trigtype tabledefs := 'NO_TRIGGERS';
arglen integer;
@@ -120,9 +122,11 @@ export const CREATE_PG_GET_TABLEDEF_SQL = minify(
v_diag6 text;
BEGIN
- v_qualified = in_schema || '.' || in_table;
-
+ SET client_min_messages = 'notice';
IF _verbose THEN bVerbose = True; END IF;
+
+ -- v17 fix: handle case-sensitive
+ -- v_qualified = in_schema || '.' || in_table;
arglen := array_length($4, 1);
IF arglen IS NULL THEN
@@ -143,6 +147,7 @@ export const CREATE_PG_GET_TABLEDEF_SQL = minify(
trigtype = avarg;
ELSEIF avarg = 'PKEY_EXTERNAL' THEN
pkcnt = pkcnt + 1;
+ pktype = avarg;
END IF;
END LOOP;
IF fkcnt > 1 THEN
@@ -156,7 +161,7 @@ export const CREATE_PG_GET_TABLEDEF_SQL = minify(
RETURN '';
END IF;
END IF;
-
+
SELECT c.oid, (select setting from pg_settings where name = 'server_version_num') INTO v_table_oid, v_pgversion FROM pg_catalog.pg_class c LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
WHERE c.relkind in ('r','p') AND c.relname = in_table AND n.nspname = in_schema;
@@ -212,16 +217,33 @@ export const CREATE_PG_GET_TABLEDEF_SQL = minify(
END IF;
END IF;
IF bPartition THEN
+ --v17 fix for case-sensitive tables
+ SELECT count(*) INTO v_cnt FROM information_schema.tables t WHERE EXISTS (SELECT REGEXP_MATCHES(s.table_name, '([A-Z]+)','g') FROM information_schema.tables s
+ WHERE t.table_schema=s.table_schema AND t.table_name=s.table_name AND t.table_schema = quote_ident(in_schema) AND t.table_type = 'BASE TABLE');
+
IF bInheritance THEN
-- inheritance-based
- v_table_ddl := 'CREATE TABLE ' || in_schema || '.' || in_table || '( '|| E'\\n';
+ IF v_cnt > 0 THEN
+ v_table_ddl := 'CREATE TABLE ' || in_schema || '."' || in_table || '"( '|| E'\\n';
+ ELSE
+ v_table_ddl := 'CREATE TABLE ' || in_schema || '.' || in_table || '( '|| E'\\n';
+ END IF;
+
-- Jump to constraints section to add the check constraints
ELSE
-- declarative-based
IF v_relopts <> '' THEN
- v_table_ddl := 'CREATE TABLE ' || in_schema || '.' || in_table || ' PARTITION OF ' || in_schema || '.' || v_parent || ' ' || v_partbound || v_relopts || ' ' || v_tablespace || '; ' || E'\\n';
+ IF v_cnt > 0 THEN
+ v_table_ddl := 'CREATE TABLE ' || in_schema || '."' || in_table || '" PARTITION OF ' || in_schema || '.' || v_parent || ' ' || v_partbound || v_relopts || ' ' || v_tablespace || '; ' || E'\\n';
+ ELSE
+ v_table_ddl := 'CREATE TABLE ' || in_schema || '.' || in_table || ' PARTITION OF ' || in_schema || '.' || v_parent || ' ' || v_partbound || v_relopts || ' ' || v_tablespace || '; ' || E'\\n';
+ END IF;
ELSE
- v_table_ddl := 'CREATE TABLE ' || in_schema || '.' || in_table || ' PARTITION OF ' || in_schema || '.' || v_parent || ' ' || v_partbound || ' ' || v_tablespace || '; ' || E'\\n';
+ IF v_cnt > 0 THEN
+ v_table_ddl := 'CREATE TABLE ' || in_schema || '."' || in_table || '" PARTITION OF ' || in_schema || '.' || v_parent || ' ' || v_partbound || ' ' || v_tablespace || '; ' || E'\\n';
+ ELSE
+ v_table_ddl := 'CREATE TABLE ' || in_schema || '.' || in_table || ' PARTITION OF ' || in_schema || '.' || v_parent || ' ' || v_partbound || ' ' || v_tablespace || '; ' || E'\\n';
+ END IF;
END IF;
-- Jump to constraints and index section to add the check constraints and indexes and perhaps FKeys
END IF;
@@ -242,7 +264,14 @@ export const CREATE_PG_GET_TABLEDEF_SQL = minify(
-- start the create definition for regular tables unless we are in progress creating an inheritance-based child table
IF NOT bPartition THEN
- v_table_ddl := 'CREATE ' || v_temp || ' TABLE ' || in_schema || '.' || in_table || ' (' || E'\\n';
+ --v17 fix for case-sensitive tables
+ SELECT count(*) INTO v_cnt FROM information_schema.tables t WHERE EXISTS (SELECT REGEXP_MATCHES(s.table_name, '([A-Z]+)','g') FROM information_schema.tables s
+ WHERE t.table_schema=s.table_schema AND t.table_name=s.table_name AND t.table_schema = quote_ident(in_schema) AND t.table_type = 'BASE TABLE');
+ IF v_cnt > 0 THEN
+ v_table_ddl := 'CREATE ' || v_temp || ' TABLE ' || in_schema || '."' || in_table || '" (' || E'\\n';
+ ELSE
+ v_table_ddl := 'CREATE ' || v_temp || ' TABLE ' || in_schema || '.' || in_table || ' (' || E'\\n';
+ END IF;
END IF;
-- RAISE INFO 'DEBUG2: tabledef so far: %', v_table_ddl;
-- define all of the columns in the table unless we are in progress creating an inheritance-based child table
@@ -252,17 +281,29 @@ export const CREATE_PG_GET_TABLEDEF_SQL = minify(
FROM information_schema.columns c WHERE (table_schema, table_name) = (in_schema, in_table) ORDER BY ordinal_position
LOOP
IF bVerbose THEN RAISE INFO '(col loop) name=% type=% udt_name=% udt_schema=%', v_colrec.column_name, v_colrec.data_type, v_colrec.udt_name, v_colrec.udt_schema; END IF;
- SELECT CASE WHEN pg_get_serial_sequence(v_qualified, v_colrec.column_name) IS NOT NULL THEN True ELSE False END into bSerial;
+ -- v17 fix: handle case-sensitive for pg_get_serial_sequence that requires SQL Identifier handling
+ -- SELECT CASE WHEN pg_get_serial_sequence(v_qualified, v_colrec.column_name) IS NOT NULL THEN True ELSE False END into bSerial;
+ SELECT CASE WHEN pg_get_serial_sequence(quote_ident(in_schema) || '.' || quote_ident(in_table), v_colrec.column_name) IS NOT NULL THEN True ELSE False END into bSerial;
IF bVerbose THEN
- SELECT pg_get_serial_sequence(v_qualified, v_colrec.column_name) into v_temp;
+ -- v17 fix: handle case-sensitive for pg_get_serial_sequence that requires SQL Identifier handling
+ -- SELECT pg_get_serial_sequence(v_qualified, v_colrec.column_name) into v_temp;
+ SELECT pg_get_serial_sequence(quote_ident(in_schema) || '.' || quote_ident(in_table), v_colrec.column_name) into v_temp;
IF v_temp IS NULL THEN v_temp = 'NA'; END IF;
SELECT pg_temp.pg_get_coldef(in_schema, in_table,v_colrec.column_name) INTO v_diag1;
--RAISE NOTICE 'DEBUG table: % Column: % datatype: % Serial=% serialval=% coldef=%', v_qualified, v_colrec.column_name, v_colrec.data_type, bSerial, v_temp, v_diag1;
--RAISE NOTICE 'DEBUG tabledef: %', v_table_ddl;
END IF;
- v_table_ddl := v_table_ddl || ' ' -- note: two char spacer to start, to indent the column
- || v_colrec.column_name || ' ' ||
+ --v17 put double-quotes around case-sensitive column names
+ SELECT COUNT(*) INTO v_cnt FROM information_schema.columns t WHERE EXISTS (SELECT REGEXP_MATCHES(s.column_name, '([A-Z]+)','g') FROM information_schema.columns s
+ WHERE t.table_schema=s.table_schema and t.table_name=s.table_name and t.column_name=s.column_name AND t.table_schema = quote_ident(in_schema) AND column_name = v_colrec.column_name);
+ IF v_cnt > 0 THEN
+ v_table_ddl := v_table_ddl || ' "' || v_colrec.column_name || '" ';
+ ELSE
+ v_table_ddl := v_table_ddl || ' ' || v_colrec.column_name || ' ';
+ END IF;
+
+ v_table_ddl := v_table_ddl ||
CASE WHEN v_colrec.udt_name in ('geometry', 'box2d', 'box2df', 'box3d', 'geography', 'geometry_dump', 'gidx', 'spheroid', 'valid_detail')
THEN v_colrec.udt_name
WHEN v_colrec.data_type = 'USER-DEFINED'
@@ -270,7 +311,9 @@ export const CREATE_PG_GET_TABLEDEF_SQL = minify(
WHEN v_colrec.data_type = 'ARRAY'
-- Issue#6 fix: handle arrays
THEN pg_temp.pg_get_coldef(in_schema, in_table,v_colrec.column_name)
- WHEN pg_get_serial_sequence(v_qualified, v_colrec.column_name) IS NOT NULL
+ -- v17 fix: handle case-sensitive for pg_get_serial_sequence that requires SQL Identifier handling
+ -- WHEN pg_get_serial_sequence(v_qualified, v_colrec.column_name) IS NOT NULL
+ WHEN pg_get_serial_sequence(quote_ident(in_schema) || '.' || quote_ident(in_table), v_colrec.column_name) IS NOT NULL
-- Issue#8 fix: handle serial. Note: NOT NULL is implied so no need to declare it explicitly
THEN pg_temp.pg_get_coldef(in_schema, in_table,v_colrec.column_name)
ELSE v_colrec.data_type END
From dc464e54dc9db54ab5d51a83a882cbf6248d025f Mon Sep 17 00:00:00 2001
From: Joshen Lim
Date: Fri, 25 Aug 2023 12:34:16 +0800
Subject: [PATCH 58/60] Fix comparison logic specifically for datetime values
in generateUpdateRowPayload
---
.../SidePanelEditor/RowEditor/RowEditor.utils.ts | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.utils.ts b/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.utils.ts
index 8d4a239a9863e..0e3c82dd98329 100644
--- a/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.utils.ts
+++ b/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.utils.ts
@@ -198,9 +198,18 @@ export const generateUpdateRowPayload = (originalRow: any, field: RowField[]) =>
const payload = {} as any
const properties = Object.keys(rowObject)
properties.forEach((property) => {
- if (!isEqual(originalRow[property], rowObject[property])) {
+ const type = field.find((x) => x.name === property)?.format
+ if (type !== undefined && DATETIME_TYPES.includes(type)) {
+ // Just to ensure that the value are in the correct and consistent format for value comparison
+ const originalFormatted = convertPostgresDatetimeToInputDatetime(type, originalRow[property])
+ const originalFormattedOut = convertInputDatetimeToPostgresDatetime(type, originalFormatted)
+ if (originalFormattedOut !== rowObject[property]) {
+ payload[property] = rowObject[property]
+ }
+ } else if (!isEqual(originalRow[property], rowObject[property])) {
payload[property] = rowObject[property]
}
})
+
return payload
}
From 1d19861c3754b1a01fa19f1e6faa7b9eac37b203 Mon Sep 17 00:00:00 2001
From: Joshen Lim
Date: Fri, 25 Aug 2023 12:55:04 +0800
Subject: [PATCH 59/60] Address comments
---
.../interfaces/App/CommandMenuWrapper.tsx | 3 ++-
.../BranchManagement/BranchManagement.tsx | 3 ++-
.../GeneralSettings/GeneralSettings.tsx | 14 +++++++++-----
.../SQLEditor/AISchemaSuggestionPopover.tsx | 5 ++---
.../interfaces/SQLEditor/AISettingsModal.tsx | 5 ++---
.../components/interfaces/SQLEditor/SQLEditor.tsx | 5 ++---
.../SQLEditor/UtilityPanel/UtilityTabResults.tsx | 5 ++---
.../EnableBranchingButton.tsx | 3 ++-
studio/lib/constants/index.ts | 5 +++++
9 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/studio/components/interfaces/App/CommandMenuWrapper.tsx b/studio/components/interfaces/App/CommandMenuWrapper.tsx
index 702bb053ae75d..015fb2d8151b1 100644
--- a/studio/components/interfaces/App/CommandMenuWrapper.tsx
+++ b/studio/components/interfaces/App/CommandMenuWrapper.tsx
@@ -13,6 +13,7 @@ import { uuidv4 } from 'lib/helpers'
import { useProfile } from 'lib/profile'
import { useSqlEditorStateSnapshot } from 'state/sql-editor'
import { createSqlSnippetSkeleton } from '../SQLEditor/SQLEditor.utils'
+import { OPT_IN_TAGS } from 'lib/constants'
const CommandMenuWrapper = ({ children }: PropsWithChildren<{}>) => {
const { ref } = useParams()
@@ -22,7 +23,7 @@ const CommandMenuWrapper = ({ children }: PropsWithChildren<{}>) => {
const opt_in_tags = selectedOrganization?.opt_in_tags
const snap = useSqlEditorStateSnapshot()
- const isOptedInToAI = opt_in_tags?.includes('AI_SQL_GENERATOR_OPT_IN') ?? false
+ const isOptedInToAI = opt_in_tags?.includes(OPT_IN_TAGS.AI_SQL) ?? false
const { profile } = useProfile()
const { data: settings } = useProjectApiQuery({ projectRef: ref })
diff --git a/studio/components/interfaces/BranchManagement/BranchManagement.tsx b/studio/components/interfaces/BranchManagement/BranchManagement.tsx
index 44383ae66ccff..0468cf0117d95 100644
--- a/studio/components/interfaces/BranchManagement/BranchManagement.tsx
+++ b/studio/components/interfaces/BranchManagement/BranchManagement.tsx
@@ -26,6 +26,7 @@ import { useBranchesDisableMutation } from 'data/branches/branches-disable-mutat
import { Branch, useBranchesQuery } from 'data/branches/branches-query'
import { useOrgIntegrationsQuery } from 'data/integrations/integrations-query-org-only'
import { useSelectedOrganization, useSelectedProject, useStore } from 'hooks'
+import { OPT_IN_TAGS } from 'lib/constants'
import { useAppUiStateSnapshot } from 'state/app'
import { MainBranchPanel } from './BranchPanels'
import CreateBranchSidePanel from './CreateBranchSidePanel'
@@ -40,7 +41,7 @@ const BranchManagement = () => {
const selectedOrg = useSelectedOrganization()
const hasAccessToBranching =
- selectedOrg?.opt_in_tags?.includes('PREVIEW_BRANCHES_OPT_IN') ?? false
+ selectedOrg?.opt_in_tags?.includes(OPT_IN_TAGS.PREVIEW_BRANCHES) ?? false
const hasBranchEnabled = project?.is_branch_enabled
const isBranch = project?.parent_project_ref !== undefined
diff --git a/studio/components/interfaces/Organization/GeneralSettings/GeneralSettings.tsx b/studio/components/interfaces/Organization/GeneralSettings/GeneralSettings.tsx
index 16facd87e619a..69fbf343cf744 100644
--- a/studio/components/interfaces/Organization/GeneralSettings/GeneralSettings.tsx
+++ b/studio/components/interfaces/Organization/GeneralSettings/GeneralSettings.tsx
@@ -19,6 +19,7 @@ import {
import { useOrganizationUpdateMutation } from 'data/organizations/organization-update-mutation'
import { invalidateOrganizationsQuery } from 'data/organizations/organizations-query'
import { useCheckPermissions, useSelectedOrganization, useStore } from 'hooks'
+import { OPT_IN_TAGS } from 'lib/constants'
import OrganizationDeletePanel from './OrganizationDeletePanel'
const GeneralSettings = () => {
@@ -30,14 +31,14 @@ const GeneralSettings = () => {
const { name, opt_in_tags } = selectedOrganization ?? {}
const formId = 'org-general-settings'
- const isOptedIntoAi = opt_in_tags?.includes('AI_SQL_GENERATOR_OPT_IN')
+ const isOptedIntoAi = opt_in_tags?.includes(OPT_IN_TAGS.AI_SQL)
const initialValues = { name: name ?? '', isOptedIntoAi }
const canUpdateOrganization = useCheckPermissions(PermissionAction.UPDATE, 'organizations')
const canDeleteOrganization = useCheckPermissions(PermissionAction.UPDATE, 'organizations')
const { mutate: updateOrganization, isLoading: isUpdating } = useOrganizationUpdateMutation()
- const onUpdateOrganization = async (values: any, { setSubmitting, resetForm }: any) => {
+ const onUpdateOrganization = async (values: any, { resetForm }: any) => {
if (!canUpdateOrganization) {
return ui.setNotification({
category: 'error',
@@ -48,9 +49,12 @@ const GeneralSettings = () => {
if (!slug) return console.error('Slug is required')
const existingOptInTags = selectedOrganization?.opt_in_tags ?? []
- const updatedOptInTags = values.isOptedIntoAi
- ? existingOptInTags.concat(['AI_SQL_GENERATOR_OPT_IN'])
- : existingOptInTags.filter((x) => x !== 'AI_SQL_GENERATOR_OPT_IN')
+ const updatedOptInTags =
+ values.isOptedIntoAi && !existingOptInTags.includes(OPT_IN_TAGS.AI_SQL)
+ ? existingOptInTags.concat([OPT_IN_TAGS.AI_SQL])
+ : !values.isOptedIntoAi && existingOptInTags.includes(OPT_IN_TAGS.AI_SQL)
+ ? existingOptInTags.filter((x) => x !== OPT_IN_TAGS.AI_SQL)
+ : existingOptInTags
updateOrganization(
{ slug, name: values.name, opt_in_tags: updatedOptInTags },
diff --git a/studio/components/interfaces/SQLEditor/AISchemaSuggestionPopover.tsx b/studio/components/interfaces/SQLEditor/AISchemaSuggestionPopover.tsx
index 656be8b066227..5183c0765de29 100644
--- a/studio/components/interfaces/SQLEditor/AISchemaSuggestionPopover.tsx
+++ b/studio/components/interfaces/SQLEditor/AISchemaSuggestionPopover.tsx
@@ -1,7 +1,7 @@
import * as Popover from '@radix-ui/react-popover'
import { motion } from 'framer-motion'
import { useLocalStorageQuery, useSelectedOrganization, useSelectedProject } from 'hooks'
-import { IS_PLATFORM } from 'lib/constants'
+import { IS_PLATFORM, OPT_IN_TAGS } from 'lib/constants'
import { PropsWithChildren, useEffect, useState } from 'react'
import { Button, IconInfo } from 'ui'
@@ -16,8 +16,7 @@ const AISchemaSuggestionPopover = ({
onClickSettings,
}: PropsWithChildren) => {
const selectedOrganization = useSelectedOrganization()
- const isOptedInToAI =
- selectedOrganization?.opt_in_tags?.includes('AI_SQL_GENERATOR_OPT_IN') ?? false
+ const isOptedInToAI = selectedOrganization?.opt_in_tags?.includes(OPT_IN_TAGS.AI_SQL) ?? false
const [hasEnabledAISchema] = useLocalStorageQuery('supabase_sql-editor-ai-schema', true)
const [isDelayComplete, setIsDelayComplete] = useState(false)
const [aiQueryCount] = useLocalStorageQuery('supabase_sql-editor-ai-query-count', 0)
diff --git a/studio/components/interfaces/SQLEditor/AISettingsModal.tsx b/studio/components/interfaces/SQLEditor/AISettingsModal.tsx
index cf7057228657d..aaa07e7e1073b 100644
--- a/studio/components/interfaces/SQLEditor/AISettingsModal.tsx
+++ b/studio/components/interfaces/SQLEditor/AISettingsModal.tsx
@@ -1,6 +1,6 @@
import { ModalProps } from '@ui/components/Modal/Modal'
import { useLocalStorageQuery, useSelectedOrganization, useStore } from 'hooks'
-import { IS_PLATFORM } from 'lib/constants'
+import { IS_PLATFORM, OPT_IN_TAGS } from 'lib/constants'
import Link from 'next/link'
import { Alert, IconExternalLink, Modal, Toggle } from 'ui'
export interface AISettingsModalProps {
@@ -9,8 +9,7 @@ export interface AISettingsModalProps {
const AISettingsModal = (props: ModalProps) => {
const selectedOrganization = useSelectedOrganization()
- const isOptedInToAI =
- selectedOrganization?.opt_in_tags?.includes('AI_SQL_GENERATOR_OPT_IN') ?? false
+ const isOptedInToAI = selectedOrganization?.opt_in_tags?.includes(OPT_IN_TAGS.AI_SQL) ?? false
const [hasEnabledAISchema, setHasEnabledAISchema] = useLocalStorageQuery(
'supabase_sql-editor-ai-schema-enabled',
true
diff --git a/studio/components/interfaces/SQLEditor/SQLEditor.tsx b/studio/components/interfaces/SQLEditor/SQLEditor.tsx
index f9efcecda7325..ba145a7528dab 100644
--- a/studio/components/interfaces/SQLEditor/SQLEditor.tsx
+++ b/studio/components/interfaces/SQLEditor/SQLEditor.tsx
@@ -35,7 +35,7 @@ import {
useSelectedProject,
useStore,
} from 'hooks'
-import { IS_PLATFORM } from 'lib/constants'
+import { IS_PLATFORM, OPT_IN_TAGS } from 'lib/constants'
import { removeCommentsFromSql, uuidv4 } from 'lib/helpers'
import { useProfile } from 'lib/profile'
import Telemetry from 'lib/telemetry'
@@ -122,8 +122,7 @@ const SQLEditor = () => {
const selectedOrganization = useSelectedOrganization()
const selectedProject = useSelectedProject()
- const isOptedInToAI =
- selectedOrganization?.opt_in_tags?.includes('AI_SQL_GENERATOR_OPT_IN') ?? false
+ const isOptedInToAI = selectedOrganization?.opt_in_tags?.includes(OPT_IN_TAGS.AI_SQL) ?? false
const [hasEnabledAISchema] = useLocalStorageQuery('supabase_sql-editor-ai-schema-enabled', true)
const [isAcceptDiffLoading, setIsAcceptDiffLoading] = useState(false)
const [, setAiQueryCount] = useLocalStorageQuery('supabase_sql-editor-ai-query-count', 0)
diff --git a/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityTabResults.tsx b/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityTabResults.tsx
index 244734b598b27..c7874ba7f7f19 100644
--- a/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityTabResults.tsx
+++ b/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityTabResults.tsx
@@ -8,7 +8,7 @@ import {
useStore,
useFlag,
} from 'hooks'
-import { IS_PLATFORM } from 'lib/constants'
+import { IS_PLATFORM, OPT_IN_TAGS } from 'lib/constants'
import { format } from 'sql-formatter'
import { useSqlEditorStateSnapshot } from 'state/sql-editor'
import { AiIconAnimation, Button } from 'ui'
@@ -30,8 +30,7 @@ const UtilityTabResults = ({ id, isExecuting }: UtilityTabResultsProps) => {
const { setDebugSolution, setAiInput, setSqlDiff, sqlDiff } = useSqlEditor()
const selectedOrganization = useSelectedOrganization()
const selectedProject = useSelectedProject()
- const isOptedInToAI =
- selectedOrganization?.opt_in_tags?.includes('AI_SQL_GENERATOR_OPT_IN') ?? false
+ const isOptedInToAI = selectedOrganization?.opt_in_tags?.includes(OPT_IN_TAGS.AI_SQL) ?? false
const [hasEnabledAISchema] = useLocalStorageQuery('supabase_sql-editor-ai-schema-enabled', true)
const includeSchemaMetadata = (isOptedInToAI || !IS_PLATFORM) && hasEnabledAISchema
diff --git a/studio/components/layouts/AppLayout/EnableBranchingButton/EnableBranchingButton.tsx b/studio/components/layouts/AppLayout/EnableBranchingButton/EnableBranchingButton.tsx
index e1aa1f34fc199..af857abb4f573 100644
--- a/studio/components/layouts/AppLayout/EnableBranchingButton/EnableBranchingButton.tsx
+++ b/studio/components/layouts/AppLayout/EnableBranchingButton/EnableBranchingButton.tsx
@@ -13,6 +13,7 @@ import { useAppUiStateSnapshot } from 'state/app'
import BranchingWaitlistPopover from './BranchingWaitlistPopover'
import GithubRepositorySelection from './GithubRepositorySelection'
import VercelProjectSelection from './VercelProjectSelection'
+import { OPT_IN_TAGS } from 'lib/constants'
const EnableBranchingButton = () => {
const { ui } = useStore()
@@ -45,7 +46,7 @@ const EnableBranchingButton = () => {
})
const hasAccessToBranching =
- selectedOrg?.opt_in_tags?.includes('PREVIEW_BRANCHES_OPT_IN') ?? false
+ selectedOrg?.opt_in_tags?.includes(OPT_IN_TAGS.PREVIEW_BRANCHES) ?? false
const hasGithubIntegrationInstalled =
integrations?.some((integration) => integration.integration.name === 'GitHub') ?? false
diff --git a/studio/lib/constants/index.ts b/studio/lib/constants/index.ts
index 159643b6deeea..614c67455ad13 100644
--- a/studio/lib/constants/index.ts
+++ b/studio/lib/constants/index.ts
@@ -90,3 +90,8 @@ export const USAGE_APPROACHING_THRESHOLD = 0.75
export const LOCAL_STORAGE_KEYS = {
RECENTLY_VISITED_ORGANIZATION: 'supabase-organization',
}
+
+export const OPT_IN_TAGS = {
+ AI_SQL: 'AI_SQL_GENERATOR_OPT_IN',
+ PREVIEW_BRANCHES: 'PREVIEW_BRANCHES_OPT_IN',
+}
From 79497b5d52fc7805ffde61aacaa8152d02b5a7a3 Mon Sep 17 00:00:00 2001
From: Joshen Lim
Date: Fri, 25 Aug 2023 14:35:24 +0800
Subject: [PATCH 60/60] Ignore all error messages from aborts
---
.../storageExplorer/StorageExplorerStore.js | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/studio/localStores/storageExplorer/StorageExplorerStore.js b/studio/localStores/storageExplorer/StorageExplorerStore.js
index ccc2f95eb4814..68d96640c119f 100644
--- a/studio/localStores/storageExplorer/StorageExplorerStore.js
+++ b/studio/localStores/storageExplorer/StorageExplorerStore.js
@@ -1123,10 +1123,7 @@ class StorageExplorerStore {
},
index
)
- } else if (
- !res.error.message.includes('The user aborted a request') &&
- !res.error.message.includes('Request signal is aborted')
- ) {
+ } else if (!res.error.message.includes('aborted')) {
this.ui.setNotification({
error: res.error,
category: 'error',
@@ -1166,10 +1163,7 @@ class StorageExplorerStore {
}
return col
})
- } else if (
- !res.error.message.includes('The user aborted a request') &&
- !res.error.message.includes('Request signal is aborted')
- ) {
+ } else if (!res.error.message.includes('aborted')) {
this.ui.setNotification({
error: res.error,
category: 'error',