From 9057c222dccf19e575b99c33ac53d9b20e4c9430 Mon Sep 17 00:00:00 2001
From: Andrey Avtomonov <andreybavt@gmail.com>
Date: Wed, 13 May 2026 19:04:46 +0200
Subject: [PATCH] fix(setup): forward query history flags

---
 packages/cli/src/setup.test.ts | 10 ++++++++++
 packages/cli/src/setup.ts      | 30 +++++++++++++++---------------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/packages/cli/src/setup.test.ts b/packages/cli/src/setup.test.ts
index 621312f4..17ee768e 100644
--- a/packages/cli/src/setup.test.ts
+++ b/packages/cli/src/setup.test.ts
@@ -1223,6 +1223,11 @@ describe('setup status', () => {
           databaseConnectionId: 'warehouse',
           databaseUrl: 'env:DATABASE_URL',
           databaseSchemas: ['public'],
+          enableQueryHistory: true,
+          queryHistoryWindowDays: 30,
+          queryHistoryMinExecutions: 12,
+          queryHistoryServiceAccountPatterns: ['^svc_'],
+          queryHistoryRedactionPatterns: ['(?i)secret'],
           skipDatabases: false,
           skipSources: true,
         },
@@ -1239,6 +1244,11 @@ describe('setup status', () => {
         databaseConnectionId: 'warehouse',
         databaseUrl: 'env:DATABASE_URL',
         databaseSchemas: ['public'],
+        enableQueryHistory: true,
+        queryHistoryWindowDays: 30,
+        queryHistoryMinExecutions: 12,
+        queryHistoryServiceAccountPatterns: ['^svc_'],
+        queryHistoryRedactionPatterns: ['(?i)secret'],
         skipDatabases: false,
       }),
       testIo.io,
diff --git a/packages/cli/src/setup.ts b/packages/cli/src/setup.ts
index 474ee557..3ecc0c14 100644
--- a/packages/cli/src/setup.ts
+++ b/packages/cli/src/setup.ts
@@ -90,12 +90,12 @@ export type KtxSetupArgs =
       databaseConnectionId?: string;
       databaseUrl?: string;
       databaseSchemas: string[];
-      enableHistoricSql?: boolean;
-      disableHistoricSql?: boolean;
-      historicSqlWindowDays?: number;
-      historicSqlMinExecutions?: number;
-      historicSqlServiceAccountPatterns?: string[];
-      historicSqlRedactionPatterns?: string[];
+      enableQueryHistory?: boolean;
+      disableQueryHistory?: boolean;
+      queryHistoryWindowDays?: number;
+      queryHistoryMinExecutions?: number;
+      queryHistoryServiceAccountPatterns?: string[];
+      queryHistoryRedactionPatterns?: string[];
       skipDatabases: boolean;
       source?: KtxSetupSourceType;
       sourceConnectionId?: string;
@@ -624,17 +624,17 @@ async function runKtxSetupInner(args: KtxSetupArgs, io: KtxCliIo, deps: KtxSetup
             ...(args.databaseConnectionId ? { databaseConnectionId: args.databaseConnectionId } : {}),
             ...(args.databaseUrl ? { databaseUrl: args.databaseUrl } : {}),
             databaseSchemas: args.databaseSchemas,
-            ...(args.enableHistoricSql !== undefined ? { enableHistoricSql: args.enableHistoricSql } : {}),
-            ...(args.disableHistoricSql !== undefined ? { disableHistoricSql: args.disableHistoricSql } : {}),
-            ...(args.historicSqlWindowDays !== undefined ? { historicSqlWindowDays: args.historicSqlWindowDays } : {}),
-            ...(args.historicSqlMinExecutions !== undefined
-              ? { historicSqlMinExecutions: args.historicSqlMinExecutions }
+            ...(args.enableQueryHistory !== undefined ? { enableQueryHistory: args.enableQueryHistory } : {}),
+            ...(args.disableQueryHistory !== undefined ? { disableQueryHistory: args.disableQueryHistory } : {}),
+            ...(args.queryHistoryWindowDays !== undefined ? { queryHistoryWindowDays: args.queryHistoryWindowDays } : {}),
+            ...(args.queryHistoryMinExecutions !== undefined
+              ? { queryHistoryMinExecutions: args.queryHistoryMinExecutions }
               : {}),
-            ...(args.historicSqlServiceAccountPatterns
-              ? { historicSqlServiceAccountPatterns: args.historicSqlServiceAccountPatterns }
+            ...(args.queryHistoryServiceAccountPatterns
+              ? { queryHistoryServiceAccountPatterns: args.queryHistoryServiceAccountPatterns }
               : {}),
-            ...(args.historicSqlRedactionPatterns
-              ? { historicSqlRedactionPatterns: args.historicSqlRedactionPatterns }
+            ...(args.queryHistoryRedactionPatterns
+              ? { queryHistoryRedactionPatterns: args.queryHistoryRedactionPatterns }
               : {}),
             skipDatabases: args.skipDatabases || !shouldRunDatabases,
           },