refactor: use autoFetchQuery from sfdx-core instead of maxFetch in dataQuery.ts

Author: daphne-sfdc

packages/salesforcedx-vscode-soql/src/commands/dataQuery.ts

@@ -139,36 +139,6 @@ export const dataQuery = Effect.fn('sf.data.query')(function* () {
   yield* Effect.promise(() => commandlet.run());
 });
 
-/**
- * Retrieves the maximum fetch limit from user configuration.
- * Checks SF CLI config first, then environment variable, then returns undefined if no limit is set.
- *
- * @returns Promise resolving to the configured limit number, or undefined if no limit is set.
- */
-const getMaxFetch = async (): Promise<number | undefined> => {
-  try {
-    // Priority 1: Check SF CLI config value (org-max-query-limit)
-    const configAggregator = await getSoqlRuntime().runPromise(
-      Effect.gen(function* () {
-        const api = yield* getServicesApi;
-        return yield* api.services.ConfigService.getConfigAggregator();
-      })
-    );
-    const configValue = configAggregator.getPropertyValue<string>('org-max-query-limit');
-    if (configValue) {
-      const parsed = parseInt(configValue, 10);
-      if (!isNaN(parsed) && parsed > 0) {
-        return parsed;
-      }
-    }
-  } catch {
-    // If config reading fails, fall back to no limit
-  }
-
-  // No limit configured - return undefined to allow default amount of queries
-  return undefined;
-};
-
 /** Generates table output from query records */
 export const generateTableOutput = (records: QueryResult['records'], title: string): string => {
   // Ensure the first record exists and is an object
@@ -366,23 +336,6 @@ export const formatFieldValueForDisplay = (value: unknown): string => {
   return stringValue.length > 50 ? `${stringValue.substring(0, 47)}...` : stringValue;
 };
 
-/**
- * Builds query options for the Salesforce connection query method.
- * Supports optional maxFetch limit when user has configured query limits.
- *
- * @param maxFetch - Optional maximum number of records to fetch. If undefined, no limit is applied.
- * @returns Query options object with autoFetch and scanAll settings, plus maxFetch if specified.
- */
-export const buildQueryOptions = (maxFetch?: number) => {
-  const baseOptions = {
-    autoFetch: true,
-    scanAll: false
-  };
-
-  // Conditionally add maxFetch if user has configured a limit (including 0)
-  return maxFetch !== undefined ? { ...baseOptions, maxFetch } : baseOptions;
-};
-
 /** Displays query results in table format */
 export const displayTableResults = (queryResult: QueryResult): void => {
   if (!queryResult.records?.length) {
@@ -458,29 +411,14 @@ export const formatErrorMessage = (error: unknown): string => {
 };
 
 /**
- * Executes a SOQL query using the provided connection (REST or Tooling API).
- * Applies user-configured query limits if set, otherwise allows results under Salesforce limits.
+ * Executes a SOQL query, auto-fetching all pages of results up to the user-configured
+ * `org-max-query-limit` (default 10,000). Emits a lifecycle warning if results are truncated.
  *
- * @param connection - Salesforce connection (REST or Tooling API)
+ * @param connection - Salesforce connection
  * @param query - SOQL query string to execute
- * @returns Promise resolving to query results with records and metadata
+ * @param useTooling - Whether to use the Tooling API instead of REST
  */
 const runSoqlQuery = async (connection: Connection, query: string, useTooling = false): Promise<QueryResult> => {
   channelService.appendLine(nls.localize('data_query_running_query'));
-
-  // Get user-configured query limit (if any)
-  const maxFetch = await getMaxFetch();
-
-  // Execute query with appropriate options (with or without maxFetch limit)
-  const result = await (useTooling ? connection.tooling : connection).query(query, buildQueryOptions(maxFetch));
-
-  // Show warning if user-configured limit caused records to be truncated
-  if (maxFetch !== undefined && result.records.length > 0 && result.totalSize > result.records.length) {
-    const missingRecords = result.totalSize - result.records.length;
-    channelService.appendLine(
-      nls.localize('data_query_warning_limit', missingRecords, maxFetch, result.totalSize, maxFetch)
-    );
-  }
-
-  return result;
+  return connection.autoFetchQuery(query, { tooling: useTooling });
 };

packages/salesforcedx-vscode-soql/test/jest/commands/dataQuery.test.ts

@@ -52,7 +52,6 @@ import {
   formatFieldValue,
   formatFieldValueForDisplay,
   generateTableOutput,
-  buildQueryOptions,
   displayTableResults,
   convertQueryResultToCSV,
   formatErrorMessage
@@ -514,15 +513,6 @@ describe('DataQuery Pure Functions', () => {
     });
   });
 
-  describe('buildQueryOptions', () => {
-    it('should return base options when maxFetch is undefined', () => {
-      expect(buildQueryOptions()).toEqual({ autoFetch: true, scanAll: false });
-    });
-    it('should include maxFetch when provided', () => {
-      expect(buildQueryOptions(100)).toEqual({ autoFetch: true, scanAll: false, maxFetch: 100 });
-    });
-  });
-
   describe('convertQueryResultToCSV', () => {
     it('should return no records message if records are empty', () => {
       const result = convertQueryResultToCSV({ records: [], totalSize: 0, done: true });