fix: PR fixes

Author: Raubzeug

src/store/reducers/query/__test__/prepareQueryWithPragmas.test.ts

@@ -1,30 +1,29 @@
-// This is a test file for the prepareQueryWithPragmas function
-// Since the function is not exported, we'll test it indirectly through integration
-// This file is for documentation purposes and can be removed
+import {prepareQueryWithPragmas} from '../utils';
 
 describe('prepareQueryWithPragmas', () => {
     test('Should prepend pragmas correctly', () => {
         // This tests the behavior through the actual query API
         const pragma = 'PRAGMA OrderedColumns;';
         const query = 'SELECT * FROM table;';
-        const expectedResult = `${pragma}\n\n${query}`;
+        const expectedResult = prepareQueryWithPragmas(query, pragma);
 
         // The actual test would be integration test with the query API
         expect(expectedResult).toBe('PRAGMA OrderedColumns;\n\nSELECT * FROM table;');
     });
 
     test('Should handle empty pragmas', () => {
-        const _pragma = '';
         const query = 'SELECT * FROM table;';
+        const pragma = '';
+        const expectedResult = prepareQueryWithPragmas(query, pragma);
 
         // When pragma is empty, query should remain unchanged
-        expect(query).toBe('SELECT * FROM table;');
+        expect(expectedResult).toBe('SELECT * FROM table;');
     });
 
     test('Should handle pragmas without semicolon', () => {
         const pragma = 'PRAGMA OrderedColumns';
         const query = 'SELECT * FROM table;';
-        const expectedResult = `${pragma};\n\n${query}`;
+        const expectedResult = prepareQueryWithPragmas(query, pragma);
 
         expect(expectedResult).toBe('PRAGMA OrderedColumns;\n\nSELECT * FROM table;');
     });

src/store/reducers/query/query.ts

@@ -18,7 +18,7 @@ import {
     setStreamSession as setStreamSessionReducer,
 } from './streamingReducers';
 import type {QueryResult, QueryState} from './types';
-import {getActionAndSyntaxFromQueryMode, getQueryInHistory} from './utils';
+import {getActionAndSyntaxFromQueryMode, getQueryInHistory, prepareQueryWithPragmas} from './utils';
 
 const MAXIMUM_QUERIES_IN_HISTORY = 20;
 
@@ -209,18 +209,6 @@ interface QueryStats {
 const DEFAULT_STREAM_CHUNK_SIZE = 1000;
 const DEFAULT_CONCURRENT_RESULTS = false;
 
-const prepareQueryWithPragmas = (query: string, pragmas?: string): string => {
-    if (!pragmas || !pragmas.trim()) {
-        return query;
-    }
-
-    // Add pragmas at the beginning with proper line separation
-    const trimmedPragmas = pragmas.trim();
-    const separator = trimmedPragmas.endsWith(';') ? '\n\n' : ';\n\n';
-
-    return `${trimmedPragmas}${separator}${query}`;
-};
-
 export const queryApi = api.injectEndpoints({
     endpoints: (build) => ({
         useStreamQuery: build.mutation<null, StreamQueryParams>({

src/store/reducers/query/utils.ts

@@ -50,3 +50,15 @@ export function isQueryResponseChunk(content: StreamingChunk): content is QueryR
 export function isKeepAliveChunk(content: StreamingChunk): content is SessionChunk {
     return content?.meta?.event === 'KeepAlive';
 }
+
+export const prepareQueryWithPragmas = (query: string, pragmas?: string): string => {
+    if (!pragmas || !pragmas.trim()) {
+        return query;
+    }
+
+    // Add pragmas at the beginning with proper line separation
+    const trimmedPragmas = pragmas.trim();
+    const separator = trimmedPragmas.endsWith(';') ? '\n\n' : ';\n\n';
+
+    return `${trimmedPragmas}${separator}${query}`;
+};

src/utils/query.ts

@@ -297,14 +297,16 @@ export const parseQueryErrorToString = (error: unknown) => {
     return parsedError?.error?.message;
 };
 
+export const defaultPragma = 'PRAGMA OrderedColumns;';
+
 export const DEFAULT_QUERY_SETTINGS = {
     queryMode: QUERY_MODES.query,
     transactionMode: TRANSACTION_MODES.implicit,
     timeout: null,
     limitRows: 10000,
     statisticsMode: STATISTICS_MODES.none,
     tracingLevel: TRACING_LEVELS.off,
-    pragmas: 'PRAGMA OrderedColumns;',
+    pragmas: defaultPragma,
 };
 
 export const queryModeSchema = z.nativeEnum(QUERY_MODES);

tests/suites/tenant/diagnostics/tabs/queries.test.ts

@@ -1,5 +1,7 @@
 import {expect, test} from '@playwright/test';
 
+import {prepareQueryWithPragmas} from '../../../../../src/store/reducers/query/utils';
+import {defaultPragma} from '../../../../../src/utils/query';
 import {tenantName} from '../../../../utils/constants';
 import {NavigationTabs, TenantPage} from '../../TenantPage';
 import {longRunningQuery, longRunningStreamQuery} from '../../constants';
@@ -51,8 +53,9 @@ test.describe('Diagnostics Queries tab', async () => {
         const diagnostics = new Diagnostics(page);
         await diagnostics.clickTab(DiagnosticsTab.Queries);
         await diagnostics.clickRadioSwitch(QueriesSwitch.Running);
+        const finalQueryText = prepareQueryWithPragmas(longRunningQuery, defaultPragma);
         expect(
-            await diagnostics.table.waitForCellValueByHeader(1, 'Query text', longRunningQuery),
+            await diagnostics.table.waitForCellValueByHeader(1, 'Query text', finalQueryText),
         ).toBe(true);
     });