fix: use-QueryService-by-default-for-running-queries-1171 (#1188)

Author: astandrik

src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettings.test.ts

@@ -7,7 +7,7 @@ import {
 } from '../../../../../utils/query';
 
 const DEFAULT_QUERY_SETTINGS: QuerySettings = {
-    queryMode: QUERY_MODES.script,
+    queryMode: QUERY_MODES.query,
     isolationLevel: ISOLATION_LEVELS.serializable,
     timeout: '60',
     statisticsMode: STATISTICS_MODES.none,

src/containers/Tenant/Query/QueryEditorControls/utils/getChangedQueryExecutionSettingsDescription.test.ts

@@ -14,7 +14,7 @@ import {QUERY_SETTINGS_FIELD_SETTINGS} from '../../QuerySettingsDialog/constants
 import getChangedQueryExecutionSettingsDescription from './getChangedQueryExecutionSettingsDescription';
 
 const DEFAULT_QUERY_SETTINGS: QuerySettings = {
-    queryMode: QUERY_MODES.script,
+    queryMode: QUERY_MODES.query,
     isolationLevel: ISOLATION_LEVELS.serializable,
     timeout: '60',
     statisticsMode: STATISTICS_MODES.none,

src/containers/Tenant/Query/QuerySettingsDialog/constants.ts

@@ -37,11 +37,16 @@ export const ISOLATION_LEVEL_SELECT_OPTIONS = [
 ];
 
 export const QUERY_MODE_SELECT_OPTIONS = [
+    {
+        value: QUERY_MODES.query,
+        content: QUERY_MODES_TITLES[QUERY_MODES.query],
+        text: i18n('method-description.query'),
+        isDefault: true,
+    },
     {
         value: QUERY_MODES.script,
         content: QUERY_MODES_TITLES[QUERY_MODES.script],
         text: i18n('method-description.script'),
-        isDefault: true,
     },
     {
         value: QUERY_MODES.scan,
@@ -53,11 +58,6 @@ export const QUERY_MODE_SELECT_OPTIONS = [
         content: QUERY_MODES_TITLES[QUERY_MODES.data],
         text: i18n('method-description.data'),
     },
-    {
-        value: QUERY_MODES.query,
-        content: QUERY_MODES_TITLES[QUERY_MODES.query],
-        text: i18n('method-description.query'),
-    },
     {
         value: QUERY_MODES.pg,
         content: QUERY_MODES_TITLES[QUERY_MODES.pg],

src/utils/constants.ts

@@ -124,7 +124,7 @@ export const TENANT_OVERVIEW_TABLES_SETTINGS = {
 } as const;
 
 export const DEFAULT_QUERY_SETTINGS = {
-    queryMode: QUERY_MODES.script,
+    queryMode: QUERY_MODES.query,
     isolationLevel: ISOLATION_LEVELS.serializable,
     timeout: '60',
     statisticsMode: STATISTICS_MODES.none,

tests/suites/tenant/queryEditor/QueryEditor.ts

@@ -4,6 +4,7 @@ export const VISIBILITY_TIMEOUT = 5000;
 
 export enum QueryMode {
     YQLScript = 'YQL Script',
+    Data = 'DML',
     Scan = 'Scan',
 }
 

tests/suites/tenant/queryEditor/queryEditor.test.ts

@@ -278,7 +278,7 @@ test.describe('Test Query Editor', async () => {
         // Test for Execute mode
         await queryEditor.setQuery(longRunningQuery);
         await queryEditor.clickGearButton();
-        await queryEditor.settingsDialog.changeStatsLevel('Profile');
+        await queryEditor.settingsDialog.changeQueryMode(QueryMode.Data);
         await queryEditor.settingsDialog.clickButton(ButtonNames.Save);
 
         // Test for Explain mode