The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Consolidate execute-sql-query into execute-sql-mutation (#46944)
Joshen Lim1baaded0bb44
diff --git a/apps/studio/components/grid/components/grid/GridError.tsx b/apps/studio/components/grid/components/grid/GridError.tsxindex ff564ab432a..cc8cb6b30a2 100644--- a/apps/studio/components/grid/components/grid/GridError.tsx+++ b/apps/studio/components/grid/components/grid/GridError.tsx@@ -11,7 +11,7 @@ import AlertError from '@/components/ui/AlertError'import { HighCostError } from '@/components/ui/HighQueryCost'import { InlineLink } from '@/components/ui/InlineLink'import { ENTITY_TYPE } from '@/data/entity-types/entity-type-constants'-import { COST_THRESHOLD_ERROR } from '@/data/sql/execute-sql-query'+import { COST_THRESHOLD_ERROR } from '@/data/sql/execute-sql-mutation'import { tableRowKeys } from '@/data/table-rows/keys'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { useTableEditorStateSnapshot } from '@/state/table-editor'diff --git a/apps/studio/components/interfaces/Auth/Hooks/CreateHookSheet.tsx b/apps/studio/components/interfaces/Auth/Hooks/CreateHookSheet.tsxindex d43a54cb9ea..3b4dcde3670 100644--- a/apps/studio/components/interfaces/Auth/Hooks/CreateHookSheet.tsx+++ b/apps/studio/components/interfaces/Auth/Hooks/CreateHookSheet.tsx@@ -41,7 +41,7 @@ import FunctionSelector from '@/components/ui/FunctionSelector'import SchemaSelector from '@/components/ui/SchemaSelector'import { AuthConfigResponse } from '@/data/auth/auth-config-query'import { useAuthHooksUpdateMutation } from '@/data/auth/auth-hooks-update-mutation'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { useConfirmOnClose } from '@/hooks/ui/useConfirmOnClose'import { DOCS_URL } from '@/lib/constants'diff --git a/apps/studio/components/interfaces/Auth/Hooks/HooksListing.tsx b/apps/studio/components/interfaces/Auth/Hooks/HooksListing.tsxindex dde463edb53..b4d56c94656 100644--- a/apps/studio/components/interfaces/Auth/Hooks/HooksListing.tsx+++ b/apps/studio/components/interfaces/Auth/Hooks/HooksListing.tsx@@ -24,7 +24,7 @@ import AlertError from '@/components/ui/AlertError'import CodeEditor from '@/components/ui/CodeEditor/CodeEditor'import { useAuthConfigQuery } from '@/data/auth/auth-config-query'import { useAuthHooksUpdateMutation } from '@/data/auth/auth-hooks-update-mutation'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { SHORTCUT_IDS } from '@/state/shortcuts/registry'import { useShortcut } from '@/state/shortcuts/useShortcut'diff --git a/apps/studio/components/interfaces/Docs/Description.tsx b/apps/studio/components/interfaces/Docs/Description.tsxindex 762333e9b5e..e86334940e0 100644--- a/apps/studio/components/interfaces/Docs/Description.tsx+++ b/apps/studio/components/interfaces/Docs/Description.tsx@@ -6,7 +6,7 @@ import { useState } from 'react'import { toast } from 'sonner'import { Button, ExpandingTextArea } from 'ui'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { timeout } from '@/lib/helpers'diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.useCronJobsData.ts b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.useCronJobsData.tsindex ebca96442bd..1d2c2cda039 100644--- a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.useCronJobsData.ts+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.useCronJobsData.ts@@ -10,7 +10,7 @@ import {useCronJobsInfiniteQuery,} from '@/data/database-cron-jobs/database-cron-jobs-infinite-query'import { useCronJobsMinimalInfiniteQuery } from '@/data/database-cron-jobs/database-cron-jobs-minimal-infinite-query'-import { COST_THRESHOLD_ERROR } from '@/data/sql/execute-sql-query'+import { COST_THRESHOLD_ERROR } from '@/data/sql/execute-sql-mutation'import type { ResponseError } from '@/types'// =============================================================================diff --git a/apps/studio/components/interfaces/QueryPerformance/IndexAdvisor/index-advisor.utils.ts b/apps/studio/components/interfaces/QueryPerformance/IndexAdvisor/index-advisor.utils.tsindex 12f476e7066..c9276c5a8bf 100644--- a/apps/studio/components/interfaces/QueryPerformance/IndexAdvisor/index-advisor.utils.ts+++ b/apps/studio/components/interfaces/QueryPerformance/IndexAdvisor/index-advisor.utils.ts@@ -3,7 +3,7 @@ import { toast } from 'sonner'import { DatabaseExtension } from '@/data/database-extensions/database-extensions-query'import { GetIndexAdvisorResultResponse } from '@/data/database/retrieve-index-advisor-result-query'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { INTERNAL_SCHEMAS } from '@/hooks/useProtectedSchemas'/**diff --git a/apps/studio/components/interfaces/QueryPerformance/WithStatements/WithStatements.tsx b/apps/studio/components/interfaces/QueryPerformance/WithStatements/WithStatements.tsxindex 346658e68c0..8129791be01 100644--- a/apps/studio/components/interfaces/QueryPerformance/WithStatements/WithStatements.tsx+++ b/apps/studio/components/interfaces/QueryPerformance/WithStatements/WithStatements.tsx@@ -20,7 +20,7 @@ import { DownloadResultsButton } from '@/components/ui/DownloadResultsButton'import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'import { formatDatabaseID } from '@/data/read-replicas/replicas.utils'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { useInfiniteScroll } from '@/hooks/misc/useInfiniteScroll'import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'diff --git a/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.ts b/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.tsindex 706af70ce59..edcc504af92 100644--- a/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.ts+++ b/apps/studio/components/interfaces/QueryPerformance/useQueryPerformanceQuery.ts@@ -16,7 +16,7 @@ import {QueryPerformanceSQLParams,} from './QueryPerformance.types'import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import useDbQuery from '@/hooks/analytics/useDbQuery'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { IS_PLATFORM } from '@/lib/constants'diff --git a/apps/studio/components/interfaces/Reports/ReportBlock/ReportBlock.tsx b/apps/studio/components/interfaces/Reports/ReportBlock/ReportBlock.tsxindex 12c4ebc026d..87a4d464298 100644--- a/apps/studio/components/interfaces/Reports/ReportBlock/ReportBlock.tsx+++ b/apps/studio/components/interfaces/Reports/ReportBlock/ReportBlock.tsx@@ -16,7 +16,7 @@ import { DEFAULT_CHART_CONFIG, QueryBlock } from '@/components/ui/QueryBlock/Queimport { AnalyticsInterval } from '@/data/analytics/constants'import { useContentIdQuery } from '@/data/content/content-id-query'import { usePrimaryDatabase } from '@/data/read-replicas/replicas-query'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { sqlKeys } from '@/data/sql/keys'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'diff --git a/apps/studio/components/interfaces/Settings/API/DataApiEnableSwitch.utils.ts b/apps/studio/components/interfaces/Settings/API/DataApiEnableSwitch.utils.tsindex 6cb06f08be7..1227f773b55 100644--- a/apps/studio/components/interfaces/Settings/API/DataApiEnableSwitch.utils.ts+++ b/apps/studio/components/interfaces/Settings/API/DataApiEnableSwitch.utils.ts@@ -1,7 +1,7 @@import { getUnsafeEntitiesInApiSql } from '@supabase/pg-meta'import type { EnableCheckAction, EnableCheckState } from './DataApiEnableSwitch.types'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'export type ExposedEntity = {schema: stringdiff --git a/apps/studio/components/interfaces/Storage/PublicBucketWarning.tsx b/apps/studio/components/interfaces/Storage/PublicBucketWarning.tsxindex c7ac2ca868b..b4577740c69 100644--- a/apps/studio/components/interfaces/Storage/PublicBucketWarning.tsx+++ b/apps/studio/components/interfaces/Storage/PublicBucketWarning.tsx@@ -9,7 +9,7 @@ import { CodeBlock } from 'ui-patterns/CodeBlock'import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'import { databasePoliciesKeys } from '@/data/database-policies/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { storageKeys } from '@/data/storage/keys'import { usePublicBucketsWithSelectPoliciesQuery } from '@/data/storage/public-buckets-with-select-policies-query'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.createTable.test.ts b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.createTable.test.tsindex c5732f8fd46..02e843e0f2c 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.createTable.test.ts+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.createTable.test.ts@@ -22,7 +22,7 @@ vi.mock('@/data/query-client', () => ({}),}))-vi.mock('@/data/sql/execute-sql-query', () => ({+vi.mock('@/data/sql/execute-sql-mutation', () => ({executeSql: (...args: unknown[]) => mockExecuteSql(...args),}))diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.tsxindex a654f7f0048..7a2b6277ed6 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.tsx@@ -39,7 +39,7 @@ import { entityTypeKeys } from '@/data/entity-types/keys'import { lintKeys } from '@/data/lint/keys'import { prefetchEditorTablePage } from '@/data/prefetchers/project.$ref.editor.$id'import { getQueryClient } from '@/data/query-client'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { tableEditorKeys } from '@/data/table-editor/keys'import { prefetchTableEditor } from '@/data/table-editor/table-editor-query'import { tableRowKeys } from '@/data/table-rows/keys'diff --git a/apps/studio/data/api-settings/create-and-expose-api-schema-mutation.ts b/apps/studio/data/api-settings/create-and-expose-api-schema-mutation.tsindex 152e642478f..58a62bb083e 100644--- a/apps/studio/data/api-settings/create-and-expose-api-schema-mutation.ts+++ b/apps/studio/data/api-settings/create-and-expose-api-schema-mutation.ts@@ -6,7 +6,7 @@ import { toast } from 'sonner'import { configKeys } from '@/data/config/keys'import { databaseKeys } from '@/data/database/keys'import { handleError, patch } from '@/data/fetchers'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CreateAndExposeAPISchemaVariables = {diff --git a/apps/studio/data/auth/index-worker-status-query.ts b/apps/studio/data/auth/index-worker-status-query.tsindex d72110ac746..54932ecf438 100644--- a/apps/studio/data/auth/index-worker-status-query.ts+++ b/apps/studio/data/auth/index-worker-status-query.ts@@ -2,8 +2,8 @@ import { getIndexWorkerStatusSQL } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { authKeys } from './keys'-import { executeSql, type ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'type IndexWorkerStatusVariables = {projectRef?: string@@ -12,7 +12,7 @@ type IndexWorkerStatusVariables = {type IndexWorkerStatusData = {is_in_progress: boolean}-export type IndexWorkerStatusError = ExecuteSqlError+export type IndexWorkerStatusError = ResponseErrorexport async function getIndexWorkerStatus({ projectRef, connectionString }: IndexWorkerStatusVariables,diff --git a/apps/studio/data/auth/user-query.ts b/apps/studio/data/auth/user-query.tsindex 73ac5546686..b83e6b4def0 100644--- a/apps/studio/data/auth/user-query.ts+++ b/apps/studio/data/auth/user-query.ts@@ -3,9 +3,9 @@ import { useQuery } from '@tanstack/react-query'import { authKeys } from './keys'import { User } from './users-infinite-query'-import { executeSql, type ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { UUID_REGEX } from '@/lib/constants'-import { UseCustomQueryOptions } from '@/types'+import { ResponseError, UseCustomQueryOptions } from '@/types'type UserVariables = {projectRef?: string@@ -32,7 +32,7 @@ export async function getUser(}export type UserData = Awaited<ReturnType<typeof getUser>>-export type UserError = ExecuteSqlError+export type UserError = ResponseErrorexport const useUserQuery = <TData = UserData>({ projectRef, connectionString, userId }: UserVariables,diff --git a/apps/studio/data/auth/user-search-indexes-query.ts b/apps/studio/data/auth/user-search-indexes-query.tsindex 02400b752ce..1cb6cbd35f5 100644--- a/apps/studio/data/auth/user-search-indexes-query.ts+++ b/apps/studio/data/auth/user-search-indexes-query.ts@@ -2,8 +2,8 @@ import { getIndexStatusesSQL } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { authKeys } from './keys'-import { executeSql, type ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'type UsersIndexStatusesVariables = {projectRef?: string@@ -14,7 +14,7 @@ type UsersIndexStatusesData = {is_valid: booleanis_ready: boolean}[]-export type UsersIndexStatusesError = ExecuteSqlError+export type UsersIndexStatusesError = ResponseErrorexport async function getUserIndexStatuses({ projectRef, connectionString }: UsersIndexStatusesVariables,diff --git a/apps/studio/data/auth/users-count-query.ts b/apps/studio/data/auth/users-count-query.tsindex 4bfabf2a388..d40284ef50a 100644--- a/apps/studio/data/auth/users-count-query.ts+++ b/apps/studio/data/auth/users-count-query.ts@@ -4,8 +4,8 @@ import { useQuery } from '@tanstack/react-query'import { authKeys } from './keys'import { type Filter } from './users-infinite-query'-import { executeSql, type ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'type UsersCountVariables = {projectRef?: string@@ -57,7 +57,7 @@ export async function getUsersCount(}export type UsersCountData = Awaited<ReturnType<typeof getUsersCount>>-export type UsersCountError = ExecuteSqlError+export type UsersCountError = ResponseError/** [Joshen] Be wary of using this as it could potentially cause a huge load on the user's DB */export const useUsersCountQuery = <TData = UsersCountData>(diff --git a/apps/studio/data/auth/users-infinite-query.ts b/apps/studio/data/auth/users-infinite-query.tsindex eca57f51fad..ec0ba887d8a 100644--- a/apps/studio/data/auth/users-infinite-query.ts+++ b/apps/studio/data/auth/users-infinite-query.ts@@ -3,14 +3,14 @@ import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'import { authKeys } from './keys'import type { components } from '@/data/api'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { PROJECT_STATUS } from '@/lib/constants'-import { UseCustomInfiniteQueryOptions } from '@/types'+import { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'const USERS_PAGE_LIMIT = 50type UsersData = { result: User[] }-type UsersError = ExecuteSqlError+type UsersError = ResponseErrortype UsersVariables = {projectRef?: stringconnectionString?: string | nulldiff --git a/apps/studio/data/config/disk-breakdown-query.ts b/apps/studio/data/config/disk-breakdown-query.tsindex df51ee0f0b0..412632379b0 100644--- a/apps/studio/data/config/disk-breakdown-query.ts+++ b/apps/studio/data/config/disk-breakdown-query.ts@@ -2,7 +2,7 @@ import { safeSql } from '@supabase/pg-meta/src/pg-format'import { useQuery } from '@tanstack/react-query'import { configKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DiskBreakdownVariables = {diff --git a/apps/studio/data/database-columns/database-column-create-mutation.ts b/apps/studio/data/database-columns/database-column-create-mutation.tsindex e1f8d719775..f1acbb6bd7a 100644--- a/apps/studio/data/database-columns/database-column-create-mutation.ts+++ b/apps/studio/data/database-columns/database-column-create-mutation.ts@@ -3,7 +3,7 @@ import type { ColumnTypeRef } from '@supabase/pg-meta/src/pg-meta-columns'import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CreateColumnBody = {diff --git a/apps/studio/data/database-columns/database-column-delete-mutation.ts b/apps/studio/data/database-columns/database-column-delete-mutation.tsindex c0d1016a920..9ebfb635af9 100644--- a/apps/studio/data/database-columns/database-column-delete-mutation.ts+++ b/apps/studio/data/database-columns/database-column-delete-mutation.ts@@ -5,7 +5,7 @@ import { toast } from 'sonner'import { databaseKeys } from '@/data/database/keys'import { entityTypeKeys } from '@/data/entity-types/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { tableEditorKeys } from '@/data/table-editor/keys'import { tableRowKeys } from '@/data/table-rows/keys'import { viewKeys } from '@/data/views/keys'diff --git a/apps/studio/data/database-columns/database-column-update-mutation.ts b/apps/studio/data/database-columns/database-column-update-mutation.tsindex 4c7047ab4bc..dedac3627fb 100644--- a/apps/studio/data/database-columns/database-column-update-mutation.ts+++ b/apps/studio/data/database-columns/database-column-update-mutation.ts@@ -4,7 +4,7 @@ import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'import { CreateColumnBody } from './database-column-create-mutation'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type UpdateColumnBody = Partial<diff --git a/apps/studio/data/database-cron-jobs/database-cron-job-query.ts b/apps/studio/data/database-cron-jobs/database-cron-job-query.tsindex 368ec52407e..983f21bfdc9 100644--- a/apps/studio/data/database-cron-jobs/database-cron-job-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-job-query.ts@@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query'import { CronJob } from './database-cron-jobs-infinite-query'import { databaseCronJobsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseCronJobVariables = {diff --git a/apps/studio/data/database-cron-jobs/database-cron-job-run-mutation.ts b/apps/studio/data/database-cron-jobs/database-cron-job-run-mutation.tsindex a9200798503..7643cb2ae3a 100644--- a/apps/studio/data/database-cron-jobs/database-cron-job-run-mutation.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-job-run-mutation.ts@@ -3,7 +3,7 @@ import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'import { databaseCronJobsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseCronJobRunVariables = {diff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-count-estimate-query.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-count-estimate-query.tsindex 5d201a29014..bc045a022e5 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-count-estimate-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-count-estimate-query.ts@@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query'import type { ConnectionVars } from '@/data/common.types'import { getLiveTupleEstimateKey } from '@/data/database/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { UseCustomQueryOptions } from '@/types'type DatabaseCronJobsCountEstimateVariables = ConnectionVarsdiff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-count-query.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-count-query.tsindex 9fcb6d0bdca..0ec0a67a80d 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-count-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-count-query.ts@@ -2,7 +2,7 @@ import { safeSql } from '@supabase/pg-meta/src/pg-format'import { useQuery } from '@tanstack/react-query'import { databaseCronJobsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomQueryOptions } from '@/types'type DatabaseCronJobsCountVariables = {diff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-create-mutation.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-create-mutation.tsindex 941d4df8181..ff052c32e11 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-create-mutation.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-create-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databaseCronJobsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseCronJobCreateVariables = {diff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-delete-mutation.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-delete-mutation.tsindex eda2c0674a6..686806ecd29 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-delete-mutation.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-delete-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databaseCronJobsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseCronJobDeleteVariables = {diff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-infinite-query.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-infinite-query.tsindex c9e88a8d7c7..a93c4dd3b89 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-infinite-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-infinite-query.ts@@ -2,7 +2,7 @@ import { getCronJobsSql } from '@supabase/pg-meta'import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'import { databaseCronJobsKeys } from './keys'-import { COST_THRESHOLD_ERROR, executeSql } from '@/data/sql/execute-sql-query'+import { COST_THRESHOLD_ERROR, executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'// The value is intentionally high because the data grid needs to overflow so that `onScroll` event work and triggerdiff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-minimal-infinite-query.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-minimal-infinite-query.tsindex 1b83cb5ac0d..7d0d0f58711 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-minimal-infinite-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-minimal-infinite-query.ts@@ -7,7 +7,7 @@ import {DatabaseCronJobRunsVariables,} from './database-cron-jobs-infinite-query'import { databaseCronJobsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'export async function getDatabaseCronJobsMinimal({diff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-runs-infinite-query.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-runs-infinite-query.tsindex 02338e053a4..a8e72a82923 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-runs-infinite-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-runs-infinite-query.ts@@ -3,7 +3,7 @@ import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'import { last } from 'lodash'import { databaseCronJobsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'export type DatabaseCronJobRunsVariables = {diff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-toggle-mutation.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-toggle-mutation.tsindex 3e5bc7751b0..e3f5f077ceb 100644--- a/apps/studio/data/database-cron-jobs/database-cron-jobs-toggle-mutation.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-toggle-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databaseCronJobsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseCronJobToggleVariables = {diff --git a/apps/studio/data/database-cron-jobs/database-cron-timezone-query.ts b/apps/studio/data/database-cron-jobs/database-cron-timezone-query.tsindex 2d0f518780d..9292a8f1aac 100644--- a/apps/studio/data/database-cron-jobs/database-cron-timezone-query.ts+++ b/apps/studio/data/database-cron-jobs/database-cron-timezone-query.ts@@ -2,7 +2,7 @@ import { safeSql } from '@supabase/pg-meta/src/pg-format'import { useQuery } from '@tanstack/react-query'import { databaseCronJobsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseCronJobsVariables = {diff --git a/apps/studio/data/database-cron-jobs/schedule-clean-up-mutation.ts b/apps/studio/data/database-cron-jobs/schedule-clean-up-mutation.tsindex 1dd967eca45..b7dc3453f3d 100644--- a/apps/studio/data/database-cron-jobs/schedule-clean-up-mutation.ts+++ b/apps/studio/data/database-cron-jobs/schedule-clean-up-mutation.ts@@ -3,7 +3,7 @@ import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'import { getScheduleDeleteCronJobRunDetailsKey } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ScheduleCronJobRunDetailsCleanupVariables = {diff --git a/apps/studio/data/database-event-triggers/database-event-trigger-create-mutation.ts b/apps/studio/data/database-event-triggers/database-event-trigger-create-mutation.tsindex 2740821cb02..5e3fd68f4ea 100644--- a/apps/studio/data/database-event-triggers/database-event-trigger-create-mutation.ts+++ b/apps/studio/data/database-event-triggers/database-event-trigger-create-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databaseEventTriggerKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseEventTriggerCreateVariables = {diff --git a/apps/studio/data/database-event-triggers/database-event-trigger-delete-mutation.ts b/apps/studio/data/database-event-triggers/database-event-trigger-delete-mutation.tsindex afca6166049..a5516fb9850 100644--- a/apps/studio/data/database-event-triggers/database-event-trigger-delete-mutation.ts+++ b/apps/studio/data/database-event-triggers/database-event-trigger-delete-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import type { DatabaseEventTrigger } from './database-event-triggers-query'import { databaseEventTriggerKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseEventTriggerDeleteVariables = {diff --git a/apps/studio/data/database-event-triggers/database-event-triggers-query.ts b/apps/studio/data/database-event-triggers/database-event-triggers-query.tsindex 2660952375f..0cabe5d5bcc 100644--- a/apps/studio/data/database-event-triggers/database-event-triggers-query.ts+++ b/apps/studio/data/database-event-triggers/database-event-triggers-query.ts@@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query'import { databaseEventTriggerKeys } from './keys'import type { EventTrigger } from '@/components/interfaces/Database/Triggers/EventTriggersList/EventTriggerList.utils'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseEventTriggersVariables = {diff --git a/apps/studio/data/database-extensions/database-extension-disable-mutation.ts b/apps/studio/data/database-extensions/database-extension-disable-mutation.tsindex 3fc868124c4..c53604bfc27 100644--- a/apps/studio/data/database-extensions/database-extension-disable-mutation.ts+++ b/apps/studio/data/database-extensions/database-extension-disable-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { databaseExtensionsKeys } from './keys'import { configKeys } from '@/data/config/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseExtensionDisableVariables = {diff --git a/apps/studio/data/database-extensions/database-extension-enable-mutation.ts b/apps/studio/data/database-extensions/database-extension-enable-mutation.tsindex dffd9f1b50d..046f291d266 100644--- a/apps/studio/data/database-extensions/database-extension-enable-mutation.ts+++ b/apps/studio/data/database-extensions/database-extension-enable-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { databaseExtensionsKeys } from './keys'import { configKeys } from '@/data/config/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseExtensionEnableVariables = {diff --git a/apps/studio/data/database-extensions/database-extensions-query.ts b/apps/studio/data/database-extensions/database-extensions-query.tsindex 3f47ce91bbf..5e293a0dcfe 100644--- a/apps/studio/data/database-extensions/database-extensions-query.ts+++ b/apps/studio/data/database-extensions/database-extensions-query.ts@@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query'import { components } from 'api-types'import { databaseExtensionsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { PROJECT_STATUS } from '@/lib/constants'import type { ResponseError, UseCustomQueryOptions } from '@/types'diff --git a/apps/studio/data/database-functions/database-functions-create-mutation.ts b/apps/studio/data/database-functions/database-functions-create-mutation.tsindex cbebad502a8..8432de22a65 100644--- a/apps/studio/data/database-functions/database-functions-create-mutation.ts+++ b/apps/studio/data/database-functions/database-functions-create-mutation.ts@@ -5,7 +5,7 @@ import { toast } from 'sonner'import { z } from 'zod'import { databaseKeys } from '@/data/database/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseFunctionCreateVariables = {diff --git a/apps/studio/data/database-functions/database-functions-delete-mutation.ts b/apps/studio/data/database-functions/database-functions-delete-mutation.tsindex dd2e4116adf..e4b6d55c254 100644--- a/apps/studio/data/database-functions/database-functions-delete-mutation.ts+++ b/apps/studio/data/database-functions/database-functions-delete-mutation.ts@@ -5,7 +5,7 @@ import { z } from 'zod'import { SavedDatabaseFunction } from './database-functions-query'import { databaseKeys } from '@/data/database/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseFunctionDeleteVariables = {diff --git a/apps/studio/data/database-functions/database-functions-query.ts b/apps/studio/data/database-functions/database-functions-query.tsindex aaf05eebd42..184454d9d33 100644--- a/apps/studio/data/database-functions/database-functions-query.ts+++ b/apps/studio/data/database-functions/database-functions-query.ts@@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query'import { z } from 'zod'import { databaseKeys } from '@/data/database/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseFunctionsVariables = {diff --git a/apps/studio/data/database-functions/database-functions-update-mutation.ts b/apps/studio/data/database-functions/database-functions-update-mutation.tsindex 4b39c14db07..da01a462a4e 100644--- a/apps/studio/data/database-functions/database-functions-update-mutation.ts+++ b/apps/studio/data/database-functions/database-functions-update-mutation.ts@@ -6,7 +6,7 @@ import { z } from 'zod'import type { SavedDatabaseFunction } from './database-functions-query'import { databaseKeys } from '@/data/database/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseFunctionUpdateVariables = {diff --git a/apps/studio/data/database-indexes/index-create-mutation.ts b/apps/studio/data/database-indexes/index-create-mutation.tsindex 08888d88298..40208c12549 100644--- a/apps/studio/data/database-indexes/index-create-mutation.ts+++ b/apps/studio/data/database-indexes/index-create-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databaseIndexesKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseIndexCreateVariables = {diff --git a/apps/studio/data/database-indexes/index-delete-mutation.ts b/apps/studio/data/database-indexes/index-delete-mutation.tsindex 5cb809613ae..ea873f57d3f 100644--- a/apps/studio/data/database-indexes/index-delete-mutation.ts+++ b/apps/studio/data/database-indexes/index-delete-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databaseIndexesKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseIndexDeleteVariables = {diff --git a/apps/studio/data/database-indexes/indexes-query.ts b/apps/studio/data/database-indexes/indexes-query.tsindex 908dc047985..03c1c5c41cd 100644--- a/apps/studio/data/database-indexes/indexes-query.ts+++ b/apps/studio/data/database-indexes/indexes-query.ts@@ -2,8 +2,8 @@ import { getIndexesSQL } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { databaseIndexesKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'type GetIndexesArgs = {schema?: string@@ -41,7 +41,7 @@ export async function getIndexes(}export type IndexesData = Awaited<ReturnType<typeof getIndexes>>-export type IndexesError = ExecuteSqlError+export type IndexesError = ResponseErrorexport const useIndexesQuery = <TData = IndexesData>({ projectRef, connectionString, schema }: IndexesVariables,diff --git a/apps/studio/data/database-integrations/stripe/sync-state-query.ts b/apps/studio/data/database-integrations/stripe/sync-state-query.tsindex 9dcd5e5325f..05abff9d132 100644--- a/apps/studio/data/database-integrations/stripe/sync-state-query.ts+++ b/apps/studio/data/database-integrations/stripe/sync-state-query.ts@@ -3,7 +3,8 @@ import { QueryClient, useQuery, UseQueryOptions } from '@tanstack/react-query'import { z } from 'zod'import { stripeSyncKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError } from '@/types'export type DbConnection = {projectRef: string@@ -21,7 +22,7 @@ const StripeSyncStateSchema = zexport type StripeSyncState = z.infer<typeof StripeSyncStateSchema>export type StripeSyncStateData = z.infer<typeof StripeSyncStateSchema>-export type StripeSyncStateError = ExecuteSqlError+export type StripeSyncStateError = ResponseErrorexport async function getStripeSyncState({ projectRef, connectionString }: DbConnection,diff --git a/apps/studio/data/database-policies/database-policy-create-mutation.ts b/apps/studio/data/database-policies/database-policy-create-mutation.tsindex 0932f7a9db5..4be97cc942e 100644--- a/apps/studio/data/database-policies/database-policy-create-mutation.ts+++ b/apps/studio/data/database-policies/database-policy-create-mutation.ts@@ -4,7 +4,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databasePoliciesKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CreatePolicyBody = {diff --git a/apps/studio/data/database-policies/database-policy-delete-mutation.ts b/apps/studio/data/database-policies/database-policy-delete-mutation.tsindex 7fc055b8ff0..c9538823d8c 100644--- a/apps/studio/data/database-policies/database-policy-delete-mutation.ts+++ b/apps/studio/data/database-policies/database-policy-delete-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databasePoliciesKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabasePolicyDeleteVariables = {diff --git a/apps/studio/data/database-policies/database-policy-update-mutation.ts b/apps/studio/data/database-policies/database-policy-update-mutation.tsindex db180c5f13b..3427b42f425 100644--- a/apps/studio/data/database-policies/database-policy-update-mutation.ts+++ b/apps/studio/data/database-policies/database-policy-update-mutation.ts@@ -4,7 +4,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databasePoliciesKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabasePolicyUpdateVariables = {diff --git a/apps/studio/data/database-publications/database-publications-create-mutation.ts b/apps/studio/data/database-publications/database-publications-create-mutation.tsindex 45bfbfa2615..80c3d265675 100644--- a/apps/studio/data/database-publications/database-publications-create-mutation.ts+++ b/apps/studio/data/database-publications/database-publications-create-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databasePublicationsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabasePublicationCreateVariables = {diff --git a/apps/studio/data/database-publications/database-publications-update-mutation.ts b/apps/studio/data/database-publications/database-publications-update-mutation.tsindex 60178e6aa71..f49d64bb0ba 100644--- a/apps/studio/data/database-publications/database-publications-update-mutation.ts+++ b/apps/studio/data/database-publications/database-publications-update-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databasePublicationsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabasePublicationUpdateVariables = {diff --git a/apps/studio/data/database-queues/database-queue-messages-archive-mutation.ts b/apps/studio/data/database-queues/database-queue-messages-archive-mutation.tsindex 590ea9e10f5..7125eefb014 100644--- a/apps/studio/data/database-queues/database-queue-messages-archive-mutation.ts+++ b/apps/studio/data/database-queues/database-queue-messages-archive-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { databaseQueuesKeys } from './keys'import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueueMessageArchiveVariables = {diff --git a/apps/studio/data/database-queues/database-queue-messages-delete-mutation.ts b/apps/studio/data/database-queues/database-queue-messages-delete-mutation.tsindex fcf4b9c0d91..88e5a16b88e 100644--- a/apps/studio/data/database-queues/database-queue-messages-delete-mutation.ts+++ b/apps/studio/data/database-queues/database-queue-messages-delete-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { databaseQueuesKeys } from './keys'import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueueMessageDeleteVariables = {diff --git a/apps/studio/data/database-queues/database-queue-messages-infinite-query.ts b/apps/studio/data/database-queues/database-queue-messages-infinite-query.tsindex f49e1ed338e..c9b0dfc89fb 100644--- a/apps/studio/data/database-queues/database-queue-messages-infinite-query.ts+++ b/apps/studio/data/database-queues/database-queue-messages-infinite-query.ts@@ -10,7 +10,7 @@ import {pgmqQueueTable,} from '@/components/interfaces/Integrations/Queues/Queues.utils'import { QUEUE_MESSAGE_TYPE } from '@/components/interfaces/Integrations/Queues/SingleQueue/Queue.utils'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { DATE_FORMAT } from '@/lib/constants'import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'diff --git a/apps/studio/data/database-queues/database-queue-messages-read-mutation.ts b/apps/studio/data/database-queues/database-queue-messages-read-mutation.tsindex 7c72f35bc0d..fcdce6c3678 100644--- a/apps/studio/data/database-queues/database-queue-messages-read-mutation.ts+++ b/apps/studio/data/database-queues/database-queue-messages-read-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { databaseQueuesKeys } from './keys'import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueueMessageReadVariables = {diff --git a/apps/studio/data/database-queues/database-queue-messages-send-mutation.ts b/apps/studio/data/database-queues/database-queue-messages-send-mutation.tsindex a3f6218fba2..76444b6b3f1 100644--- a/apps/studio/data/database-queues/database-queue-messages-send-mutation.ts+++ b/apps/studio/data/database-queues/database-queue-messages-send-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { databaseQueuesKeys } from './keys'import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueueMessageSendVariables = {diff --git a/apps/studio/data/database-queues/database-queues-create-mutation.ts b/apps/studio/data/database-queues/database-queues-create-mutation.tsindex e26120ca0ae..da4673b0985 100644--- a/apps/studio/data/database-queues/database-queues-create-mutation.ts+++ b/apps/studio/data/database-queues/database-queues-create-mutation.ts@@ -7,7 +7,7 @@ import {isQueueNameValid,pgmqQueueTable,} from '@/components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { tableKeys } from '@/data/tables/keys'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/data/database-queues/database-queues-delete-mutation.ts b/apps/studio/data/database-queues/database-queues-delete-mutation.tsindex 38fc436080b..1ac76fae9fa 100644--- a/apps/studio/data/database-queues/database-queues-delete-mutation.ts+++ b/apps/studio/data/database-queues/database-queues-delete-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { databaseQueuesKeys } from './keys'import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueueDeleteVariables = {diff --git a/apps/studio/data/database-queues/database-queues-expose-postgrest-status-query.ts b/apps/studio/data/database-queues/database-queues-expose-postgrest-status-query.tsindex b4265893f07..a72ec56fde2 100644--- a/apps/studio/data/database-queues/database-queues-expose-postgrest-status-query.ts+++ b/apps/studio/data/database-queues/database-queues-expose-postgrest-status-query.ts@@ -2,7 +2,7 @@ import { getQueuesExposePostgrestStatusSQL } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { databaseQueuesKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseQueuesVariables = {diff --git a/apps/studio/data/database-queues/database-queues-metrics-query.ts b/apps/studio/data/database-queues/database-queues-metrics-query.tsindex a41a6586a71..196d9675439 100644--- a/apps/studio/data/database-queues/database-queues-metrics-query.ts+++ b/apps/studio/data/database-queues/database-queues-metrics-query.ts@@ -6,7 +6,7 @@ import {isQueueNameValid,pgmqQueueTable,} from '@/components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseQueuesMetricsVariables = {diff --git a/apps/studio/data/database-queues/database-queues-purge-mutation.ts b/apps/studio/data/database-queues/database-queues-purge-mutation.tsindex dc9aa97ae69..5db704def9e 100644--- a/apps/studio/data/database-queues/database-queues-purge-mutation.ts+++ b/apps/studio/data/database-queues/database-queues-purge-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { databaseQueuesKeys } from './keys'import { isQueueNameValid } from '@/components/interfaces/Integrations/Queues/Queues.utils'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseQueuePurgeVariables = {diff --git a/apps/studio/data/database-queues/database-queues-query.ts b/apps/studio/data/database-queues/database-queues-query.tsindex f6e7d683691..12698070796 100644--- a/apps/studio/data/database-queues/database-queues-query.ts+++ b/apps/studio/data/database-queues/database-queues-query.ts@@ -2,7 +2,7 @@ import { safeSql } from '@supabase/pg-meta/src/pg-format'import { useQuery } from '@tanstack/react-query'import { databaseQueuesKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseQueuesVariables = {diff --git a/apps/studio/data/database-queues/database-queues-toggle-postgrest-mutation.ts b/apps/studio/data/database-queues/database-queues-toggle-postgrest-mutation.tsindex e7f9cc16e26..a6961190d76 100644--- a/apps/studio/data/database-queues/database-queues-toggle-postgrest-mutation.ts+++ b/apps/studio/data/database-queues/database-queues-toggle-postgrest-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { databaseQueuesKeys } from './keys'import { databaseKeys } from '@/data/database/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { isGreaterThanOrEqual } from '@/lib/semver'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/data/database-roles/database-role-create-mutation.ts b/apps/studio/data/database-roles/database-role-create-mutation.tsindex 4b607d7b383..7f4f9c73cd9 100644--- a/apps/studio/data/database-roles/database-role-create-mutation.ts+++ b/apps/studio/data/database-roles/database-role-create-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { invalidateRolesQuery } from './database-roles-query'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'type CreateRoleBody = Parameters<typeof pgMeta.roles.create>[0]diff --git a/apps/studio/data/database-roles/database-role-delete-mutation.ts b/apps/studio/data/database-roles/database-role-delete-mutation.tsindex f1cac6497ca..9d1ec94eb02 100644--- a/apps/studio/data/database-roles/database-role-delete-mutation.ts+++ b/apps/studio/data/database-roles/database-role-delete-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { invalidateRolesQuery } from './database-roles-query'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'type DropRoleBody = Parameters<typeof pgMeta.roles.remove>[1]diff --git a/apps/studio/data/database-roles/database-role-update-mutation.ts b/apps/studio/data/database-roles/database-role-update-mutation.tsindex c34483c1e6b..42eb6654323 100644--- a/apps/studio/data/database-roles/database-role-update-mutation.ts+++ b/apps/studio/data/database-roles/database-role-update-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { invalidateRolesQuery } from './database-roles-query'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'type UpdateRoleBody = Parameters<typeof pgMeta.roles.update>[1]diff --git a/apps/studio/data/database-roles/database-roles-query.ts b/apps/studio/data/database-roles/database-roles-query.tsindex eeff0bfa518..5a57a0ecf96 100644--- a/apps/studio/data/database-roles/database-roles-query.ts+++ b/apps/studio/data/database-roles/database-roles-query.ts@@ -3,8 +3,8 @@ import { QueryClient, useQuery } from '@tanstack/react-query'import { z } from 'zod'import { databaseRoleKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseRolesVariables = {projectRef?: string@@ -28,7 +28,7 @@ export async function getDatabaseRoles(}export type DatabaseRolesData = z.infer<typeof pgMetaRolesList.zod>-export type DatabaseRolesError = ExecuteSqlError+export type DatabaseRolesError = ResponseErrorexport const useDatabaseRolesQuery = <TData = DatabaseRolesData>({ projectRef, connectionString }: DatabaseRolesVariables,diff --git a/apps/studio/data/database-triggers/database-trigger-create-mutation.ts b/apps/studio/data/database-triggers/database-trigger-create-mutation.tsindex 57ba0c9ac36..20a4755133f 100644--- a/apps/studio/data/database-triggers/database-trigger-create-mutation.ts+++ b/apps/studio/data/database-triggers/database-trigger-create-mutation.ts@@ -4,7 +4,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databaseTriggerKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseTriggerCreateVariables = {diff --git a/apps/studio/data/database-triggers/database-trigger-delete-mutation.ts b/apps/studio/data/database-triggers/database-trigger-delete-mutation.tsindex 663188a8dc1..eb8bf5a2a43 100644--- a/apps/studio/data/database-triggers/database-trigger-delete-mutation.ts+++ b/apps/studio/data/database-triggers/database-trigger-delete-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databaseTriggerKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseTriggerDeleteVariables = {diff --git a/apps/studio/data/database-triggers/database-trigger-update-mutation.ts b/apps/studio/data/database-triggers/database-trigger-update-mutation.tsindex 236bf7c28f4..f8ddeae32c6 100644--- a/apps/studio/data/database-triggers/database-trigger-update-mutation.ts+++ b/apps/studio/data/database-triggers/database-trigger-update-mutation.ts@@ -4,7 +4,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databaseTriggerKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type DatabaseTriggerUpdateVariables = {diff --git a/apps/studio/data/database-triggers/database-trigger-update-transaction-mutation.ts b/apps/studio/data/database-triggers/database-trigger-update-transaction-mutation.tsindex 7970bfb5c47..9fa44f9cf56 100644--- a/apps/studio/data/database-triggers/database-trigger-update-transaction-mutation.ts+++ b/apps/studio/data/database-triggers/database-trigger-update-transaction-mutation.ts@@ -8,7 +8,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { databaseTriggerKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'// [Joshen] Writing this query within FE as the PATCH endpoint from pg-meta only supports updatingdiff --git a/apps/studio/data/database/constraints-query.ts b/apps/studio/data/database/constraints-query.tsindex ae1b3e9037f..93fd5d520fd 100644--- a/apps/studio/data/database/constraints-query.ts+++ b/apps/studio/data/database/constraints-query.ts@@ -2,8 +2,8 @@ import { getTableConstraintsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { databaseKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'type GetTableConstraintsVariables = {id?: number@@ -30,7 +30,7 @@ export type TableConstraintsVariables = GetTableConstraintsVariables & {}export type TableConstraintsData = Constraint[]-export type TableConstraintsError = ExecuteSqlError+export type TableConstraintsError = ResponseErrorexport async function getTableConstraints({ projectRef, connectionString, id }: TableConstraintsVariables,diff --git a/apps/studio/data/database/database-size-query.ts b/apps/studio/data/database/database-size-query.tsindex 9ea3f4e464b..553db1c2d7a 100644--- a/apps/studio/data/database/database-size-query.ts+++ b/apps/studio/data/database/database-size-query.ts@@ -2,8 +2,8 @@ import { getDatabaseSizeSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { databaseKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseSizeVariables = {projectRef?: string@@ -35,7 +35,7 @@ export async function getDatabaseSize(}export type DatabaseSizeData = Awaited<ReturnType<typeof getDatabaseSize>>-export type DatabaseSizeError = ExecuteSqlError+export type DatabaseSizeError = ResponseErrorexport const useDatabaseSizeQuery = <TData = DatabaseSizeData>({ projectRef, connectionString }: DatabaseSizeVariables,diff --git a/apps/studio/data/database/entity-definitions-query.ts b/apps/studio/data/database/entity-definitions-query.tsindex 01090f76975..a016eaca4ba 100644--- a/apps/studio/data/database/entity-definitions-query.ts+++ b/apps/studio/data/database/entity-definitions-query.ts@@ -2,8 +2,8 @@ import { getEntityDefinitionsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { databaseKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'export type EntityDefinitionsVariables = {limit?: number@@ -32,7 +32,7 @@ export async function getEntityDefinitions(type EntityDefinition = { id: number; sql: string }export type EntityDefinitionsData = EntityDefinition[]-export type EntityDefinitionsError = ExecuteSqlError+export type EntityDefinitionsError = ResponseErrorexport const useEntityDefinitionsQuery = <TData = EntityDefinitionsData>({ projectRef, connectionString, schemas, limit }: EntityDefinitionsVariables,diff --git a/apps/studio/data/database/foreign-key-constraints-query.ts b/apps/studio/data/database/foreign-key-constraints-query.tsindex ab051d21fa7..4f7431b7d9b 100644--- a/apps/studio/data/database/foreign-key-constraints-query.ts+++ b/apps/studio/data/database/foreign-key-constraints-query.ts@@ -4,8 +4,8 @@ import { IS_PLATFORM } from 'common'import { databaseKeys } from './keys'import { useConnectionStringForReadOps } from '@/data/read-replicas/replicas-query'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'type GetForeignKeyConstraintsVariables = {schema?: string@@ -74,7 +74,7 @@ export async function getForeignKeyConstraints(}export type ForeignKeyConstraintsData = Awaited<ReturnType<typeof getForeignKeyConstraints>>-export type ForeignKeyConstraintsError = ExecuteSqlError+export type ForeignKeyConstraintsError = ResponseErrorexport const useForeignKeyConstraintsQuery = <TData = ForeignKeyConstraintsData>({diff --git a/apps/studio/data/database/keywords-query.ts b/apps/studio/data/database/keywords-query.tsindex 56def22cde2..48adabe0056 100644--- a/apps/studio/data/database/keywords-query.ts+++ b/apps/studio/data/database/keywords-query.ts@@ -2,8 +2,8 @@ import { getKeywordsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { databaseKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'export type KeywordsVariables = {projectRef?: string@@ -25,7 +25,7 @@ export async function getKeywords(}export type KeywordsData = Awaited<ReturnType<typeof getKeywords>>-export type KeywordsError = ExecuteSqlError+export type KeywordsError = ResponseErrorexport const useKeywordsQuery = <TData = KeywordsData>({ projectRef, connectionString }: KeywordsVariables,diff --git a/apps/studio/data/database/max-connections-query.ts b/apps/studio/data/database/max-connections-query.tsindex 7877ee0cfda..62771498d49 100644--- a/apps/studio/data/database/max-connections-query.ts+++ b/apps/studio/data/database/max-connections-query.ts@@ -2,8 +2,8 @@ import { getMaxConnectionsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { databaseKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'export type MaxConnectionsVariables = {projectRef?: string@@ -29,7 +29,7 @@ export async function getMaxConnections(}export type MaxConnectionsData = Awaited<ReturnType<typeof getMaxConnections>>-export type MaxConnectionsError = ExecuteSqlError+export type MaxConnectionsError = ResponseErrorexport const useMaxConnectionsQuery = <TData = MaxConnectionsData>({ projectRef, connectionString }: MaxConnectionsVariables,diff --git a/apps/studio/data/database/migrations-query.ts b/apps/studio/data/database/migrations-query.tsindex e5019692a97..172796dbbf4 100644--- a/apps/studio/data/database/migrations-query.ts+++ b/apps/studio/data/database/migrations-query.ts@@ -2,9 +2,9 @@ import { getMigrationsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { databaseKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { PROJECT_STATUS } from '@/lib/constants'-import { UseCustomQueryOptions } from '@/types'+import { ResponseError, UseCustomQueryOptions } from '@/types'export type DatabaseMigration = {version: string@@ -33,7 +33,7 @@ export async function getMigrations(return result as DatabaseMigration[]} catch (error) {if (- (error as ExecuteSqlError).message.includes(+ (error as ResponseError).message.includes('relation "supabase_migrations.schema_migrations" does not exist')) {@@ -45,7 +45,7 @@ export async function getMigrations(}export type MigrationsData = Awaited<ReturnType<typeof getMigrations>>-export type MigrationsError = ExecuteSqlError+export type MigrationsError = ResponseErrorexport const useMigrationsQuery = <TData = MigrationsData>({ projectRef, projectStatus, connectionString }: MigrationsVariables,diff --git a/apps/studio/data/database/retrieve-index-advisor-result-query.ts b/apps/studio/data/database/retrieve-index-advisor-result-query.tsindex f2ed735c293..cf1868c9731 100644--- a/apps/studio/data/database/retrieve-index-advisor-result-query.ts+++ b/apps/studio/data/database/retrieve-index-advisor-result-query.ts@@ -4,7 +4,7 @@ import { z } from 'zod'import { databaseKeys } from './keys'import { filterProtectedSchemaIndexAdvisorResult } from '@/components/interfaces/QueryPerformance/IndexAdvisor/index-advisor.utils'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type GetIndexAdvisorResultVariables = {diff --git a/apps/studio/data/database/retrieve-index-from-select-query.ts b/apps/studio/data/database/retrieve-index-from-select-query.tsindex 419ecd6e323..497fae53ad0 100644--- a/apps/studio/data/database/retrieve-index-from-select-query.ts+++ b/apps/studio/data/database/retrieve-index-from-select-query.ts@@ -2,7 +2,7 @@ import { joinSqlFragments, literal, safeSql } from '@supabase/pg-meta/src/pg-forimport { useQuery } from '@tanstack/react-query'import { databaseKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type GetInvolvedIndexesFromSelectQueryVariables = {diff --git a/apps/studio/data/database/schema-create-mutation.ts b/apps/studio/data/database/schema-create-mutation.tsindex 0b3b15b225c..c94b84ffae5 100644--- a/apps/studio/data/database/schema-create-mutation.ts+++ b/apps/studio/data/database/schema-create-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { invalidateSchemasQuery } from './schemas-query'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type SchemaCreateVariables = {diff --git a/apps/studio/data/database/schemas-query.ts b/apps/studio/data/database/schemas-query.tsindex c93cfe7a767..9cdced293f7 100644--- a/apps/studio/data/database/schemas-query.ts+++ b/apps/studio/data/database/schemas-query.ts@@ -3,8 +3,8 @@ import { QueryClient, useQuery } from '@tanstack/react-query'import { z } from 'zod'import { databaseKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'export type SchemasVariables = {projectRef?: string@@ -16,7 +16,7 @@ export type Schema = z.infer<typeof pgMeta.schemas.zod>const pgMetaSchemasList = pgMeta.schemas.list()export type SchemasData = z.infer<typeof pgMetaSchemasList.zod>-export type SchemasError = ExecuteSqlError+export type SchemasError = ResponseErrorexport async function getSchemas({ projectRef, connectionString }: SchemasVariables,diff --git a/apps/studio/data/database/supamonitor-enabled-query.ts b/apps/studio/data/database/supamonitor-enabled-query.tsindex ed1046325cf..a0021f88550 100644--- a/apps/studio/data/database/supamonitor-enabled-query.ts+++ b/apps/studio/data/database/supamonitor-enabled-query.ts@@ -2,7 +2,7 @@ import { safeSql } from '@supabase/pg-meta/src/pg-format'import { useQuery } from '@tanstack/react-query'import { databaseKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { PROJECT_STATUS } from '@/lib/constants'import type { ResponseError, UseCustomQueryOptions } from '@/types'diff --git a/apps/studio/data/database/table-check-rls-mutation.ts b/apps/studio/data/database/table-check-rls-mutation.tsindex 039c1a9a431..d94efd26a02 100644--- a/apps/studio/data/database/table-check-rls-mutation.ts+++ b/apps/studio/data/database/table-check-rls-mutation.ts@@ -2,7 +2,7 @@ import { getTablesRlsEnabledStatusSQL } from '@supabase/pg-meta'import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from '../sql/execute-sql-query'+import { executeSql } from '../sql/execute-sql-mutation'import { ResponseError, UseCustomMutationOptions } from '@/types'type CheckTableRLSStatusVariables = {diff --git a/apps/studio/data/database/table-columns-query.ts b/apps/studio/data/database/table-columns-query.tsindex 53c262e9ad5..150f33c4fc1 100644--- a/apps/studio/data/database/table-columns-query.ts+++ b/apps/studio/data/database/table-columns-query.ts@@ -2,8 +2,8 @@ import { getTableColumnsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { databaseKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'export type TableColumn = {schemaname: string@@ -35,7 +35,7 @@ export async function getTableColumns(}export type TableColumnsData = Awaited<ReturnType<typeof getTableColumns>>-export type TableColumnsError = ExecuteSqlError+export type TableColumnsError = ResponseErrorexport const useTableColumnsQuery = <TData = TableColumnsData>({ projectRef, connectionString, schema, table }: TableColumnsVariables,diff --git a/apps/studio/data/database/table-definition-query.ts b/apps/studio/data/database/table-definition-query.tsindex e92efb1fa86..69df0767286 100644--- a/apps/studio/data/database/table-definition-query.ts+++ b/apps/studio/data/database/table-definition-query.ts@@ -2,8 +2,8 @@ import { getTableDefinitionSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { databaseKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'type GetTableDefinitionArgs = {id?: number@@ -35,7 +35,7 @@ export async function getTableDefinition(}export type TableDefinitionData = string-export type TableDefinitionError = ExecuteSqlError+export type TableDefinitionError = ResponseErrorexport const useTableDefinitionQuery = <TData = TableDefinitionData>({ projectRef, connectionString, id }: TableDefinitionVariables,diff --git a/apps/studio/data/database/table-index-advisor-query.ts b/apps/studio/data/database/table-index-advisor-query.tsindex 74e0139addf..5260be1e501 100644--- a/apps/studio/data/database/table-index-advisor-query.ts+++ b/apps/studio/data/database/table-index-advisor-query.ts@@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query'import { databaseKeys } from './keys'import { filterProtectedSchemaIndexStatements } from '@/components/interfaces/QueryPerformance/IndexAdvisor/index-advisor.utils'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type TableIndexAdvisorVariables = {diff --git a/apps/studio/data/database/view-definition-query.ts b/apps/studio/data/database/view-definition-query.tsindex 6c23dd235b7..648b3e280bb 100644--- a/apps/studio/data/database/view-definition-query.ts+++ b/apps/studio/data/database/view-definition-query.ts@@ -2,8 +2,8 @@ import { getViewDefinitionSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { databaseKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'type GetViewDefinitionArgs = {id?: number@@ -36,7 +36,7 @@ export async function getViewDefinition(}export type ViewDefinitionData = string-export type ViewDefinitionError = ExecuteSqlError+export type ViewDefinitionError = ResponseErrorexport const useViewDefinitionQuery = <TData = ViewDefinitionData>({ projectRef, connectionString, id, includeCreateStatement }: ViewDefinitionVariables,diff --git a/apps/studio/data/entity-types/entity-types-infinite-query.ts b/apps/studio/data/entity-types/entity-types-infinite-query.tsindex 65e7fd27d83..73653c4459f 100644--- a/apps/studio/data/entity-types/entity-types-infinite-query.ts+++ b/apps/studio/data/entity-types/entity-types-infinite-query.ts@@ -3,18 +3,19 @@ import { InfiniteData, QueryClient, useInfiniteQuery } from '@tanstack/react-queimport { ENTITY_TYPE } from './entity-type-constants'import { entityTypeKeys } from './keys'-import { executeSql, ExecuteSqlVariables } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'export type EntityTypesVariables = {projectRef?: string+ connectionString?: string | nullschemas?: string[]search?: stringlimit?: numberpage?: numbersort?: 'alphabetical' | 'grouped-alphabetical'filterTypes?: string[]-} & Pick<ExecuteSqlVariables, 'connectionString'>+}export interface Entity {id: numberdiff --git a/apps/studio/data/enumerated-types/enumerated-type-create-mutation.ts b/apps/studio/data/enumerated-types/enumerated-type-create-mutation.tsindex d5c4947a45f..299dda664ed 100644--- a/apps/studio/data/enumerated-types/enumerated-type-create-mutation.ts+++ b/apps/studio/data/enumerated-types/enumerated-type-create-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { enumeratedTypesKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type EnumeratedTypeCreateVariables = {diff --git a/apps/studio/data/enumerated-types/enumerated-type-delete-mutation.ts b/apps/studio/data/enumerated-types/enumerated-type-delete-mutation.tsindex 62f5340a6cd..5b6135dbafb 100644--- a/apps/studio/data/enumerated-types/enumerated-type-delete-mutation.ts+++ b/apps/studio/data/enumerated-types/enumerated-type-delete-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { enumeratedTypesKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type EnumeratedTypeDeleteVariables = {diff --git a/apps/studio/data/enumerated-types/enumerated-type-update-mutation.ts b/apps/studio/data/enumerated-types/enumerated-type-update-mutation.tsindex 80e1e474a34..cfb9b61912f 100644--- a/apps/studio/data/enumerated-types/enumerated-type-update-mutation.ts+++ b/apps/studio/data/enumerated-types/enumerated-type-update-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { enumeratedTypesKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type EnumeratedTypeUpdateVariables = {diff --git a/apps/studio/data/fdw/fdw-create-mutation.ts b/apps/studio/data/fdw/fdw-create-mutation.tsindex 9faaad7efb8..d299245a0fc 100644--- a/apps/studio/data/fdw/fdw-create-mutation.ts+++ b/apps/studio/data/fdw/fdw-create-mutation.ts@@ -7,7 +7,7 @@ import { fdwKeys } from './keys'import { WrapperMeta } from '@/components/interfaces/Integrations/Wrappers/Wrappers.types'import { entityTypeKeys } from '@/data/entity-types/keys'import { foreignTableKeys } from '@/data/foreign-tables/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { vaultSecretsKeys } from '@/data/vault/keys'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/data/fdw/fdw-delete-mutation.ts b/apps/studio/data/fdw/fdw-delete-mutation.tsindex 72609ac021f..556f84ea615 100644--- a/apps/studio/data/fdw/fdw-delete-mutation.ts+++ b/apps/studio/data/fdw/fdw-delete-mutation.ts@@ -7,7 +7,7 @@ import { fdwKeys } from './keys'import type { WrapperMeta } from '@/components/interfaces/Integrations/Wrappers/Wrappers.types'import { entityTypeKeys } from '@/data/entity-types/keys'import { foreignTableKeys } from '@/data/foreign-tables/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { vaultSecretsKeys } from '@/data/vault/keys'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/data/fdw/fdw-drop-foreign-table-mutation.ts b/apps/studio/data/fdw/fdw-drop-foreign-table-mutation.tsindex f3832fa9cd4..b1f776d7a7c 100644--- a/apps/studio/data/fdw/fdw-drop-foreign-table-mutation.ts+++ b/apps/studio/data/fdw/fdw-drop-foreign-table-mutation.ts@@ -6,7 +6,7 @@ import { toast } from 'sonner'import { fdwKeys } from './keys'import { entityTypeKeys } from '@/data/entity-types/keys'import { foreignTableKeys } from '@/data/foreign-tables/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type FDWDropForeignTableVariables = {diff --git a/apps/studio/data/fdw/fdw-import-foreign-schema-mutation.ts b/apps/studio/data/fdw/fdw-import-foreign-schema-mutation.tsindex 9fdf0e4581a..f346797d4d3 100644--- a/apps/studio/data/fdw/fdw-import-foreign-schema-mutation.ts+++ b/apps/studio/data/fdw/fdw-import-foreign-schema-mutation.ts@@ -6,7 +6,7 @@ import { toast } from 'sonner'import { fdwKeys } from './keys'import { entityTypeKeys } from '@/data/entity-types/keys'import { foreignTableKeys } from '@/data/foreign-tables/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { vaultSecretsKeys } from '@/data/vault/keys'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/data/fdw/fdw-update-mutation.ts b/apps/studio/data/fdw/fdw-update-mutation.tsindex 86588b0f396..702a47466a3 100644--- a/apps/studio/data/fdw/fdw-update-mutation.ts+++ b/apps/studio/data/fdw/fdw-update-mutation.ts@@ -8,7 +8,7 @@ import { fdwKeys } from './keys'import type { WrapperMeta } from '@/components/interfaces/Integrations/Wrappers/Wrappers.types'import { entityTypeKeys } from '@/data/entity-types/keys'import { foreignTableKeys } from '@/data/foreign-tables/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { vaultSecretsKeys } from '@/data/vault/keys'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/data/fdw/fdws-query.ts b/apps/studio/data/fdw/fdws-query.tsindex 4fd04b8b999..66005773fb8 100644--- a/apps/studio/data/fdw/fdws-query.ts+++ b/apps/studio/data/fdw/fdws-query.ts@@ -2,8 +2,8 @@ import { getFDWsSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { fdwKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'export type FDWColumn = {name: string@@ -47,7 +47,7 @@ export async function getFDWs(}export type FDWsData = Awaited<ReturnType<typeof getFDWs>>-export type FDWsError = ExecuteSqlError+export type FDWsError = ResponseErrorexport const useFDWsQuery = <TData = FDWsData>({ projectRef, connectionString }: FDWsVariables,diff --git a/apps/studio/data/foreign-tables/foreign-tables-query.ts b/apps/studio/data/foreign-tables/foreign-tables-query.tsindex c5c67439792..0a3d1e91899 100644--- a/apps/studio/data/foreign-tables/foreign-tables-query.ts+++ b/apps/studio/data/foreign-tables/foreign-tables-query.ts@@ -3,7 +3,7 @@ import type { PGForeignTable } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { foreignTableKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomQueryOptions } from '@/types'export type ForeignTablesVariables = {diff --git a/apps/studio/data/logs/unified-logs-chart-query.ts b/apps/studio/data/logs/unified-logs-chart-query.tsindex 82c5ae7db92..6a9315153d1 100644--- a/apps/studio/data/logs/unified-logs-chart-query.ts+++ b/apps/studio/data/logs/unified-logs-chart-query.ts@@ -8,8 +8,7 @@ import { UNIFIED_LOGS_QUERY_OPTIONS, UnifiedLogsVariables } from './unified-logsimport { parseLogsFilterUrlParams } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.filters'import { getLogsChartQuery } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries'import { getLogsChartQuery as getLogsChartQueryBq } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries.bq'-import { ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { ResponseError, UseCustomQueryOptions } from '@/types'export async function getUnifiedLogsChart({ projectRef, search, useOtel = false }: UnifiedLogsVariables & { useOtel?: boolean },@@ -155,7 +154,7 @@ export async function getUnifiedLogsChart(}export type UnifiedLogsChartData = Awaited<ReturnType<typeof getUnifiedLogsChart>>-export type UnifiedLogsChartError = ExecuteSqlError+export type UnifiedLogsChartError = ResponseErrorexport const useUnifiedLogsChartQuery = <TData = UnifiedLogsChartData>({ projectRef, search }: UnifiedLogsVariables,diff --git a/apps/studio/data/logs/unified-logs-count-query.ts b/apps/studio/data/logs/unified-logs-count-query.tsindex e98dc98617f..7fc3f0014ae 100644--- a/apps/studio/data/logs/unified-logs-count-query.ts+++ b/apps/studio/data/logs/unified-logs-count-query.ts@@ -12,8 +12,7 @@ import {import { getLogsCountQuery } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries'import { getLogsCountQuery as getLogsCountQueryBq } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries.bq'import { FacetMetadataSchema } from '@/components/interfaces/UnifiedLogs/UnifiedLogs.schema'-import { ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { ResponseError, UseCustomQueryOptions } from '@/types'export async function getUnifiedLogsCount({ projectRef, search, useOtel = false }: UnifiedLogsVariables & { useOtel?: boolean },@@ -80,7 +79,7 @@ export async function getUnifiedLogsCount(}export type UnifiedLogsCountData = Awaited<ReturnType<typeof getUnifiedLogsCount>>-export type UnifiedLogsCountError = ExecuteSqlError+export type UnifiedLogsCountError = ResponseErrorexport const useUnifiedLogsCountQuery = <TData = UnifiedLogsCountData>({ projectRef, search }: UnifiedLogsVariables,diff --git a/apps/studio/data/logs/unified-logs-facet-count-query.ts b/apps/studio/data/logs/unified-logs-facet-count-query.tsindex 980f5cd2874..ef26390917e 100644--- a/apps/studio/data/logs/unified-logs-facet-count-query.ts+++ b/apps/studio/data/logs/unified-logs-facet-count-query.ts@@ -16,8 +16,7 @@ import {getUnifiedLogsCTE,} from '@/components/interfaces/UnifiedLogs/UnifiedLogs.queries.bq'import { Option } from '@/components/ui/DataTable/DataTable.types'-import { ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { ResponseError, UseCustomQueryOptions } from '@/types'type UnifiedLogsFacetCountVariables = UnifiedLogsVariables & {facet: string@@ -57,7 +56,7 @@ SELECT dimension, value, count from ${cteName};}export type UnifiedLogsFacetCountData = Awaited<ReturnType<typeof getUnifiedLogsFacetCount>>-export type UnifiedLogsFacetCountError = ExecuteSqlError+export type UnifiedLogsFacetCountError = ResponseErrorexport const useUnifiedLogsFacetCountQuery = <TData = UnifiedLogsFacetCountData>({ projectRef, search, facet, facetSearch }: UnifiedLogsFacetCountVariables,diff --git a/apps/studio/data/materialized-views/materialized-view-delete-mutation.ts b/apps/studio/data/materialized-views/materialized-view-delete-mutation.tsindex ec53bc28314..de7dae828c0 100644--- a/apps/studio/data/materialized-views/materialized-view-delete-mutation.ts+++ b/apps/studio/data/materialized-views/materialized-view-delete-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { materializedViewKeys } from './keys'import { entityTypeKeys } from '@/data/entity-types/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { tableEditorKeys } from '@/data/table-editor/keys'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/data/pg-graphql/schema-comment-query.ts b/apps/studio/data/pg-graphql/schema-comment-query.tsindex be411fd4494..00386a7e649 100644--- a/apps/studio/data/pg-graphql/schema-comment-query.ts+++ b/apps/studio/data/pg-graphql/schema-comment-query.ts@@ -2,7 +2,7 @@ import { literal, safeSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { pgGraphqlKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { PROJECT_STATUS } from '@/lib/constants'import type { UseCustomQueryOptions } from '@/types'diff --git a/apps/studio/data/privileges/column-privileges-grant-mutation.ts b/apps/studio/data/privileges/column-privileges-grant-mutation.tsindex 3935b54a45e..d5940235a3c 100644--- a/apps/studio/data/privileges/column-privileges-grant-mutation.ts+++ b/apps/studio/data/privileges/column-privileges-grant-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { privilegeKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ColumnPrivilegesGrant = {diff --git a/apps/studio/data/privileges/column-privileges-query.ts b/apps/studio/data/privileges/column-privileges-query.tsindex 42c71cdc073..c5ef827d744 100644--- a/apps/studio/data/privileges/column-privileges-query.ts+++ b/apps/studio/data/privileges/column-privileges-query.ts@@ -2,7 +2,7 @@ import pgMeta from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { z } from 'zod'-import { executeSql } from '../sql/execute-sql-query'+import { executeSql } from '../sql/execute-sql-mutation'import { privilegeKeys } from './keys'import type { components } from '@/data/api'import type { ResponseError, UseCustomQueryOptions } from '@/types'diff --git a/apps/studio/data/privileges/column-privileges-revoke-mutation.ts b/apps/studio/data/privileges/column-privileges-revoke-mutation.tsindex 325e493bdbe..b742a8043b0 100644--- a/apps/studio/data/privileges/column-privileges-revoke-mutation.ts+++ b/apps/studio/data/privileges/column-privileges-revoke-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { privilegeKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type ColumnPrivilegesRevoke = {diff --git a/apps/studio/data/privileges/default-privileges-query.ts b/apps/studio/data/privileges/default-privileges-query.tsindex ef97028a392..ba12ed31518 100644--- a/apps/studio/data/privileges/default-privileges-query.ts+++ b/apps/studio/data/privileges/default-privileges-query.ts@@ -2,7 +2,7 @@ import { getDefaultPrivilegesStateSql } from '@supabase/pg-meta'import { queryOptions } from '@tanstack/react-query'import { privilegeKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError } from '@/types'export type DefaultPrivilegesVariables = {diff --git a/apps/studio/data/privileges/exposed-function-counts-query.ts b/apps/studio/data/privileges/exposed-function-counts-query.tsindex 4798a046c18..e4ea41b0760 100644--- a/apps/studio/data/privileges/exposed-function-counts-query.ts+++ b/apps/studio/data/privileges/exposed-function-counts-query.ts@@ -2,7 +2,7 @@ import { getExposedFunctionCountsSql } from '@supabase/pg-meta'import { queryOptions } from '@tanstack/react-query'import { privilegeKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { INTERNAL_SCHEMAS } from '@/hooks/useProtectedSchemas'import type { ResponseError } from '@/types'diff --git a/apps/studio/data/privileges/exposed-functions-infinite-query.ts b/apps/studio/data/privileges/exposed-functions-infinite-query.tsindex eba84d07ba8..6dc8d246480 100644--- a/apps/studio/data/privileges/exposed-functions-infinite-query.ts+++ b/apps/studio/data/privileges/exposed-functions-infinite-query.ts@@ -2,7 +2,7 @@ import { getExposedFunctionsSql } from '@supabase/pg-meta'import { infiniteQueryOptions } from '@tanstack/react-query'import { privilegeKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { INTERNAL_SCHEMAS } from '@/hooks/useProtectedSchemas'import type { ResponseError } from '@/types'diff --git a/apps/studio/data/privileges/exposed-table-counts-query.ts b/apps/studio/data/privileges/exposed-table-counts-query.tsindex 721f25aee8e..a00a763520a 100644--- a/apps/studio/data/privileges/exposed-table-counts-query.ts+++ b/apps/studio/data/privileges/exposed-table-counts-query.ts@@ -2,7 +2,7 @@ import { getExposedTableCountsSql } from '@supabase/pg-meta'import { queryOptions } from '@tanstack/react-query'import { privilegeKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { INTERNAL_SCHEMAS } from '@/hooks/useProtectedSchemas'import type { ResponseError } from '@/types'diff --git a/apps/studio/data/privileges/exposed-tables-infinite-query.ts b/apps/studio/data/privileges/exposed-tables-infinite-query.tsindex 407fbce4a78..69459751c1e 100644--- a/apps/studio/data/privileges/exposed-tables-infinite-query.ts+++ b/apps/studio/data/privileges/exposed-tables-infinite-query.ts@@ -2,7 +2,7 @@ import { getExposedTablesSql } from '@supabase/pg-meta'import { infiniteQueryOptions } from '@tanstack/react-query'import { privilegeKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { INTERNAL_SCHEMAS } from '@/hooks/useProtectedSchemas'import type { ResponseError } from '@/types'diff --git a/apps/studio/data/privileges/table-api-access-mutation.ts b/apps/studio/data/privileges/table-api-access-mutation.tsindex 4bec9cc2f45..e5ee29fe301 100644--- a/apps/studio/data/privileges/table-api-access-mutation.ts+++ b/apps/studio/data/privileges/table-api-access-mutation.ts@@ -6,7 +6,7 @@ import { toast } from 'sonner'import { invalidateTablePrivilegesQuery } from './table-privileges-query'import type { ConnectionVars } from '@/data/common.types'import { lintKeys } from '@/data/lint/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import {API_ACCESS_ROLES,API_PRIVILEGE_TYPES,diff --git a/apps/studio/data/privileges/table-privileges-grant-mutation.ts b/apps/studio/data/privileges/table-privileges-grant-mutation.tsindex 6724d49f3ea..d6e56e570fc 100644--- a/apps/studio/data/privileges/table-privileges-grant-mutation.ts+++ b/apps/studio/data/privileges/table-privileges-grant-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { privilegeKeys } from './keys'import { invalidateTablePrivilegesQuery } from './table-privileges-query'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type TablePrivilegesGrant = Parameters<diff --git a/apps/studio/data/privileges/table-privileges-query.ts b/apps/studio/data/privileges/table-privileges-query.tsindex e331a30668d..4c9c6bf7f14 100644--- a/apps/studio/data/privileges/table-privileges-query.ts+++ b/apps/studio/data/privileges/table-privileges-query.ts@@ -3,8 +3,8 @@ import { QueryClient, useQuery } from '@tanstack/react-query'import { z } from 'zod'import { privilegeKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'export type TablePrivilegesVariables = {projectRef?: string@@ -16,7 +16,7 @@ export type PgTablePrivileges = z.infer<typeof pgMeta.tablePrivileges.zod>const pgMetaTablePrivilegesList = pgMeta.tablePrivileges.list()export type TablePrivilegesData = z.infer<typeof pgMetaTablePrivilegesList.zod>-export type TablePrivilegesError = ExecuteSqlError+export type TablePrivilegesError = ResponseErrorasync function getTablePrivileges({ projectRef, connectionString, includedSchemas }: TablePrivilegesVariables,diff --git a/apps/studio/data/privileges/table-privileges-revoke-mutation.ts b/apps/studio/data/privileges/table-privileges-revoke-mutation.tsindex 127eda11859..3c500155189 100644--- a/apps/studio/data/privileges/table-privileges-revoke-mutation.ts+++ b/apps/studio/data/privileges/table-privileges-revoke-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { privilegeKeys } from './keys'import { invalidateTablePrivilegesQuery } from './table-privileges-query'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type TablePrivilegesRevoke = Parameters<diff --git a/apps/studio/data/privileges/update-default-privileges-mutation.ts b/apps/studio/data/privileges/update-default-privileges-mutation.tsindex 585f514fafa..b9b8d352128 100644--- a/apps/studio/data/privileges/update-default-privileges-mutation.ts+++ b/apps/studio/data/privileges/update-default-privileges-mutation.ts@@ -3,7 +3,7 @@ import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'import type { ConnectionVars } from '@/data/common.types'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { UseCustomMutationOptions } from '@/types'export type UpdateDefaultPrivilegesVariables = ConnectionVars & {diff --git a/apps/studio/data/privileges/update-exposed-entities-mutation.ts b/apps/studio/data/privileges/update-exposed-entities-mutation.tsindex 7e12a31bcd5..cb4f2ecbc9c 100644--- a/apps/studio/data/privileges/update-exposed-entities-mutation.ts+++ b/apps/studio/data/privileges/update-exposed-entities-mutation.ts@@ -4,7 +4,7 @@ import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'import type { ConnectionVars } from '@/data/common.types'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { UseCustomMutationOptions } from '@/types'export type UpdateExposedEntitiesVariables = ConnectionVars & {diff --git a/apps/studio/data/read-replicas/replica-lag-query.ts b/apps/studio/data/read-replicas/replica-lag-query.tsindex c4a7460ad14..bd5fc4a5996 100644--- a/apps/studio/data/read-replicas/replica-lag-query.ts+++ b/apps/studio/data/read-replicas/replica-lag-query.ts@@ -2,8 +2,8 @@ import { replicationLagSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { replicaKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'export type ReplicationLagVariables = {id: string@@ -26,7 +26,7 @@ export async function getReplicationLag(}export type ReplicationLagData = Awaited<ReturnType<typeof getReplicationLag>>-export type ReplicationLagError = ExecuteSqlError+export type ReplicationLagError = ResponseErrorexport const useReplicationLagQuery = <TData = ReplicationLagData>({ projectRef, connectionString, id }: ReplicationLagVariables,diff --git a/apps/studio/data/replication/publication-create-mutation.ts b/apps/studio/data/replication/publication-create-mutation.tsindex 3601ebc4d74..2b0dbbe96a2 100644--- a/apps/studio/data/replication/publication-create-mutation.ts+++ b/apps/studio/data/replication/publication-create-mutation.ts@@ -2,7 +2,7 @@ import { getCreatePublicationSQL } from '@supabase/pg-meta'import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from '../sql/execute-sql-query'+import { executeSql } from '../sql/execute-sql-mutation'import { replicationKeys } from './keys'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/data/rls-tester/get-schema-ddl.ts b/apps/studio/data/rls-tester/get-schema-ddl.tsindex cca3556bbc0..815d1d51ab4 100644--- a/apps/studio/data/rls-tester/get-schema-ddl.ts+++ b/apps/studio/data/rls-tester/get-schema-ddl.ts@@ -7,7 +7,7 @@ import pgMeta, {} from '@supabase/pg-meta'import { z } from 'zod'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { INTERNAL_SCHEMAS } from '@/hooks/useProtectedSchemas'export interface RlsTableStatus {diff --git a/apps/studio/data/rls-tester/get-seed-data.ts b/apps/studio/data/rls-tester/get-seed-data.tsindex 1d13f852b73..1d4dd3318df 100644--- a/apps/studio/data/rls-tester/get-seed-data.ts+++ b/apps/studio/data/rls-tester/get-seed-data.ts@@ -1,7 +1,7 @@import { ident, joinSqlFragments, literal, safeSql } from '@supabase/pg-meta'import { RlsTableStatus } from './get-schema-ddl'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'export interface TableSeedData {schema: stringdiff --git a/apps/studio/data/sql/abort-query-mutation.ts b/apps/studio/data/sql/abort-query-mutation.tsindex 5d517fff2b5..3a1c3775812 100644--- a/apps/studio/data/sql/abort-query-mutation.ts+++ b/apps/studio/data/sql/abort-query-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { sqlKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type QueryAbortVariables = {diff --git a/apps/studio/data/sql/execute-sql-mutation.ts b/apps/studio/data/sql/execute-sql-mutation.tsindex 7186ce6085d..3718fac1f59 100644--- a/apps/studio/data/sql/execute-sql-mutation.ts+++ b/apps/studio/data/sql/execute-sql-mutation.ts@@ -1,16 +1,36 @@-import { useMutation, useQueryClient } from '@tanstack/react-query'+import {+ ROLE_IMPERSONATION_NO_RESULTS,+ ROLE_IMPERSONATION_SQL_LINE_COUNT,+ type SafeSqlFragment,+} from '@supabase/pg-meta'+import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'+import { useMutation, useQueryClient, type QueryKey } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql, ExecuteSqlData, ExecuteSqlVariables } from './execute-sql-query'+import {+ calculateSummary,+ createNodeTree,+} from '@/components/interfaces/ExplainVisualizer/ExplainVisualizer.parser'+import { handleError as handleErrorFetchers, post } from '@/data/fetchers'+import { MB } from '@/lib/constants'import { sqlEventParser } from '@/lib/sql-event-parser'import { useTrack } from '@/lib/telemetry/track'-import { UseCustomMutationOptions } from '@/types'+import { ResponseError, UseCustomMutationOptions } from '@/types'// [Joshen] Intention is that we invalidate all database related keys whenever running a mutation related query// So we attempt to ignore all the non-related query keys. We could probably look into grouping our query keys better// actually to not make this too hacky hereconst INVALIDATION_KEYS_IGNORE = ['branches', 'settings-v2', 'addons', 'custom-domains', 'content']+/**+ * [Joshen] Done a bit of stress testing and experimentation, tho we should still observe and tweak where necessary+ * From what I understand a query cost of 100,000 is considered to be "heavy", and 1M is "potentially dangerous"+ * Reckon we ensure that the dashboard just caps query costs at "heavy", so that it doesn't impact the DB for other queries+ * (e.g from the user's application)+ */+const COST_THRESHOLD = 200_000+export const COST_THRESHOLD_ERROR = 'Query cost exceeds threshold'+export type QueryResponseError = {code: stringmessage: string@@ -24,11 +44,182 @@ export type QueryResponseError = {severity: string}+type ExecuteSqlVariables = {+ projectRef?: string+ connectionString?: string | null+ sql: SafeSqlFragment+ queryKey?: QueryKey+ handleError?: (error: ResponseError) => { result: any }+ isRoleImpersonationEnabled?: boolean+ /**+ * Disables transaction mode - should be used only for manual queries ran via the SQL Editor+ * */+ isStatementTimeoutDisabled?: boolean+ /**+ * Runs an EXPLAIN before actually running the query, rejects the query if cost exceeds a threshold.+ * Intended to be used for interfaces that heavily rely on queries on the DB+ * */+ preflightCheck?: boolean+}+type ExecuteSqlMutationVariables = ExecuteSqlVariables & {autoLimit?: numbercontextualInvalidation?: boolean}+/**+ * Executes a SQL query against the user's instance.+ *+ * @throws {Error}+ */+export async function executeSql<T = any>(+ {+ projectRef,+ connectionString,+ sql,+ queryKey,+ handleError,+ isRoleImpersonationEnabled = false,+ isStatementTimeoutDisabled = false,+ preflightCheck = false,+ }: ExecuteSqlVariables,+ signal?: AbortSignal,+ headersInit?: HeadersInit,+ fetcherOverride?: (options: {+ query: string+ headers?: HeadersInit+ }) => Promise<{ data: T } | { error: ResponseError }>+): Promise<{ result: T }> {+ if (!projectRef) throw new Error('projectRef is required')++ const sqlSize = new Blob([sql]).size+ // [Joshen] I think the limit is around 1MB from testing, but its not exactly 1MB it seems+ if (sqlSize > 0.98 * MB) {+ throw new Error('Query is too large to be run via the SQL Editor')+ }++ let headers = new Headers(headersInit)+ if (connectionString) headers.set('x-connection-encrypted', connectionString)++ let data+ let error++ if (fetcherOverride) {+ const result = await fetcherOverride({ query: sql, headers })+ if ('data' in result) {+ data = result.data+ } else {+ error = result.error+ }+ } else {+ const options = {+ signal,+ headers,+ params: {+ path: { ref: projectRef },+ header: {+ 'x-connection-encrypted': connectionString ?? '',+ 'x-pg-application-name': isStatementTimeoutDisabled+ ? 'supabase/dashboard-query-editor'+ : DEFAULT_PLATFORM_APPLICATION_NAME,+ },+ },+ }++ if (preflightCheck) {+ /**+ * [Joshen] Note that I've intentionally omitted error handling here as I'm opting+ * to NOT block the UI if the preflight check fails for any reason.+ */++ const { data: costCheck } = await post('/platform/pg-meta/{ref}/query', {+ ...options,+ body: {+ query: `explain ${sql}`,+ disable_statement_timeout: isStatementTimeoutDisabled,+ },+ params: {+ ...options.params,+ // @ts-expect-error: This is just a client side thing to identify queries better+ query: { key: 'preflight-check' },+ },+ })+ const parsedTree = !!costCheck ? createNodeTree(costCheck) : undefined+ const summary = !!parsedTree ? calculateSummary(parsedTree) : undefined+ const cost = summary?.totalCost ?? 0++ if (cost >= COST_THRESHOLD) {+ return handleErrorFetchers({+ message: COST_THRESHOLD_ERROR,+ code: cost,+ metadata: { cost, sql },+ })+ }+ }++ const key =+ queryKey?.filter((seg) => typeof seg === 'string' || typeof seg === 'number').join('-') ?? ''+ const result = await post('/platform/pg-meta/{ref}/query', {+ ...options,+ body: { query: sql, disable_statement_timeout: isStatementTimeoutDisabled },+ params: {+ ...options.params,+ // @ts-expect-error: This is just a client side thing to identify queries better+ query: { key },+ },+ })++ data = result.data+ error = result.error+ }++ if (error) {+ if (+ isRoleImpersonationEnabled &&+ typeof error === 'object' &&+ error !== null &&+ 'error' in error &&+ 'formattedError' in error+ ) {+ let updatedError = error as { error: string; formattedError: string }++ const regex = /LINE (\d+):/im+ const [, lineNumberStr] = regex.exec(updatedError.error) ?? []+ const lineNumber = Number(lineNumberStr)+ if (!isNaN(lineNumber)) {+ updatedError = {+ ...updatedError,+ error: updatedError.error.replace(+ regex,+ `LINE ${lineNumber - ROLE_IMPERSONATION_SQL_LINE_COUNT}:`+ ),+ formattedError: updatedError.formattedError.replace(+ regex,+ `LINE ${lineNumber - ROLE_IMPERSONATION_SQL_LINE_COUNT}:`+ ),+ }+ }++ error = updatedError as any+ }++ if (handleError !== undefined) return handleError(error as any)+ else handleErrorFetchers(error)+ }++ if (+ isRoleImpersonationEnabled &&+ Array.isArray(data) &&+ data?.[0]?.[ROLE_IMPERSONATION_NO_RESULTS] === 1+ ) {+ return { result: [] as T }+ }++ return { result: data as T }+}++type ExecuteSqlData = Awaited<ReturnType<typeof executeSql<any[]>>>+export const useExecuteSqlMutation = ({onSuccess,onError,diff --git a/apps/studio/data/sql/execute-sql-query.ts b/apps/studio/data/sql/execute-sql-query.tsdeleted file mode 100644index ebb91391401..00000000000--- a/apps/studio/data/sql/execute-sql-query.ts+++ /dev/null@@ -1,228 +0,0 @@-import {- ROLE_IMPERSONATION_NO_RESULTS,- ROLE_IMPERSONATION_SQL_LINE_COUNT,- SafeSqlFragment,-} from '@supabase/pg-meta'-import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constants'-import { QueryKey, useQuery } from '@tanstack/react-query'--import { sqlKeys } from './keys'-import {- calculateSummary,- createNodeTree,-} from '@/components/interfaces/ExplainVisualizer/ExplainVisualizer.parser'-import { handleError as handleErrorFetchers, post } from '@/data/fetchers'-import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'-import { MB, PROJECT_STATUS } from '@/lib/constants'-import type { ResponseError, UseCustomQueryOptions } from '@/types'--/**- * [Joshen] Done a bit of stress testing and experimentation, tho we should still observe and tweak where necessary- * From what I understand a query cost of 100,000 is considered to be "heavy", and 1M is "potentially dangerous"- * Reckon we ensure that the dashboard just caps query costs at "heavy", so that it doesn't impact the DB for other queries- * (e.g from the user's application)- */-const COST_THRESHOLD = 200_000-export const COST_THRESHOLD_ERROR = 'Query cost exceeds threshold'--export type ExecuteSqlVariables = {- projectRef?: string- connectionString?: string | null- sql: SafeSqlFragment- queryKey?: QueryKey- handleError?: (error: ResponseError) => { result: any }- isRoleImpersonationEnabled?: boolean- /**- * Disables transaction mode - should be used only for manual queries ran via the SQL Editor- * */- isStatementTimeoutDisabled?: boolean- /**- * Runs an EXPLAIN before actually running the query, rejects the query if cost exceeds a threshold.- * Intended to be used for interfaces that heavily rely on queries on the DB- * */- preflightCheck?: boolean-}--/**- * Executes a SQL query against the user's instance.- *- * @throws {Error}- */-export async function executeSql<T = any>(- {- projectRef,- connectionString,- sql,- queryKey,- handleError,- isRoleImpersonationEnabled = false,- isStatementTimeoutDisabled = false,- preflightCheck = false,- }: ExecuteSqlVariables,- signal?: AbortSignal,- headersInit?: HeadersInit,- fetcherOverride?: (options: {- query: string- headers?: HeadersInit- }) => Promise<{ data: T } | { error: ResponseError }>-): Promise<{ result: T }> {- if (!projectRef) throw new Error('projectRef is required')-- const sqlSize = new Blob([sql]).size- // [Joshen] I think the limit is around 1MB from testing, but its not exactly 1MB it seems- if (sqlSize > 0.98 * MB) {- throw new Error('Query is too large to be run via the SQL Editor')- }-- let headers = new Headers(headersInit)- if (connectionString) headers.set('x-connection-encrypted', connectionString)-- let data- let error-- if (fetcherOverride) {- const result = await fetcherOverride({ query: sql, headers })- if ('data' in result) {- data = result.data- } else {- error = result.error- }- } else {- const options = {- signal,- headers,- params: {- path: { ref: projectRef },- header: {- 'x-connection-encrypted': connectionString ?? '',- 'x-pg-application-name': isStatementTimeoutDisabled- ? 'supabase/dashboard-query-editor'- : DEFAULT_PLATFORM_APPLICATION_NAME,- },- },- }-- if (preflightCheck) {- /**- * [Joshen] Note that I've intentionally omitted error handling here as I'm opting- * to NOT block the UI if the preflight check fails for any reason.- */-- const { data: costCheck } = await post('/platform/pg-meta/{ref}/query', {- ...options,- body: {- query: `explain ${sql}`,- disable_statement_timeout: isStatementTimeoutDisabled,- },- params: {- ...options.params,- // @ts-expect-error: This is just a client side thing to identify queries better- query: { key: 'preflight-check' },- },- })- const parsedTree = !!costCheck ? createNodeTree(costCheck) : undefined- const summary = !!parsedTree ? calculateSummary(parsedTree) : undefined- const cost = summary?.totalCost ?? 0-- if (cost >= COST_THRESHOLD) {- return handleErrorFetchers({- message: COST_THRESHOLD_ERROR,- code: cost,- metadata: { cost, sql },- })- }- }-- const key =- queryKey?.filter((seg) => typeof seg === 'string' || typeof seg === 'number').join('-') ?? ''- const result = await post('/platform/pg-meta/{ref}/query', {- ...options,- body: { query: sql, disable_statement_timeout: isStatementTimeoutDisabled },- params: {- ...options.params,- // @ts-expect-error: This is just a client side thing to identify queries better- query: { key },- },- })-- data = result.data- error = result.error- }-- if (error) {- if (- isRoleImpersonationEnabled &&- typeof error === 'object' &&- error !== null &&- 'error' in error &&- 'formattedError' in error- ) {- let updatedError = error as { error: string; formattedError: string }-- const regex = /LINE (\d+):/im- const [, lineNumberStr] = regex.exec(updatedError.error) ?? []- const lineNumber = Number(lineNumberStr)- if (!isNaN(lineNumber)) {- updatedError = {- ...updatedError,- error: updatedError.error.replace(- regex,- `LINE ${lineNumber - ROLE_IMPERSONATION_SQL_LINE_COUNT}:`- ),- formattedError: updatedError.formattedError.replace(- regex,- `LINE ${lineNumber - ROLE_IMPERSONATION_SQL_LINE_COUNT}:`- ),- }- }-- error = updatedError as any- }-- if (handleError !== undefined) return handleError(error as any)- else handleErrorFetchers(error)- }-- if (- isRoleImpersonationEnabled &&- Array.isArray(data) &&- data?.[0]?.[ROLE_IMPERSONATION_NO_RESULTS] === 1- ) {- return { result: [] as T }- }-- return { result: data as T }-}--export type ExecuteSqlData = Awaited<ReturnType<typeof executeSql<any[]>>>-export type ExecuteSqlError = ResponseError--/**- * @deprecated Use the regular useQuery with a function that calls executeSql() instead- */-export const useExecuteSqlQuery = <TData = ExecuteSqlData>(- {- projectRef,- connectionString,- sql,- queryKey,- handleError,- isRoleImpersonationEnabled,- }: ExecuteSqlVariables,- { enabled = true, ...options }: UseCustomQueryOptions<ExecuteSqlData, ExecuteSqlError, TData> = {}-) => {- const { data: project } = useSelectedProjectQuery()- const isActive = project?.status === PROJECT_STATUS.ACTIVE_HEALTHY-- return useQuery<ExecuteSqlData, ExecuteSqlError, TData>({- queryKey: sqlKeys.query(projectRef, queryKey ?? [btoa(sql)]),- queryFn: ({ signal }) =>- executeSql(- { projectRef, connectionString, sql, queryKey, handleError, isRoleImpersonationEnabled },- signal- ),- enabled: enabled && typeof projectRef !== 'undefined' && isActive,- staleTime: 0,- ...options,- })-}diff --git a/apps/studio/data/sql/ongoing-queries-query.ts b/apps/studio/data/sql/ongoing-queries-query.tsindex 377a06240e8..3205b494a9f 100644--- a/apps/studio/data/sql/ongoing-queries-query.ts+++ b/apps/studio/data/sql/ongoing-queries-query.ts@@ -2,8 +2,8 @@ import { getOngoingQueriesSql } from '@supabase/pg-meta'import { useQuery } from '@tanstack/react-query'import { sqlKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'type OngoingQuery = {pid: number@@ -31,7 +31,7 @@ export async function getOngoingQueries(}export type OngoingQueriesData = Awaited<ReturnType<typeof getOngoingQueries>>-export type OngoingQueriesError = ExecuteSqlError+export type OngoingQueriesError = ResponseErrorexport const useOngoingQueriesQuery = <TData = OngoingQueriesData>({ projectRef, connectionString }: OngoingQueriesVariables,diff --git a/apps/studio/data/storage/bucket-prefix-delete-mutation.ts b/apps/studio/data/storage/bucket-prefix-delete-mutation.tsindex 3f0f0c6de5a..69c2d003003 100644--- a/apps/studio/data/storage/bucket-prefix-delete-mutation.ts+++ b/apps/studio/data/storage/bucket-prefix-delete-mutation.ts@@ -1,6 +1,6 @@import { getDeleteBucketPrefixSQL } from '@supabase/pg-meta'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'/*** [Joshen] JFYI this is solely being used in storage-explorer.tsx and hence doesn't have a useMutation hookdiff --git a/apps/studio/data/storage/buckets-max-size-limit-query.ts b/apps/studio/data/storage/buckets-max-size-limit-query.tsindex 714a4f831ab..7b5d6d62dc0 100644--- a/apps/studio/data/storage/buckets-max-size-limit-query.ts+++ b/apps/studio/data/storage/buckets-max-size-limit-query.ts@@ -4,7 +4,7 @@ import { useCallback } from 'react'import type { ConnectionVars } from '@/data/common.types'import { getLiveTupleEstimateKey } from '@/data/database/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { sqlKeys } from '@/data/sql/keys'export const THRESHOLD_FOR_AUTO_QUERYING_BUCKET_LIMITS = 10_000diff --git a/apps/studio/data/storage/public-buckets-with-select-policies-query.ts b/apps/studio/data/storage/public-buckets-with-select-policies-query.tsindex 3df8fb7a3f4..991853a065e 100644--- a/apps/studio/data/storage/public-buckets-with-select-policies-query.ts+++ b/apps/studio/data/storage/public-buckets-with-select-policies-query.ts@@ -2,7 +2,7 @@ import { literal, safeSql } from '@supabase/pg-meta/src/pg-format'import { useQuery } from '@tanstack/react-query'import { storageKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { PROJECT_STATUS } from '@/lib/constants'import type { ResponseError, UseCustomQueryOptions } from '@/types'diff --git a/apps/studio/data/table-editor/table-editor-query.ts b/apps/studio/data/table-editor/table-editor-query.tsindex a7f82fda337..6ccddc7012e 100644--- a/apps/studio/data/table-editor/table-editor-query.ts+++ b/apps/studio/data/table-editor/table-editor-query.ts@@ -3,8 +3,8 @@ import { QueryClient, queryOptions, useQuery } from '@tanstack/react-query'import { tableEditorKeys } from './keys'import { Entity } from './table-editor-types'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import { UseCustomQueryOptions } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import { ResponseError, UseCustomQueryOptions } from '@/types'type TableEditorArgs = {id?: number@@ -38,7 +38,7 @@ export async function getTableEditor(}export type TableEditorData = Awaited<ReturnType<typeof getTableEditor>>-export type TableEditorError = ExecuteSqlError+export type TableEditorError = ResponseErrorexport const useTableEditorQuery = <TData = TableEditorData>({ projectRef, connectionString, id }: TableEditorVariables,diff --git a/apps/studio/data/table-rows/get-cell-value-mutation.ts b/apps/studio/data/table-rows/get-cell-value-mutation.tsindex 7fa7a637acb..4173a299187 100644--- a/apps/studio/data/table-rows/get-cell-value-mutation.ts+++ b/apps/studio/data/table-rows/get-cell-value-mutation.ts@@ -3,7 +3,7 @@ import { Query } from '@supabase/pg-meta/src/query'import { useMutation } from '@tanstack/react-query'import { toast } from 'sonner'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/data/table-rows/operation-queue-save-mutation.ts b/apps/studio/data/table-rows/operation-queue-save-mutation.tsindex d7ba39c7784..67c554cd151 100644--- a/apps/studio/data/table-rows/operation-queue-save-mutation.ts+++ b/apps/studio/data/table-rows/operation-queue-save-mutation.ts@@ -8,7 +8,7 @@ import { getTableRowCreateSql } from './table-row-create-mutation'import { getTableRowDeleteSql } from './table-row-delete-mutation'import { getTableRowUpdateSql } from './table-row-update-mutation'import type { PendingAddRow } from '@/components/grid/types'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'import { QueuedOperation, QueuedOperationType } from '@/state/table-editor-operation-queue.types'diff --git a/apps/studio/data/table-rows/table-row-create-mutation.ts b/apps/studio/data/table-rows/table-row-create-mutation.tsindex 9531b1c4b5e..e20a88490e1 100644--- a/apps/studio/data/table-rows/table-row-create-mutation.ts+++ b/apps/studio/data/table-rows/table-row-create-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { tableRowKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'import { useTrack } from '@/lib/telemetry/track'import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'diff --git a/apps/studio/data/table-rows/table-row-delete-all-mutation.ts b/apps/studio/data/table-rows/table-row-delete-all-mutation.tsindex dffc16ce513..00ae2f14c69 100644--- a/apps/studio/data/table-rows/table-row-delete-all-mutation.ts+++ b/apps/studio/data/table-rows/table-row-delete-all-mutation.ts@@ -5,7 +5,7 @@ import { toast } from 'sonner'import { tableRowKeys } from './keys'import { formatFilterValue } from './utils'import type { Filter } from '@/components/grid/types'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { Entity } from '@/data/table-editor/table-editor-types'import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'diff --git a/apps/studio/data/table-rows/table-row-delete-mutation.tsx b/apps/studio/data/table-rows/table-row-delete-mutation.tsxindex f0e9aa7879c..82158c4374f 100644--- a/apps/studio/data/table-rows/table-row-delete-mutation.tsx+++ b/apps/studio/data/table-rows/table-row-delete-mutation.tsx@@ -7,7 +7,7 @@ import { getPrimaryKeys } from './utils'import type { SupaRow } from '@/components/grid/types'import { Markdown } from '@/components/interfaces/Markdown'import { DocsButton } from '@/components/ui/DocsButton'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { Entity } from '@/data/table-editor/table-editor-types'import { DOCS_URL } from '@/lib/constants'import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'diff --git a/apps/studio/data/table-rows/table-row-truncate-mutation.ts b/apps/studio/data/table-rows/table-row-truncate-mutation.tsindex 4a15ec6f044..0283bddb050 100644--- a/apps/studio/data/table-rows/table-row-truncate-mutation.ts+++ b/apps/studio/data/table-rows/table-row-truncate-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { tableRowKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type TableRowTruncateVariables = {diff --git a/apps/studio/data/table-rows/table-row-update-mutation.ts b/apps/studio/data/table-rows/table-row-update-mutation.tsindex 107a38f2eff..fd275fc3396 100644--- a/apps/studio/data/table-rows/table-row-update-mutation.ts+++ b/apps/studio/data/table-rows/table-row-update-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { tableRowKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/data/table-rows/table-rows-count-query.ts b/apps/studio/data/table-rows/table-rows-count-query.tsindex b751ccee5a3..3933afd0c73 100644--- a/apps/studio/data/table-rows/table-rows-count-query.ts+++ b/apps/studio/data/table-rows/table-rows-count-query.ts@@ -7,11 +7,11 @@ import { formatFilterValue } from './utils'import { parseSupaTable } from '@/components/grid/SupabaseGrid.utils'import type { Filter, SupaTable } from '@/components/grid/types'import { useConnectionStringForReadOps } from '@/data/read-replicas/replicas-query'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { prefetchTableEditor } from '@/data/table-editor/table-editor-query'import { RoleImpersonationState, wrapWithRoleImpersonation } from '@/lib/role-impersonation'import { isRoleImpersonationEnabled } from '@/state/role-impersonation-state'-import { UseCustomQueryOptions } from '@/types'+import { ResponseError, UseCustomQueryOptions } from '@/types'export type GetTableRowsCountArgs = {table?: SupaTable@@ -33,7 +33,7 @@ export type TableRowsCountVariables = Omit<GetTableRowsCountArgs, 'table'> & {}export type TableRowsCountData = TableRowsCount-export type TableRowsCountError = ExecuteSqlError+export type TableRowsCountError = ResponseErrorexport async function getTableRowsCount({diff --git a/apps/studio/data/table-rows/table-rows-query.ts b/apps/studio/data/table-rows/table-rows-query.tsindex 6565ffa34c4..98b1e2bb560 100644--- a/apps/studio/data/table-rows/table-rows-query.ts+++ b/apps/studio/data/table-rows/table-rows-query.ts@@ -11,7 +11,7 @@ import { Filter, Sort, SupaRow, SupaTable } from '@/components/grid/types'import { ENTITY_TYPE } from '@/data/entity-types/entity-type-constants'import { handleError } from '@/data/fetchers'import { useConnectionStringForReadOps } from '@/data/read-replicas/replicas-query'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { prefetchTableEditor } from '@/data/table-editor/table-editor-query'import { isMsSqlForeignTable } from '@/data/table-editor/table-editor-types'import { timeout } from '@/lib/helpers'@@ -316,7 +316,7 @@ type TableRowsVariables = Omit<GetTableRowsArgs, 'table'> & {}export type TableRowsData = TableRows-type TableRowsError = ExecuteSqlError+type TableRowsError = ResponseErrorasync function getTableRows({diff --git a/apps/studio/data/tables/table-create-mutation.ts b/apps/studio/data/tables/table-create-mutation.tsindex 66cefe4329b..74151da942d 100644--- a/apps/studio/data/tables/table-create-mutation.ts+++ b/apps/studio/data/tables/table-create-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { tableKeys } from './keys'import { privilegeKeys } from '@/data/privileges/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type CreateTableBody = {diff --git a/apps/studio/data/tables/table-delete-mutation.ts b/apps/studio/data/tables/table-delete-mutation.tsindex 4fc875a6d13..41b5dc6fbf5 100644--- a/apps/studio/data/tables/table-delete-mutation.ts+++ b/apps/studio/data/tables/table-delete-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { tableKeys } from './keys'import { entityTypeKeys } from '@/data/entity-types/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { tableEditorKeys } from '@/data/table-editor/keys'import { viewKeys } from '@/data/views/keys'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/data/tables/table-names-query.ts b/apps/studio/data/tables/table-names-query.tsindex 6bbbd0f226e..15fe9094874 100644--- a/apps/studio/data/tables/table-names-query.ts+++ b/apps/studio/data/tables/table-names-query.ts@@ -1,9 +1,9 @@import { safeSql } from '@supabase/pg-meta/src/pg-format'import { useQuery } from '@tanstack/react-query'-import { executeSql, ExecuteSqlError } from '../sql/execute-sql-query'+import { executeSql } from '../sql/execute-sql-mutation'import { tableKeys } from './keys'-import type { UseCustomQueryOptions } from '@/types'+import type { ResponseError, UseCustomQueryOptions } from '@/types'export type TableName = {id: number@@ -46,7 +46,7 @@ export async function getTableNames(}export type TableNamesData = Awaited<ReturnType<typeof getTableNames>>-export type TableNamesError = ExecuteSqlError+export type TableNamesError = ResponseErrorexport const useTableNamesQuery = <TData = TableNamesData>({ projectRef, connectionString }: TableNamesVariables,diff --git a/apps/studio/data/tables/table-retrieve-query.ts b/apps/studio/data/tables/table-retrieve-query.tsindex 228b9ebf108..7df19581b23 100644--- a/apps/studio/data/tables/table-retrieve-query.ts+++ b/apps/studio/data/tables/table-retrieve-query.ts@@ -3,7 +3,7 @@ import { useQuery } from '@tanstack/react-query'import { tableKeys } from './keys'import { getQueryClient } from '@/data/query-client'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { SafePostgresTable } from '@/lib/postgres-types'import type { ResponseError, UseCustomQueryOptions } from '@/types'diff --git a/apps/studio/data/tables/table-update-mutation.ts b/apps/studio/data/tables/table-update-mutation.tsindex 2551594fb1d..074f8a2f79a 100644--- a/apps/studio/data/tables/table-update-mutation.ts+++ b/apps/studio/data/tables/table-update-mutation.ts@@ -5,7 +5,7 @@ import { toast } from 'sonner'import { tableKeys } from './keys'import { CreateTableBody } from './table-create-mutation'import { lintKeys } from '@/data/lint/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { tableEditorKeys } from '@/data/table-editor/keys'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/data/tables/tables-query.ts b/apps/studio/data/tables/tables-query.tsindex d98ed36969e..5add82825bd 100644--- a/apps/studio/data/tables/tables-query.ts+++ b/apps/studio/data/tables/tables-query.ts@@ -6,7 +6,7 @@ import { useCallback } from 'react'import { tableKeys } from './keys'import { get, handleError } from '@/data/fetchers'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { SafePostgresTable } from '@/lib/postgres-types'import type { ResponseError, UseCustomInfiniteQueryOptions, UseCustomQueryOptions } from '@/types'diff --git a/apps/studio/data/vault/vault-secret-create-mutation.ts b/apps/studio/data/vault/vault-secret-create-mutation.tsindex 9fcfd945d93..370fc5b37a7 100644--- a/apps/studio/data/vault/vault-secret-create-mutation.ts+++ b/apps/studio/data/vault/vault-secret-create-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { vaultSecretsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions, VaultSecret } from '@/types'export type VaultSecretCreateVariables = {diff --git a/apps/studio/data/vault/vault-secret-decrypted-value-query.ts b/apps/studio/data/vault/vault-secret-decrypted-value-query.tsindex 5df8fe0f919..304204fcb1b 100644--- a/apps/studio/data/vault/vault-secret-decrypted-value-query.ts+++ b/apps/studio/data/vault/vault-secret-decrypted-value-query.ts@@ -3,7 +3,7 @@ import { Query } from '@supabase/pg-meta/src/query'import { useQuery } from '@tanstack/react-query'import { vaultSecretsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { UseCustomQueryOptions } from '@/types'const vaultSecretDecryptedValueQuery = (id: string) => {diff --git a/apps/studio/data/vault/vault-secret-delete-mutation.ts b/apps/studio/data/vault/vault-secret-delete-mutation.tsindex be2069d4c24..ebc7041c844 100644--- a/apps/studio/data/vault/vault-secret-delete-mutation.ts+++ b/apps/studio/data/vault/vault-secret-delete-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { vaultSecretsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions } from '@/types'export type VaultSecretDeleteVariables = {diff --git a/apps/studio/data/vault/vault-secret-update-mutation.ts b/apps/studio/data/vault/vault-secret-update-mutation.tsindex 60259a2486d..942f722fdf8 100644--- a/apps/studio/data/vault/vault-secret-update-mutation.ts+++ b/apps/studio/data/vault/vault-secret-update-mutation.ts@@ -3,7 +3,7 @@ import { useMutation, useQueryClient } from '@tanstack/react-query'import { toast } from 'sonner'import { vaultSecretsKeys } from './keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { ResponseError, UseCustomMutationOptions, VaultSecret } from '@/types'export type VaultSecretUpdateVariables = {diff --git a/apps/studio/data/vault/vault-secrets-query.ts b/apps/studio/data/vault/vault-secrets-query.tsindex e9e4e582853..66601ab0287 100644--- a/apps/studio/data/vault/vault-secrets-query.ts+++ b/apps/studio/data/vault/vault-secrets-query.ts@@ -3,8 +3,8 @@ import { Query } from '@supabase/pg-meta/src/query'import { useQuery } from '@tanstack/react-query'import { vaultSecretsKeys } from './keys'-import { executeSql, ExecuteSqlError } from '@/data/sql/execute-sql-query'-import type { UseCustomQueryOptions, VaultSecret } from '@/types'+import { executeSql } from '@/data/sql/execute-sql-mutation'+import type { ResponseError, UseCustomQueryOptions, VaultSecret } from '@/types'export const getVaultSecretsSql = () => {const sql = new Query()@@ -35,7 +35,7 @@ export async function getVaultSecrets(}export type VaultSecretsData = Awaited<ReturnType<typeof getVaultSecrets>>-export type VaultSecretsError = ExecuteSqlError+export type VaultSecretsError = ResponseErrorexport const useVaultSecretsQuery = <TData = VaultSecretsData>({ projectRef, connectionString }: VaultSecretsVariables,diff --git a/apps/studio/data/views/view-delete-mutation.ts b/apps/studio/data/views/view-delete-mutation.tsindex 94a41687f97..5cca346058f 100644--- a/apps/studio/data/views/view-delete-mutation.ts+++ b/apps/studio/data/views/view-delete-mutation.ts@@ -4,7 +4,7 @@ import { toast } from 'sonner'import { viewKeys } from './keys'import { entityTypeKeys } from '@/data/entity-types/keys'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { tableEditorKeys } from '@/data/table-editor/keys'import type { ResponseError, UseCustomMutationOptions } from '@/types'diff --git a/apps/studio/hooks/analytics/useDbQuery.tsx b/apps/studio/hooks/analytics/useDbQuery.tsxindex 5d83ce266f5..2a2ccf1f00c 100644--- a/apps/studio/hooks/analytics/useDbQuery.tsx+++ b/apps/studio/hooks/analytics/useDbQuery.tsx@@ -8,7 +8,7 @@ import {ReportQueryDb,} from '@/components/interfaces/Reports/Reports.types'import { useReadReplicasQuery } from '@/data/read-replicas/replicas-query'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { IS_PLATFORM } from '@/lib/constants'import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector'diff --git a/apps/studio/lib/ai/tools/fallback-tools.ts b/apps/studio/lib/ai/tools/fallback-tools.tsindex 7956b8628b2..d2f7819d178 100644--- a/apps/studio/lib/ai/tools/fallback-tools.ts+++ b/apps/studio/lib/ai/tools/fallback-tools.ts@@ -7,7 +7,7 @@ import { z } from 'zod'import { getDatabaseFunctions } from '@/data/database-functions/database-functions-query'import { getDatabasePolicies } from '@/data/database-policies/database-policies-query'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { executeQuery } from '@/lib/api/self-hosted/query'export const getFallbackTools = ({diff --git a/apps/studio/lib/ai/tools/studio-tools.test.ts b/apps/studio/lib/ai/tools/studio-tools.test.tsindex 764c2dd6ac6..4a090a884c1 100644--- a/apps/studio/lib/ai/tools/studio-tools.test.ts+++ b/apps/studio/lib/ai/tools/studio-tools.test.ts@@ -2,10 +2,10 @@ import { safeSql } from '@supabase/pg-meta'import { beforeEach, describe, expect, it, vi } from 'vitest'import { getStudioTools } from './studio-tools'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { NO_DATA_PERMISSIONS } from '@/lib/ai/tools/tool-sanitizer'-vi.mock('@/data/sql/execute-sql-query', () => ({+vi.mock('@/data/sql/execute-sql-mutation', () => ({executeSql: vi.fn(),}))diff --git a/apps/studio/lib/ai/tools/studio-tools.ts b/apps/studio/lib/ai/tools/studio-tools.tsindex 6f932ecf21d..a2f98192fdc 100644--- a/apps/studio/lib/ai/tools/studio-tools.ts+++ b/apps/studio/lib/ai/tools/studio-tools.ts@@ -3,7 +3,7 @@ import { tool } from 'ai'import { z } from 'zod'import { deployEdgeFunction } from '@/data/edge-functions/edge-functions-deploy-mutation'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { AiOptInLevel } from '@/hooks/misc/useOrgOptedIntoAi'import {EDGE_FUNCTION_PROMPT,diff --git a/apps/studio/lib/api/generate-v4.test.ts b/apps/studio/lib/api/generate-v4.test.tsindex 803423a9604..7a064364246 100644--- a/apps/studio/lib/api/generate-v4.test.ts+++ b/apps/studio/lib/api/generate-v4.test.ts@@ -62,7 +62,7 @@ test('generateV4 calls the tool sanitizer', async () => {}),}))- vi.mock('@/data/sql/execute-sql-query', () => ({+ vi.mock('@/data/sql/execute-sql-mutation', () => ({executeSql: vi.fn().mockResolvedValue({ result: [] }),}))diff --git a/apps/studio/pages/api/ai/code/complete.ts b/apps/studio/pages/api/ai/code/complete.tsindex 618a68c339c..46ab01332db 100644--- a/apps/studio/pages/api/ai/code/complete.ts+++ b/apps/studio/pages/api/ai/code/complete.ts@@ -5,7 +5,7 @@ import { source } from 'common-tags'import { NextApiRequest, NextApiResponse } from 'next'import z from 'zod'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import { AiOptInLevel } from '@/hooks/misc/useOrgOptedIntoAi'import { getOrgAIDetails } from '@/lib/ai/ai-details'import { getModel } from '@/lib/ai/model'diff --git a/apps/studio/pages/api/ai/sql/generate-v4.ts b/apps/studio/pages/api/ai/sql/generate-v4.tsindex 07c4058894b..457881205c7 100644--- a/apps/studio/pages/api/ai/sql/generate-v4.ts+++ b/apps/studio/pages/api/ai/sql/generate-v4.ts@@ -5,7 +5,7 @@ import { IS_PLATFORM } from 'common'import type { NextApiRequest, NextApiResponse } from 'next'import z from 'zod'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import type { AiOptInLevel } from '@/hooks/misc/useOrgOptedIntoAi'import { getOrgAIDetails, getProjectAIDetails } from '@/lib/ai/ai-details'import { isTracingAllowed } from '@/lib/ai/braintrust-logger'diff --git a/apps/studio/state/role-impersonation-state.tsx b/apps/studio/state/role-impersonation-state.tsxindex b7e422519a0..fb389149481 100644--- a/apps/studio/state/role-impersonation-state.tsx+++ b/apps/studio/state/role-impersonation-state.tsx@@ -4,7 +4,7 @@ import { createContext, PropsWithChildren, useCallback, useContext, useEffect }import { proxy, snapshot, subscribe, useSnapshot } from 'valtio'import { CustomAccessTokenHookDetails } from '../hooks/misc/useCustomAccessTokenHookDetails'-import { executeSql } from '@/data/sql/execute-sql-query'+import { executeSql } from '@/data/sql/execute-sql-mutation'import useLatest from '@/hooks/misc/useLatest'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { getPostgrestClaims, ImpersonationRole } from '@/lib/role-impersonation'