Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix(studio): respect enabled prop in index advisor query hook (#44588)

oniani16e580bffbdd9
diff --git a/apps/studio/data/database/retrieve-index-advisor-result-query.ts b/apps/studio/data/database/retrieve-index-advisor-result-query.ts
index ff284bc44ea..780d71b486a 100644
--- a/apps/studio/data/database/retrieve-index-advisor-result-query.ts
+++ b/apps/studio/data/database/retrieve-index-advisor-result-query.ts
@@ -77,16 +77,20 @@ export const useGetIndexAdvisorResult = <TData = GetIndexAdvisorResultData>(
enabled = true,
...options
}: UseCustomQueryOptions<GetIndexAdvisorResultData, GetIndexAdvisorResultError, TData> = {}
-) =>
- useQuery<GetIndexAdvisorResultData, GetIndexAdvisorResultError, TData>({
+) => {
+ const formattedQuery = (query ?? '').trim().toLowerCase()
+ const isValidQueryForIndexing =
+ formattedQuery.startsWith('select') || formattedQuery.startsWith('with pgrst_source')
+
+ return useQuery<GetIndexAdvisorResultData, GetIndexAdvisorResultError, TData>({
queryKey: databaseKeys.indexAdvisorFromQuery(projectRef, query),
queryFn: () => getIndexAdvisorResult({ projectRef, connectionString, query }),
retry: false,
enabled:
- (enabled &&
- typeof projectRef !== 'undefined' &&
- typeof query !== 'undefined' &&
- (query.startsWith('select') || query.startsWith('SELECT'))) ||
- (typeof query === 'string' && query.trim().toLowerCase().startsWith('with pgrst_source')),
+ enabled &&
+ typeof projectRef !== 'undefined' &&
+ typeof query !== 'undefined' &&
+ isValidQueryForIndexing,
...options,
})
+}