Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Sep 6, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dbm-ui/frontend/src/views/db-manage/common/sql-execute/execute-objects/Index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -41,6 +42,7 @@

interface Props {
clusterVersionList: string[];
clusterType: 'mysql' | 'tendbcluster';
}

defineProps<Props>();
Expand Down
2 changes: 2 additions & 0 deletions ...end/src/views/db-manage/common/sql-execute/execute-objects/RenderData/RenderSql/Index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -58,6 +59,7 @@
clusterVersionList: string[];
dbNames: string[];
ignoreDbNames: string[];
clusterType: 'mysql' | 'tendbcluster';
}

interface Expose {
Expand Down
2 changes: 2 additions & 0 deletions .../common/sql-execute/execute-objects/RenderData/RenderSql/components/sql-content/Index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
:is="renderCom"
ref="fileRef"
v-model="localModelValue"
:cluster-type="clusterType"
v-bind="attrs"
:cluster-version-list="clusterVersionList"
@grammar-check="handleGrammarCheck" />
Expand Down Expand Up @@ -73,6 +74,7 @@

interface Props {
clusterVersionList: string[];
clusterType: 'mysql' | 'tendbcluster';
}

defineProps<Props>();
Expand Down
3 changes: 3 additions & 0 deletions ...ecute-objects/RenderData/RenderSql/components/sql-content/components/local-file/Index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@

interface Props {
clusterVersionList: string[];
clusterType: 'mysql' | 'tendbcluster';
}

interface Emits {
Expand Down Expand Up @@ -224,6 +225,8 @@
params.append(`versions[${index}]`, version);
});

params.append('cluster_type', props.clusterType);

grammarCheck(params)
.then((data) => {
const lastUploadFileDataMap = { ...uploadFileDataMap.value };
Expand Down
2 changes: 2 additions & 0 deletions ...ute-objects/RenderData/RenderSql/components/sql-content/components/manual-input/Index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@

interface Props {
clusterVersionList: string[];
clusterType: 'mysql' | 'tendbcluster';
}

interface Emits {
Expand Down Expand Up @@ -228,6 +229,7 @@
props.clusterVersionList.forEach((version, index) => {
params.append(`versions[${index}]`, version);
});
params.append('cluster_type', props.clusterType);

grammarCheck(params)
.then((data) => {
Expand Down
2 changes: 2 additions & 0 deletions dbm-ui/frontend/src/views/db-manage/common/sql-execute/execute-objects/RenderData/Row.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -75,6 +76,7 @@
data: IDataRow;
removeable: boolean;
clusterVersionList: string[];
clusterType: 'mysql' | 'tendbcluster';
}
interface Emits {
(e: 'add' | 'change', params: IDataRow): void;
Expand Down
1 change: 1 addition & 0 deletions dbm-ui/frontend/src/views/mysql/sql-execute/steps/step1/Index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
1 change: 1 addition & 0 deletions dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/Index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading