Skip to content

[fix]: Provide default SQL when SQL formatting is not supported #778

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

Merged
LZS911 merged 1 commit into from
Dec 10, 2025
Merged

[fix]: Provide default SQL when SQL formatting is not supported #778

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
46 changes: 46 additions & 0 deletions ...ase/src/page/DataExportManagement/Create/hooks/__tests__/useCreateExportTaskForm.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,52 @@ describe('test base/DataExport/Create/hooks/useCreateExportTaskForm', () => {
);
});

it('should use sql when language is not supported and originSql is empty in auditAction', async () => {
(isSupportLanguage as jest.Mock).mockImplementation(() => false);
const addDataExportTaskSpy = dataExport.AddDataExportTask();
const updateAuditLoadingSpy = jest.fn();
const updateFormValuesSpy = jest.fn();
const updateTaskIDsSpy = jest.fn();

mockUseCreateDataExportReduxManage({
auditLoading: false,
updateAuditLoading: updateAuditLoadingSpy,
updateFormValues: updateFormValuesSpy,
updateTaskIDs: updateTaskIDsSpy
});

const { result } = renderHook(() => useCreateExportTaskForm());

render(<CustomCom {...result.current} dbType="unsupported_db" />);
fireEvent.change(screen.getByLabelText('name'), {
target: { value: 'name' }
});
fireEvent.change(screen.getByLabelText('dbService'), {
target: { value: '100' }
});
fireEvent.change(screen.getByLabelText('schema'), {
target: { value: 'schema' }
});
fireEvent.change(screen.getByLabelText('sql'), {
target: { value: 'select 1;' }
});

fireEvent.click(screen.getByText('auditAction'));
await act(async () => jest.advanceTimersByTime(0));

expect(addDataExportTaskSpy).toHaveBeenCalledWith({
project_uid: mockProjectInfo.projectID,
data_export_tasks: [
{
database_name: 'schema',
db_service_uid: '100',
export_sql: 'select 1;'
}
]
});
await act(async () => jest.advanceTimersByTime(3000));
});

it('should rest all forms when executed "resetAllForm"', async () => {
const { result } = renderHook(() => useCreateExportTaskForm());

Expand Down
11 changes: 7 additions & 4 deletions packages/base/src/page/DataExportManagement/Create/hooks/useCreateExportTaskForm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,19 @@ const useCreateExportTaskForm = () => {

updateAuditLoading(true);

const sql = isSupportLanguage(sourceValues.dbType)
? methodValues.sql
: methodValues.originSql;
const getSql = () => {
if (isSupportLanguage(sourceValues.dbType)) {
return methodValues.sql;
}
return methodValues.originSql || methodValues.sql;
};
return DataExportTask.AddDataExportTask({
project_uid: projectID,
data_export_tasks: [
{
database_name: sourceValues.schema,
db_service_uid: sourceValues.dbService,
export_sql: sql
export_sql: getSql()
}
]
})
Expand Down
50 changes: 50 additions & 0 deletions packages/sqle/src/page/SqlAudit/Create/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,56 @@ describe('sqle/SqlAudit/Create', () => {
expect(navigateSpy).toHaveBeenCalledTimes(1);
});

it('should use sql when language is not supported and originSql is empty', async () => {
getInstanceSpy.mockImplementation(() =>
createSpySuccessResponse({
data: {
db_type: 'TiDB'
}
})
);
const { baseElement } = sqleSuperRender(customRender());
await act(async () => jest.advanceTimersByTime(3000));

fireEvent.mouseDown(getBySelector('#instanceName', baseElement));
await act(async () => jest.advanceTimersByTime(300));
fireEvent.click(
getBySelector('div[title="tidb-1(10.186.62.17:4000)"]', baseElement)
);
await act(async () => jest.advanceTimersByTime(3000));

fireEvent.mouseDown(getBySelector('#instanceSchema', baseElement));
await act(async () => jest.advanceTimersByTime(0));
fireEvent.click(getBySelector('div[title="testSchema"]', baseElement));
await act(async () => jest.advanceTimersByTime(0));

const sqlEditor = queryBySelector('.custom-monaco-editor', baseElement)!;
const sqlValue = 'SELECT * FROM test;';
await act(async () => {
fireEvent.input(sqlEditor, {
target: { value: sqlValue }
});
await jest.advanceTimersByTime(100);
});

fireEvent.click(screen.getByText('审 核'));
await act(async () => jest.advanceTimersByTime(3000));

expect(createSQLAuditRecordSpy).toHaveBeenCalledWith({
db_type: undefined,
git_http_url: undefined,
git_user_name: undefined,
git_user_password: undefined,
input_mybatis_xml_file: undefined,
input_sql_file: undefined,
input_zip_file: undefined,
instance_name: 'tidb-1',
instance_schema: 'testSchema',
project_name: 'default',
sqls: sqlValue
});
});

it('create business tags', async () => {
const { baseElement } = sqleSuperRender(customRender());
await act(async () => jest.advanceTimersByTime(3000));
Expand Down
12 changes: 7 additions & 5 deletions packages/sqle/src/page/SqlAudit/Create/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ const SqlAuditCreate = () => {
const [auditLoading, setAuditLoading] = useState(false);
const auditSQL: SQLInfoFormProps['submit'] = async (values) => {
const baseValues = await baseForm.validateFields();
const sql = isSupportLanguage(values.dbType)
? values.sql
: values.originSql;

const getSql = () => {
if (isSupportLanguage(values.dbType)) {
return values.sql;
}
return values.originSql || values.sql;
};
const params: ICreateSQLAuditRecordV1Params = {
project_name: projectName,
sqls: sql,
sqls: getSql(),
input_sql_file: values.sqlFile?.[0],
input_mybatis_xml_file: values.mybatisFile?.[0],
input_zip_file: values.zipFile?.[0],
Expand Down
57 changes: 57 additions & 0 deletions packages/sqle/src/page/SqlOptimization/Create/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,63 @@ describe('sqle/SqlOptimization/Create', () => {
).toBeInTheDocument();
});

it('should use sql when language is not supported and originSql is empty', async () => {
const { baseElement } = sqleSuperRender(customRender());
await act(async () => jest.advanceTimersByTime(3000));

fireEvent.mouseDown(getBySelector('#instanceName', baseElement));
await act(async () => jest.advanceTimersByTime(300));
fireEvent.click(
getBySelector('div[title="tidb-1(10.186.62.17:4000)"]', baseElement)
);
await act(async () => jest.advanceTimersByTime(3000));

fireEvent.mouseDown(getBySelector('#instanceSchema', baseElement));
await act(async () => jest.advanceTimersByTime(300));
fireEvent.click(getBySelector('div[title="testSchema"]', baseElement));
await act(async () => jest.advanceTimersByTime(300));

const sqlEditor = queryBySelector('.custom-monaco-editor', baseElement)!;
const sqlValue = 'SELECT * FROM test;';
await act(async () => {
fireEvent.input(sqlEditor, {
target: { value: sqlValue }
});
await jest.advanceTimersByTime(100);
});

fireEvent.click(getBySelector('.create-optimization-button'));
await act(async () => jest.advanceTimersByTime(0));

expect(optimizeSQLReqSpy).toHaveBeenCalledWith({
optimization_name: 'UI20240101120000000',
git_http_url: undefined,
git_user_name: undefined,
git_user_password: undefined,
input_mybatis_xml_file: undefined,
input_sql_file: undefined,
input_zip_file: undefined,
instance_name: 'tidb-1',
schema_name: 'testSchema',
project_name: mockProjectInfo.projectName,
sql_content: sqlValue,
db_type: 'TiDB',
metadata: undefined,
explain_info: undefined
});
await act(async () => jest.advanceTimersByTime(3000));
expect(mockDispatch).toHaveBeenCalledTimes(2);
expect(mockDispatch).toHaveBeenCalledWith({
type: 'sqlOptimization/updateSubmitLoading',
payload: {
loading: false
}
});
expect(
screen.getByText('优化进行中，预计5-10分钟后完成。感谢您的耐心等待。')
).toBeInTheDocument();
});

it('reset form values', async () => {
const { baseElement } = sqleSuperRender(customRender());
await act(async () => jest.advanceTimersByTime(3000));
Expand Down
12 changes: 8 additions & 4 deletions packages/sqle/src/page/SqlOptimization/Create/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,21 @@ const SqlOptimizationCreate = () => {
sqlInfoValue.optimizationType === OptimizationTypeEnum.online
? sqlInfoValue.sql
: sqlInfoValue.offlineSql;
const sql = isSupportLanguage(sqlInfoValue.dbType)
? formattedSql
: sqlInfoValue.originSql;

const getSql = () => {
if (isSupportLanguage(sqlInfoValue.dbType)) {
return formattedSql;
}
return sqlInfoValue.originSql || formattedSql;
};
sqlOptimization
.SQLOptimizeV2({
optimization_name: baseValue.optimizationName,
project_name: projectName,
instance_name: sqlInfoValue.instanceName,
schema_name: sqlInfoValue.instanceSchema,
db_type: sqlInfoValue.dbType,
sql_content: sql,
sql_content: getSql(),
metadata: sqlInfoValue.tableStructure,
explain_info: sqlInfoValue.executionPlan,
input_sql_file: sqlInfoValue.sqlFile?.[0],
Expand Down