Merge pull request #22 from actiontech/feature/sqle-ee-issue-2636

feat: support sqle ee issue 2636

Author: LZS911

webapp/packages/core-localization/src/locales/en.ts

@@ -14,6 +14,7 @@ export default [
   ['ui_processing_cancel', 'Cancel'],
   ['ui_processing_canceling', 'Cancelling...'],
   ['ui_create_workflow', 'Create Workflow'],
+  ['ui_still_execute', 'Execute Anyway'],
   ['ui_workflow_detail', 'Workflow Detail'],
   ['ui_processing_canceled', 'Canceled'],
   ['ui_processing_reload', 'Reload'],

webapp/packages/core-localization/src/locales/zh.ts

@@ -13,6 +13,7 @@ export default [
   ['ui_processing_loading', '加载中...'],
   ['ui_processing_cancel', '取消'],
   ['ui_create_workflow', '发起变更工单'],
+  ['ui_still_execute', '仍要执行'],
   ['ui_workflow_detail', '工单详情'],
   ['ui_processing_canceling', '取消中...'],
   ['ui_processing_canceled', '已取消'],

webapp/packages/plugin-data-viewer/src/TableViewer/TableError.tsx

@@ -22,7 +22,7 @@ import { ConnectionSchemaManagerService } from '@cloudbeaver/plugin-datasource-c
 import { NavigationTabsService } from '@cloudbeaver/plugin-navigation-tabs';
 import { ConnectionInfoResource, createConnectionParam } from '@cloudbeaver/core-connections';
 import { CommonDialogService, DialogueStateResult } from '@cloudbeaver/core-dialogs';
-import { LocalStorageSqlDataSource, SqlDataSourceService } from '@cloudbeaver/plugin-sql-editor';
+import { LocalStorageSqlDataSource, QueryDataSource, SqlDataSourceService } from '@cloudbeaver/plugin-sql-editor';
 import { isSQLEditorTab, SqlEditorNavigatorService } from '@cloudbeaver/plugin-sql-editor-navigation-tab';
 import { SqlEditorSessionClosedDialog } from './SqlEditorSessionClosedDialog.js';
 
@@ -161,6 +161,10 @@ export const TableError = observer<Props>(function TableError({ model, loading,
     }
   }, [navigationTabsService, sqlDataSourceService, commonDialogService, connectionInfo, sqlEditorNavigatorService]);
 
+  const onStillExecute = useCallback(async () => {
+    await (model.source as unknown as QueryDataSource).requestWithExecuteAnyway();
+  }, [model]);
+
   useEffect(() => {
     const SQL_CONTEXT_ERROR_CODE = '508';
     if (errorInfo.error !== model.source.error) {
@@ -209,7 +213,6 @@ export const TableError = observer<Props>(function TableError({ model, loading,
         <Button className={s(style, { button: true })} type="button" onClick={onRetry}>
           {translate('ui_processing_retry')}
         </Button>
-
         {error.workflowId ? (
           <Button className={s(style, { button: true })} type="button" onClick={() => onWorkflowDetailNavigate(error.workflowId!)}>
             {translate('ui_workflow_detail')}
@@ -219,6 +222,9 @@ export const TableError = observer<Props>(function TableError({ model, loading,
             {translate('ui_create_workflow')}
           </Button>
         )}
+        <Button className={s(style, { button: true })} type="button" onClick={onStillExecute}>
+          {translate('ui_still_execute')}
+        </Button>
       </div>
     </div>
   );

webapp/packages/plugin-sql-editor/src/QueryDataSource.ts

@@ -41,6 +41,8 @@ export interface IQueryRequestInfo extends IRequestInfo {
 export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOptions> extends ResultSetDataSource<TOptions> {
   currentTask: ITask<SqlExecuteInfo> | null;
   override requestInfo: IQueryRequestInfo;
+  /** When true, passes isExecuteAnyway to the API for re-execution despite previous errors */
+  executeAnyway = false;
 
   override get canCancel(): boolean {
     return this.currentTask?.cancellable || false;
@@ -175,6 +177,16 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
     return this;
   }
 
+  /** Re-execute SQL with isExecuteAnyway=true, bypassing error state */
+  async requestWithExecuteAnyway(): Promise<void> {
+    this.executeAnyway = true;
+    try {
+      await this.requestData();
+    } finally {
+      this.executeAnyway = false;
+    }
+  }
+
   async request(prevResults: IDatabaseResultSet[]): Promise<IDatabaseResultSet[]> {
     const options = this.options;
     const executionContext = this.executionContext;
@@ -241,7 +253,8 @@ export class QueryDataSource<TOptions extends IDataQueryOptions = IDataQueryOpti
       },
       dataFormat: this.dataFormat,
       readLogs: options.readLogs,
-    });
+      isExecuteAnyway: this.executeAnyway || undefined,
+    } as Parameters<typeof this.graphQLService.sdk.asyncSqlExecuteQuery>[0] & { isExecuteAnyway?: boolean });
 
     return taskInfo;
   }