Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
fix(databases): preserve selected source in question previews (#7616)
Wolf Mermelstein1fc13a6b3ec6
diff --git a/apps/web/src/features/database-query/queries/app-query-source.test.ts b/apps/web/src/features/database-query/queries/app-query-source.test.tsnew file mode 100644index 0000000000..266f14d3f5--- /dev/null+++ b/apps/web/src/features/database-query/queries/app-query-source.test.ts@@ -0,0 +1,87 @@+import { DATABASE_MODEL } from '@core/component/AI/constant';+import { databaseSqlSchema } from '@core/database-sql/catalog';+import { readDatabaseSql } from '@queries/database-sql/create-database-sql-query';+import { fetchViewerDatabases } from '@queries/storage/databases';+import type { DatabaseDetail } from '@service-storage/generated/schemas/databaseDetail';+import { okAsync } from 'neverthrow';+import { describe, expect, it, vi } from 'vitest';+import { createQueryCapabilities } from './app-query-source';+import { toQuerySchema } from './query-source';++vi.mock('@queries/storage/databases', () => ({+ fetchViewerDatabases: vi.fn(),+}));+vi.mock('@queries/database-sql/create-database-sql-query', () => ({+ readDatabaseSql: vi.fn(),+}));+vi.mock('@service-connection/client', () => ({+ useEntitySubscription: vi.fn(),+}));+vi.mock('@queries/storage/databases-sync', () => ({+ useDatabaseTableChanges: vi.fn(),+}));+vi.mock('@app/features/paywall/ai-usage-limit-handling', () => ({+ handleAiUsageLimitError: vi.fn(),+}));++const databases: DatabaseDetail[] = ['first', 'second'].map((id) => ({+ database: {+ id,+ name: 'CRM',+ owner_id: 'owner',+ created_at: '',+ trashed_at: null,+ },+ grant: 'view',+ tables: [+ {+ table: {+ id: `${id}-contacts`,+ database_id: id,+ name: 'Contacts',+ position: 'a',+ version: 1,+ },+ sql_name: '"CRM"."Contacts"',+ columns: [],+ views: [],+ },+ ],+}));++describe('draft question SQL execution', () => {+ it.each(['first', undefined])(+ 'passes the explicit source %s to the SQL engine while keeping the viewer catalog',+ async (databaseId) => {+ vi.mocked(fetchViewerDatabases).mockReturnValue(okAsync(databases));+ vi.mocked(readDatabaseSql).mockReturnValue(+ okAsync({+ catalog: { tables: [] },+ outcome: {+ columns: [{ name: 'Count', kind: 'number' }],+ rows: [[{ type: 'number', value: 3 }]],+ rowIds: [],+ readTables: ['first-contacts'],+ truncated: false,+ insertedRowIds: [],+ changesApplied: 0,+ },+ })+ );+ const capabilities = createQueryCapabilities(() => DATABASE_MODEL);+ const source = toQuerySchema(databases[0]);+ const sql = 'SELECT COUNT(*) AS Count FROM "CRM"."Contacts"';+ const result = await capabilities.read(sql, { databaseId, source });++ expect(result._unsafeUnwrap()).toMatchObject({+ rows: [[{ type: 'number', value: 3 }]],+ source,+ });+ expect(readDatabaseSql).toHaveBeenLastCalledWith({+ schema: databaseSqlSchema(databases),+ sql,+ scope: databaseId,+ });+ }+ );+});diff --git a/apps/web/src/features/database-query/queries/app-query-source.ts b/apps/web/src/features/database-query/queries/app-query-source.tsindex e5270d1438..3fa91430f5 100644--- a/apps/web/src/features/database-query/queries/app-query-source.ts+++ b/apps/web/src/features/database-query/queries/app-query-source.ts@@ -84,11 +84,14 @@ export function createQueryCapabilities(return createQuestionCapabilities({generate: (input) => generateDatabaseQuery(input, model()),// A draft question may read any database the viewer can reach.- read: (sql) =>+ read: (sql, context) =>viewerDatabases().andThen((databases) =>- readDatabaseSql({ schema: databaseSqlSchema(databases), sql }).map(- ({ catalog, outcome }) =>- databaseSqlAnswer(outcome, catalog, databases)+ readDatabaseSql({+ schema: databaseSqlSchema(databases),+ sql,+ scope: context?.databaseId,+ }).map(({ catalog, outcome }) =>+ databaseSqlAnswer(outcome, catalog, databases))),describe: (databaseId) =>diff --git a/apps/web/src/features/database-query/queries/question-capabilities.test.ts b/apps/web/src/features/database-query/queries/question-capabilities.test.tsindex cc56d0538c..bab97a679e 100644--- a/apps/web/src/features/database-query/queries/question-capabilities.test.ts+++ b/apps/web/src/features/database-query/queries/question-capabilities.test.ts@@ -73,7 +73,10 @@ describe('automatic question source verification', () => {}))._unsafeUnwrap();expect(verified).toEqual({ ...answer, source: schema });- expect(read).toHaveBeenCalledExactlyOnceWith(generated.sql);+ expect(read).toHaveBeenCalledExactlyOnceWith(generated.sql, {+ databaseId: schema.databaseId,+ source: generated.source,+ });expect(describe).not.toHaveBeenCalled();});diff --git a/apps/web/src/features/database-query/queries/question-capabilities.ts b/apps/web/src/features/database-query/queries/question-capabilities.tsindex 95ca3d9e66..052d18a20c 100644--- a/apps/web/src/features/database-query/queries/question-capabilities.ts+++ b/apps/web/src/features/database-query/queries/question-capabilities.ts@@ -18,7 +18,7 @@ export function createQuestionCapabilities(return {read: (sql, context) =>input- .read(sql)+ .read(sql, context).andThen((answer): ResultAsync<QueryAnswer, QueryFailure> => {const databaseIds = answer.readDatabaseIds;if (diff --git a/docs/agent-guide/databases.md b/docs/agent-guide/databases.mdindex b7ab34e5e8..6271800a3b 100644--- a/docs/agent-guide/databases.md+++ b/docs/agent-guide/databases.md@@ -648,11 +648,12 @@ answers still load when they approach the viewport. The empty input rotates throuses its actual table and column names. Typing hides these hints, and reduced-motionpreferences keep them static. Use the searchable source picker below the question tochoose a database; the entire chosen database is in scope, without a table-prerequisite. **Automatic** finds a relevant accessible database from the question-with the discovery tools and inspects all its tables. The answer's `QueryDatabase`-runs with view access only, so asking a question never changes data, even for an-editor. Both discovery and final answer formatting receive the registered database-tool reference, including the current SQL dialect. Verify an Automatic question+prerequisite. An explicit source also disambiguates databases with identical names+when previewing or refreshing an answer. **Automatic** finds a relevant accessible+database from the question with the discovery tools and inspects all its tables.+The answer's `QueryDatabase` runs with view access only, so asking a question never+changes data, even for an editor. Both discovery and final answer formatting+receive the registered database tool reference, including the current SQL dialect. Verify an Automatic questionthat needs ListDatabases, DescribeDatabase, and QueryDatabase completes with liveresults; repeat with an explicit source and an aggregate using an AS alias. Theformatting step must preserve tool-call/result names and ids without another tool