chore: remove useExecuteSqlQuery() part 2 (#30467)

* foreign-key-constraints

* update entity-types stale time

* schemas query

* deprecate useExecuteSqlQuery

* users count query

* database size query

* indexes query

* keywords query

* migrations query

* table columns

* database functions

* database roles query

* fdws query

* replication lag query

* ongoing queries query

* vault secrets query

* remove unneeded staleTime: 0

* max connections query

* fix entity types key in tests

* Some fixes

---------

Co-authored-by: Joshen Lim <joshenlimek@gmail.com>

apps/studio/data/database-functions/database-functions-create-mutation.ts

@@ -3,8 +3,8 @@ import { toast } from 'sonner'
 import { z } from 'zod'
 
 import pgMeta from '@supabase/pg-meta'
+import { databaseKeys } from 'data/database/keys'
 import { executeSql } from 'data/sql/execute-sql-query'
-import { sqlKeys } from 'data/sql/keys'
 import type { ResponseError } from 'types'
 
 export type DatabaseFunctionCreateVariables = {
@@ -47,7 +47,7 @@ export const useDatabaseFunctionCreateMutation = ({
     {
       async onSuccess(data, variables, context) {
         const { projectRef } = variables
-        await queryClient.invalidateQueries(sqlKeys.query(projectRef, ['functions-list']))
+        await queryClient.invalidateQueries(databaseKeys.databaseFunctions(projectRef))
         await onSuccess?.(data, variables, context)
       },
       async onError(data, variables, context) {

apps/studio/data/database-functions/database-functions-delete-mutation.ts

@@ -3,8 +3,8 @@ import { toast } from 'sonner'
 import { z } from 'zod'
 
 import pgMeta from '@supabase/pg-meta'
+import { databaseKeys } from 'data/database/keys'
 import { executeSql } from 'data/sql/execute-sql-query'
-import { sqlKeys } from 'data/sql/keys'
 import type { ResponseError } from 'types'
 import { DatabaseFunction } from './database-functions-query'
 
@@ -48,7 +48,7 @@ export const useDatabaseFunctionDeleteMutation = ({
     {
       async onSuccess(data, variables, context) {
         const { projectRef } = variables
-        await queryClient.invalidateQueries(sqlKeys.query(projectRef, ['functions-list']))
+        await queryClient.invalidateQueries(databaseKeys.databaseFunctions(projectRef))
         await onSuccess?.(data, variables, context)
       },
       async onError(data, variables, context) {

apps/studio/data/database-functions/database-functions-query.ts

@@ -1,7 +1,7 @@
 import pgMeta from '@supabase/pg-meta'
-import { UseQueryOptions } from '@tanstack/react-query'
-import type { ExecuteSqlData, ExecuteSqlError } from 'data/sql/execute-sql-query'
-import { useExecuteSqlQuery } from 'data/sql/execute-sql-query'
+import { useQuery, UseQueryOptions } from '@tanstack/react-query'
+import { databaseKeys } from 'data/database/keys'
+import { executeSql } from 'data/sql/execute-sql-query'
 import type { ResponseError } from 'types'
 import { z } from 'zod'
 
@@ -14,27 +14,38 @@ export type DatabaseFunction = z.infer<typeof pgMeta.functions.pgFunctionZod>
 
 const pgMetaFunctionsList = pgMeta.functions.list()
 
-export type DatabaseFunctionsData = z.infer<typeof pgMetaFunctionsList.zod>
-export type DatabaseFunctionsError = ResponseError
-
-export const useDatabaseFunctionsQuery = <
-  TData extends DatabaseFunctionsData = DatabaseFunctionsData,
->(
+export async function getDatabaseFunctions(
   { projectRef, connectionString }: DatabaseFunctionsVariables,
-  options: UseQueryOptions<ExecuteSqlData, ExecuteSqlError, TData> = {}
-) => {
-  return useExecuteSqlQuery(
+  signal?: AbortSignal
+) {
+  const { result } = await executeSql(
     {
       projectRef,
       connectionString,
       sql: pgMetaFunctionsList.sql,
-      queryKey: ['functions-list'],
+      queryKey: ['database-functions'],
     },
+    signal
+  )
+
+  return result as DatabaseFunction[]
+}
+
+export type DatabaseFunctionsData = z.infer<typeof pgMetaFunctionsList.zod>
+export type DatabaseFunctionsError = ResponseError
+
+export const useDatabaseFunctionsQuery = <TData = DatabaseFunctionsData>(
+  { projectRef, connectionString }: DatabaseFunctionsVariables,
+  {
+    enabled = true,
+    ...options
+  }: UseQueryOptions<DatabaseFunctionsData, DatabaseFunctionsError, TData> = {}
+) =>
+  useQuery<DatabaseFunctionsData, DatabaseFunctionsError, TData>(
+    databaseKeys.databaseFunctions(projectRef),
+    ({ signal }) => getDatabaseFunctions({ projectRef, connectionString }, signal),
     {
-      select(data) {
-        return (data as any)?.result ?? []
-      },
+      enabled: enabled && typeof projectRef !== 'undefined',
       ...options,
     }
   )
-}

apps/studio/data/database-functions/database-functions-update-mutation.ts

@@ -3,8 +3,8 @@ import { toast } from 'sonner'
 import { z } from 'zod'
 
 import pgMeta from '@supabase/pg-meta'
+import { databaseKeys } from 'data/database/keys'
 import { executeSql } from 'data/sql/execute-sql-query'
-import { sqlKeys } from 'data/sql/keys'
 import type { ResponseError } from 'types'
 import type { DatabaseFunction } from './database-functions-query'
 
@@ -50,7 +50,7 @@ export const useDatabaseFunctionUpdateMutation = ({
     {
       async onSuccess(data, variables, context) {
         const { projectRef } = variables
-        await queryClient.invalidateQueries(sqlKeys.query(projectRef, ['functions-list']))
+        await queryClient.invalidateQueries(databaseKeys.databaseFunctions(projectRef))
         await onSuccess?.(data, variables, context)
       },
       async onError(data, variables, context) {