fixes oceanbase/odc#1380

oceanbase · Mar 25, 2024 · e79dfe7 · e79dfe7
1 parent 7c3f608
commit e79dfe7
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 0 deletions.
diff --git a/src/common/network/sql/executeSQL.tsx b/src/common/network/sql/executeSQL.tsx
@@ -35,6 +35,7 @@ export interface IExecuteSQLParams {
    * 是否拆分执行，传空的话像等于true
    */
   split?: boolean;
+  addROWID?: boolean;
 }
 export interface ISQLExecuteTaskSQL {
   sqlTuple: {

diff --git a/src/component/ODCSetting/config/database.tsx b/src/component/ODCSetting/config/database.tsx
@@ -111,6 +111,31 @@ const databaseSettings: IODCSetting[] = [
       );
     },
   },
+  {
+    label: '获取 RowId',
+    key: 'odc.sqlexecute.default.addInternalRowId',
+    group: databaseGroup,
+    secondGroup: databaseResultsetGroup,
+    storeType: 'server',
+    render: (value, onChange) => {
+      return (
+        <RadioItem
+          options={[
+            {
+              label: formatMessage({ id: 'src.component.ODCSetting.config.C5306019' }), //'是'
+              value: 'true',
+            },
+            {
+              label: formatMessage({ id: 'src.component.ODCSetting.config.DE21D1E7' }), //'否'
+              value: 'false',
+            },
+          ]}
+          value={value}
+          onChange={onChange}
+        />
+      );
+    },
+  },
   {
     label: formatMessage({ id: 'src.component.ODCSetting.config.B86084FC' }), //'查询条数限制'
     key: 'odc.sqlexecute.default.queryLimit',

diff --git a/src/d.ts/index.ts b/src/d.ts/index.ts
@@ -83,6 +83,7 @@ export interface IUserConfig {
   'odc.sqlexecute.default.queryLimit': string;
   'odc.sqlexecute.default.fullLinkTraceEnabled': 'true' | 'false';
   'odc.sqlexecute.default.continueExecutionOnError': 'true' | 'false';
+  'odc.sqlexecute.default.addInternalRowId': 'true' | 'false';
   'odc.sqlexecute.default.objectDraggingOption': DragInsertType;
   'odc.editor.style.theme': 'OceanBase' | 'VSCode';
   'odc.editor.style.fontSize': 'Small' | 'Normal' | 'Large';

diff --git a/src/store/sql/index.tsx b/src/store/sql/index.tsx
@@ -38,6 +38,7 @@ import { clone, isNil } from 'lodash';
 import { action, observable, runInAction } from 'mobx';
 import { generateResultSetColumns } from '../helper';
 import sessionManager from '../sessionManager';
+import setting from '../setting';
 export enum ExcecuteSQLMode {
   PL = 'PL',
   TABLE = 'TABLE',
@@ -185,6 +186,9 @@ export class SQLStore {
           showTableColumnInfo,
           continueExecutionOnError,
           fullLinkTraceEnabled,
+          addROWID:
+            setting.configurations?.['odc.sqlexecute.default.addInternalRowId'] === 'true' &&
+            session.supportFeature?.enableRowId,
         },
         sessionId,
         dbName,