[pull] master from supabase:master

apps/docs/content/guides/local-development/declarative-database-schemas.mdx

@@ -74,15 +74,16 @@ supabase db diff -f create_employees_table
 
   <StepHikeCompact.Step step={3}>
     <StepHikeCompact.Details title="Start the local database and apply migrations">
-      Start the local database and then apply the migration file to see your schema changes in the local Dashboard.
+      Start the local database first. Then, apply the migration manually to see your schema changes in the local Dashboard.
     </StepHikeCompact.Details>
 
     <StepHikeCompact.Code>
 
 <$CodeTabs>
 
 ```bash name=Terminal
-supabase start && supabase migration up
+supabase start
+supabase migration up
 ```
 
 </$CodeTabs>

apps/docs/resources/error/errorResolver.ts

@@ -6,7 +6,7 @@ import type {
   RootQueryTypeErrorsArgs,
   Service,
 } from '~/__generated__/graphql'
-import { ApiError, convertUnknownToApiError } from '~/app/api/utils'
+import { ApiError, convertUnknownToApiError, extractMessageFromAnyError } from '~/app/api/utils'
 import { Result } from '~/features/helpers.fn'
 import {
   createCollectionType,
@@ -77,7 +77,13 @@ async function resolveErrors(
               code: args[0].code ?? undefined,
             },
           })
-          return result.mapError((error) => new ApiError('Failed to resolve error codes', error))
+          return result.mapError(
+            (error) =>
+              new ApiError(
+                `Failed to resolve error codes: ${extractMessageFromAnyError(error)}`,
+                error
+              )
+          )
         }
         return await GraphQLCollectionBuilder.create<
           ErrorModel,

apps/studio/pages/project/[ref]/reports/database.tsx

@@ -60,10 +60,13 @@ export default DatabaseReport
 const DatabaseUsage = () => {
   const { db, chart, ref } = useParams()
   const { project } = useProjectContext()
-  const showChartsV2 = useFlag('reportsDatabaseV2')
+  const isReportsV2 = useFlag('reportsDatabaseV2')
   const org = useSelectedOrganization()
   const { plan: orgPlan, isLoading: isOrgPlanLoading } = useCurrentOrgPlan()
   const isFreePlan = !isOrgPlanLoading && orgPlan?.id === 'free'
+  const isTeamsOrEnterprisePlan =
+    !isOrgPlanLoading && (orgPlan?.id === 'team' || orgPlan?.id === 'enterprise')
+  const showChartsV2 = isReportsV2 || isTeamsOrEnterprisePlan
 
   const state = useDatabaseSelectorStateSnapshot()
   const defaultStart = dayjs().subtract(1, 'day').toISOString()