fix(frontend): mysql、spider语法检测补充cluster_type #6723

TencentBlueKing · Sep 6, 2024 · e30d452 · e30d452
1 parent b32e0be
commit e30d452
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 0 deletions.
diff --git a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/execute-objects/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/execute-objects/Index.vue
@@ -23,6 +23,7 @@
         v-for="(item, index) in modelValue"
         :key="item.rowKey"
         ref="rowRef"
+        :cluster-type="clusterType"
         :cluster-version-list="clusterVersionList"
         :data="item"
         :removeable="modelValue.length < 2"
@@ -41,6 +42,7 @@
 
   interface Props {
     clusterVersionList: string[];
+    clusterType: 'mysql' | 'tendbcluster';
   }
 
   defineProps<Props>();

diff --git a/...end/src/views/db-manage/common/sql-execute/execute-objects/RenderData/RenderSql/Index.vue b/...end/src/views/db-manage/common/sql-execute/execute-objects/RenderData/RenderSql/Index.vue
@@ -20,6 +20,7 @@
     v-model="modelValue"
     v-model:importMode="importMode"
     v-model:is-show="isShowSql"
+    :cluster-type="clusterType"
     :cluster-version-list="clusterVersionList">
     <template #header>
       <span style="color: #63656e; font-size: 12px; font-weight: normal; margin-left: 30px">
@@ -58,6 +59,7 @@
     clusterVersionList: string[];
     dbNames: string[];
     ignoreDbNames: string[];
+    clusterType: 'mysql' | 'tendbcluster';
   }
 
   interface Expose {

diff --git a/.../common/sql-execute/execute-objects/RenderData/RenderSql/components/sql-content/Index.vue b/.../common/sql-execute/execute-objects/RenderData/RenderSql/components/sql-content/Index.vue
@@ -37,6 +37,7 @@
           :is="renderCom"
           ref="fileRef"
           v-model="localModelValue"
+          :cluster-type="clusterType"
           v-bind="attrs"
           :cluster-version-list="clusterVersionList"
           @grammar-check="handleGrammarCheck" />
@@ -73,6 +74,7 @@
 
   interface Props {
     clusterVersionList: string[];
+    clusterType: 'mysql' | 'tendbcluster';
   }
 
   defineProps<Props>();

diff --git a/...ecute-objects/RenderData/RenderSql/components/sql-content/components/local-file/Index.vue b/...ecute-objects/RenderData/RenderSql/components/sql-content/components/local-file/Index.vue
@@ -91,6 +91,7 @@
 
   interface Props {
     clusterVersionList: string[];
+    clusterType: 'mysql' | 'tendbcluster';
   }
 
   interface Emits {
@@ -224,6 +225,8 @@
       params.append(`versions[${index}]`, version);
     });
 
+    params.append('cluster_type', props.clusterType);
+
     grammarCheck(params)
       .then((data) => {
         const lastUploadFileDataMap = { ...uploadFileDataMap.value };

diff --git a/...ute-objects/RenderData/RenderSql/components/sql-content/components/manual-input/Index.vue b/...ute-objects/RenderData/RenderSql/components/sql-content/components/manual-input/Index.vue
@@ -102,6 +102,7 @@
 
   interface Props {
     clusterVersionList: string[];
+    clusterType: 'mysql' | 'tendbcluster';
   }
 
   interface Emits {
@@ -228,6 +229,7 @@
     props.clusterVersionList.forEach((version, index) => {
       params.append(`versions[${index}]`, version);
     });
+    params.append('cluster_type', props.clusterType);
 
     grammarCheck(params)
       .then((data) => {

diff --git a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/execute-objects/RenderData/Row.vue b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/execute-objects/RenderData/Row.vue
@@ -29,6 +29,7 @@
           ref="sqlFielsRef"
           v-model="localSqlFiles"
           v-model:importMode="localImportMode"
+          :cluster-type="clusterType"
           :cluster-version-list="clusterVersionList"
           :db-names="localDbnames"
           :ignore-db-names="localIgnoreDbnames" />
@@ -75,6 +76,7 @@
     data: IDataRow;
     removeable: boolean;
     clusterVersionList: string[];
+    clusterType: 'mysql' | 'tendbcluster';
   }
   interface Emits {
     (e: 'add' | 'change', params: IDataRow): void;

diff --git a/dbm-ui/frontend/src/views/mysql/sql-execute/steps/step1/Index.vue b/dbm-ui/frontend/src/views/mysql/sql-execute/steps/step1/Index.vue
@@ -27,6 +27,7 @@
             :cluster-type-list="[ClusterTypes.TENDBHA, ClusterTypes.TENDBSINGLE]" />
           <ExecuteObjects
             v-model="formData.execute_objects"
+            cluster-type="mysql"
             :cluster-version-list="clusterVersionList"
             style="margin-top: 16px" />
           <RenderCharset v-model="formData.charset" />

diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/Index.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/Index.vue
@@ -27,6 +27,7 @@
             :cluster-type-list="[ClusterTypes.TENDBCLUSTER]" />
           <ExecuteObjects
             v-model="formData.execute_objects"
+            cluster-type="tendbcluster"
             :cluster-version-list="clusterVersionList"
             style="margin-top: 16px" />
           <RenderCharset v-model="formData.charset" />