From c70a390b62c2de5f0616b7ef8d3f8a322ef89589 Mon Sep 17 00:00:00 2001 From: xinbinyan <404928130@qq.com> Date: Thu, 25 Jan 2024 18:20:21 +0800 Subject: [PATCH 1/2] upgrade render sql com --- packages/sqle/src/components/RenderSQL/index.tsx | 2 +- .../page/AuditPlan/PlanDetail/DetailCom/index.tsx | 15 +++++---------- .../SqlAnalyze/ProcessListCom/index.tsx | 15 +++++++-------- .../sqle/src/page/SqlAnalyze/SqlAnalyze/style.ts | 6 +----- .../page/SqlAnalyze/SqlAnalyze/useSQLExecPlan.tsx | 8 ++------ .../page/SqlAnalyze/SqlAnalyze/useTableSchema.tsx | 10 ++-------- .../SqlManagement/component/SQLEEIndex/column.tsx | 1 - 7 files changed, 18 insertions(+), 39 deletions(-) diff --git a/packages/sqle/src/components/RenderSQL/index.tsx b/packages/sqle/src/components/RenderSQL/index.tsx index 1928f060d..0e0efa82f 100644 --- a/packages/sqle/src/components/RenderSQL/index.tsx +++ b/packages/sqle/src/components/RenderSQL/index.tsx @@ -8,7 +8,7 @@ import { RenderSQLStyleWrapper } from './style'; const RenderSQL: React.FC = ({ sql, rows = 10, - tooltip, + tooltip = true, onClick }) => { if (!sql) { diff --git a/packages/sqle/src/page/AuditPlan/PlanDetail/DetailCom/index.tsx b/packages/sqle/src/page/AuditPlan/PlanDetail/DetailCom/index.tsx index 9e8ade77c..aa1b00f5d 100644 --- a/packages/sqle/src/page/AuditPlan/PlanDetail/DetailCom/index.tsx +++ b/packages/sqle/src/page/AuditPlan/PlanDetail/DetailCom/index.tsx @@ -16,9 +16,10 @@ import audit_plan from '@actiontech/shared/lib/api/sqle/service/audit_plan'; import { IAuditPlanSQLHeadV1 } from '@actiontech/shared/lib/api/sqle/service/common'; import { AuditPlanSQLHeadV1TypeEnum } from '@actiontech/shared/lib/api/sqle/service/common.enum'; import { formatTime } from '@actiontech/shared/lib/utils/Common'; -import HighlightCode from '../../../../utils/HighlightCode'; import { useTableRequestParams } from '@actiontech/shared/lib/components/ActiontechTable'; +import RenderSQL from '../../../../components/RenderSQL'; + const DetailCom = () => { const { t } = useTranslation(); @@ -71,18 +72,12 @@ const DetailCom = () => { (head as IAuditPlanSQLHeadV1[]).map((item) => ({ title: item.desc, dataIndex: item.name, - width: item.type === AuditPlanSQLHeadV1TypeEnum.sql ? 300 : 'auto', + width: item.type === AuditPlanSQLHeadV1TypeEnum.sql ? 500 : 'auto', render: (text) => { if (item.type === AuditPlanSQLHeadV1TypeEnum.sql) { - // todo: RenderSQL return ( -
-

+                  
+
); } diff --git a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/ProcessListCom/index.tsx b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/ProcessListCom/index.tsx index 9f05215af..54a3ad46f 100644 --- a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/ProcessListCom/index.tsx +++ b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/ProcessListCom/index.tsx @@ -1,6 +1,6 @@ import { BasicTable, EmptyBox } from '@actiontech/shared'; import BasicEmpty from '@actiontech/shared/lib/components/BasicEmpty'; -import HighlightCode from '../../../../utils/HighlightCode'; +import RenderSQL from '../../../../components/RenderSQL'; import { ProcessListComStyleWrapper } from './style'; @@ -28,14 +28,13 @@ const ProcessListCom = () => {

SQL语句

}> -
+            
+WHERE ID != connection_id() AND info != '' AND db NOT IN ('information_schema','performance_schema','mysql','sys')`}
+            />
+          
diff --git a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/style.ts b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/style.ts index d9abc1ea0..f2db374ed 100644 --- a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/style.ts +++ b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/style.ts @@ -28,16 +28,12 @@ export const SqlContStyleWrapper = styled('section')` } .basic-cont-wrapper { + height: auto; min-height: 100px; } .sql-cont { padding: 24px 40px; - - pre { - width: 100%; - white-space: pre-wrap; - } } .line-wrapper { diff --git a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/useSQLExecPlan.tsx b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/useSQLExecPlan.tsx index 6068a4d76..e4496522e 100644 --- a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/useSQLExecPlan.tsx +++ b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/useSQLExecPlan.tsx @@ -2,11 +2,11 @@ import { Space } from 'antd'; import { useTranslation } from 'react-i18next'; import { EmptyBox, BasicTable, BasicResult } from '@actiontech/shared'; import useBackendTable from '../../../hooks/useBackendTable/useBackendTable1'; -import HighlightCode from '../../../utils/HighlightCode'; import { SQLExecPlanItem } from './index.type'; import { IPerformanceStatistics } from '@actiontech/shared/lib/api/sqle/service/common.d'; import { IconSqlLine } from '@actiontech/shared/lib/Icon/common'; import { formatParamsBySeparator } from '@actiontech/shared/lib/utils/Tool'; +import RenderSQL from '../../../components/RenderSQL'; const useSQLExecPlan = () => { const { t } = useTranslation(); @@ -25,11 +25,7 @@ const useSQLExecPlan = () => { <>

{t('sqlQuery.executePlan.sql')}

-
+            
           
); diff --git a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/useTableSchema.tsx b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/useTableSchema.tsx index ac5d3ac75..81602b014 100644 --- a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/useTableSchema.tsx +++ b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/useTableSchema.tsx @@ -5,11 +5,11 @@ import { useTranslation } from 'react-i18next'; import { TableSchemaItem, UseTableSchemaOption } from '.'; import { ResponseCode } from '../../../data/common'; import useBackendTable from '../../../hooks/useBackendTable/useBackendTable1'; -import HighlightCode from '../../../utils/HighlightCode'; import instance from '@actiontech/shared/lib/api/sqle/service/instance'; import { EmptyBox, BasicTable, BasicResult } from '@actiontech/shared'; import Icon from '@ant-design/icons/lib/components/Icon'; import { IconError } from '@actiontech/shared/lib/Icon'; +import RenderSQL from '../../../components/RenderSQL'; const useTableSchema = (options?: UseTableSchemaOption) => { const { t } = useTranslation(); @@ -105,13 +105,7 @@ const useTableSchema = (options?: UseTableSchemaOption) => { {t('sqlQuery.databaseTables.createdTableSql')}
-
+            
           
); diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/column.tsx b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/column.tsx index cd063fcf2..9a392e576 100644 --- a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/column.tsx +++ b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/column.tsx @@ -186,7 +186,6 @@ const SqlManagementColumn: ( onClick={() => openModal(ModalName.View_Audit_Result_Drawer, record) } - tooltip={true} sql={sql_fingerprint} rows={2} /> From 34a438fb31919305b4788218d706fba6013a6357 Mon Sep 17 00:00:00 2001 From: xinbinyan <404928130@qq.com> Date: Thu, 25 Jan 2024 19:24:37 +0800 Subject: [PATCH 2/2] upgrade snap --- .../__snapshots__/index.test.tsx.snap | 1732 ++++---- .../Order/__snapshots__/index.test.tsx.snap | 3527 +++++++++-------- .../__snapshots__/SqlAnalyze.test.tsx.snap | 1805 +++++---- .../useSQLExecPlan.test.tsx.snap | 48 +- .../useTableSchema.test.tsx.snap | 66 +- .../__snapshots__/index.test.tsx.snap | 3527 +++++++++-------- 6 files changed, 5572 insertions(+), 5133 deletions(-) diff --git a/packages/sqle/src/page/SqlAnalyze/AuditPlan/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlAnalyze/AuditPlan/__snapshots__/index.test.tsx.snap index 8b7cb31ac..70c4e9da9 100644 --- a/packages/sqle/src/page/SqlAnalyze/AuditPlan/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlAnalyze/AuditPlan/__snapshots__/index.test.tsx.snap @@ -57,7 +57,7 @@ exports[`SqlAnalyze/AuditPlan should get analyze data from origin 1`] = ` class="tab-cont-wrapper" >
-
+                    
+                      -
+                    
                   
-
-                      
-                        CREATE
-                      
-                       
-                      
+                      
- TABLE - - \`global_configuration_ldap\` ( + + + CREATE + + + + TABLE + + \`global_configuration_ldap\` ( \`id\` - - int - - ( - - 10 - - ) unsigned - - NOT - - - - NULL - - AUTO_INCREMENT, + + int + + ( + + 10 + + ) unsigned + + NOT + + + + NULL + + AUTO_INCREMENT, \`created_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + , \`updated_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - - - ON - - - - UPDATE - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + + + ON + + + + UPDATE + + + + CURRENT_TIMESTAMP + + , \`deleted_at\` datetime - - DEFAULT - - - - NULL - - , + + DEFAULT + + + + NULL + + , \`enable\` tinyint( - - 1 - - ) - - NOT - - - - NULL - - , + + 1 + + ) + + NOT + + + + NULL + + , \`enable_ssl\` tinyint( - - 1 - - ) - - NOT - - - - NULL - - , + + 1 + + ) + + NOT + + + + NULL + + , \`host\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`port\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`connect_dn\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`connect_secret_password\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`base_dn\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`user_name_rdn_key\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`user_email_rdn_key\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , - - PRIMARY - - KEY (\`id\`), + + PRIMARY + + KEY (\`id\`), KEY \`idx_global_configuration_ldap_deleted_at\` (\`deleted_at\`) ) ENGINE - - = - - InnoDB - - DEFAULT - - CHARSET - - = - - utf8mb4 - - COLLATE - - + = + + InnoDB + + DEFAULT + + CHARSET + + = + + utf8mb4 + + COLLATE + + + = + + utf8mb4_unicode_ci + +
+
- = - - utf8mb4_unicode_ci -
+ + + +
+
@@ -5391,492 +5424,523 @@ exports[`SqlAnalyze/AuditPlan should get analyze data from origin 2`] = `
-
-                      
-                        CREATE
-                      
-                       
-                      
+                      
- TABLE - - \`execute_sql_detail\` ( + + + CREATE + + + + TABLE + + \`execute_sql_detail\` ( \`id\` - - int - - ( - - 10 - - ) unsigned - - NOT - - - - NULL - - AUTO_INCREMENT, + + int + + ( + + 10 + + ) unsigned + + NOT + + + + NULL + + AUTO_INCREMENT, \`created_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + , \`updated_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - - - ON - - - - UPDATE - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + + + ON + + + + UPDATE + + + + CURRENT_TIMESTAMP + + , \`deleted_at\` datetime - - DEFAULT - - - - NULL - - , + + DEFAULT + + + + NULL + + , \`task_id\` - - int - - ( - - 10 - - ) unsigned - - DEFAULT - - - - NULL - - , + + int + + ( + + 10 + + ) unsigned + + DEFAULT + + + + NULL + + , \`number\` - - int - - ( - - 10 - - ) unsigned - - DEFAULT - - - - NULL - - , + + int + + ( + + 10 + + ) unsigned + + DEFAULT + + + + NULL + + , \`content\` longtext - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`description\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`start_binlog_file\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`start_binlog_pos\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`end_binlog_file\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`end_binlog_pos\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`row_affects\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`exec_status\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - 'initialized' - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + 'initialized' + + , \`exec_result\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`audit_status\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - 'initialized' - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + 'initialized' + + , \`audit_result\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`audit_fingerprint\` - - char - - ( - - 32 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + char + + ( + + 32 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`audit_level\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , - - PRIMARY - - KEY (\`id\`), + + PRIMARY + + KEY (\`id\`), KEY \`idx_execute_sql_detail_deleted_at\` (\`deleted_at\`), KEY \`idx_execute_sql_detail_task_id\` (\`task_id\`), KEY \`idx_execute_sql_detail_audit_fingerprint\` (\`audit_fingerprint\`) ) ENGINE - - = - - InnoDB AUTO_INCREMENT - - = - - - 4 - - - - DEFAULT - - CHARSET - - = - - utf8mb4 - - COLLATE - - + = + + InnoDB AUTO_INCREMENT + + = + + + 4 + + + + DEFAULT + + CHARSET + + = + + utf8mb4 + + COLLATE + + + = + + utf8mb4_unicode_ci + +
+
- = - - utf8mb4_unicode_ci -
+ + + + +
diff --git a/packages/sqle/src/page/SqlAnalyze/Order/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlAnalyze/Order/__snapshots__/index.test.tsx.snap index ba5858c39..241ee734a 100644 --- a/packages/sqle/src/page/SqlAnalyze/Order/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlAnalyze/Order/__snapshots__/index.test.tsx.snap @@ -81,7 +81,7 @@ exports[`SqlAnalyze/Order should get analyze data from origin 1`] = ` class="tab-cont-wrapper" >
-
+                    
+                      -
+                    
                   
-
-                      
-                        SELECT
-                      
-                       
-                      
+                      
- * - - - + + SELECT + + + + * + + + + from + + tasks; + +
+
- from - - tasks; -
+ + + +
+
-
-                      
-                        CREATE
-                      
-                       
-                      
+                      
- TABLE - - \`global_configuration_ldap\` ( + + + CREATE + + + + TABLE + + \`global_configuration_ldap\` ( \`id\` - - int - - ( - - 10 - - ) unsigned - - NOT - - - - NULL - - AUTO_INCREMENT, + + int + + ( + + 10 + + ) unsigned + + NOT + + + + NULL + + AUTO_INCREMENT, \`created_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + , \`updated_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - - - ON - - - - UPDATE - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + + + ON + + + + UPDATE + + + + CURRENT_TIMESTAMP + + , \`deleted_at\` datetime - - DEFAULT - - - - NULL - - , + + DEFAULT + + + + NULL + + , \`enable\` tinyint( - - 1 - - ) - - NOT - - - - NULL - - , + + 1 + + ) + + NOT + + + + NULL + + , \`enable_ssl\` tinyint( - - 1 - - ) - - NOT - - - - NULL - - , + + 1 + + ) + + NOT + + + + NULL + + , \`host\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`port\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`connect_dn\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`connect_secret_password\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`base_dn\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`user_name_rdn_key\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`user_email_rdn_key\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , - - PRIMARY - - KEY (\`id\`), + + PRIMARY + + KEY (\`id\`), KEY \`idx_global_configuration_ldap_deleted_at\` (\`deleted_at\`) ) ENGINE - - = - - InnoDB - - DEFAULT - - CHARSET - - = - - utf8mb4 - - COLLATE - - + = + + InnoDB + + DEFAULT + + CHARSET + + = + + utf8mb4 + + COLLATE + + + = + + utf8mb4_unicode_ci + +
+
- = - - utf8mb4_unicode_ci -
+ + + +
+ @@ -5842,492 +5906,523 @@ exports[`SqlAnalyze/Order should get analyze data from origin 2`] = `
-
-                      
-                        CREATE
-                      
-                       
-                      
+                      
- TABLE - - \`execute_sql_detail\` ( + + + CREATE + + + + TABLE + + \`execute_sql_detail\` ( \`id\` - - int - - ( - - 10 - - ) unsigned - - NOT - - - - NULL - - AUTO_INCREMENT, + + int + + ( + + 10 + + ) unsigned + + NOT + + + + NULL + + AUTO_INCREMENT, \`created_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + , \`updated_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - - - ON - - - - UPDATE - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + + + ON + + + + UPDATE + + + + CURRENT_TIMESTAMP + + , \`deleted_at\` datetime - - DEFAULT - - - - NULL - - , + + DEFAULT + + + + NULL + + , \`task_id\` - - int - - ( - - 10 - - ) unsigned - - DEFAULT - - - - NULL - - , + + int + + ( + + 10 + + ) unsigned + + DEFAULT + + + + NULL + + , \`number\` - - int - - ( - - 10 - - ) unsigned - - DEFAULT - - - - NULL - - , + + int + + ( + + 10 + + ) unsigned + + DEFAULT + + + + NULL + + , \`content\` longtext - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`description\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`start_binlog_file\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`start_binlog_pos\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`end_binlog_file\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`end_binlog_pos\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`row_affects\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , - \`exec_status\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - 'initialized' - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , + \`exec_status\` + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + 'initialized' + + , \`exec_result\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`audit_status\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - 'initialized' - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + 'initialized' + + , \`audit_result\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`audit_fingerprint\` - - char - - ( - - 32 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + char + + ( + + 32 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`audit_level\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , - - PRIMARY - - KEY (\`id\`), + + PRIMARY + + KEY (\`id\`), KEY \`idx_execute_sql_detail_deleted_at\` (\`deleted_at\`), KEY \`idx_execute_sql_detail_task_id\` (\`task_id\`), KEY \`idx_execute_sql_detail_audit_fingerprint\` (\`audit_fingerprint\`) ) ENGINE - - = - - InnoDB AUTO_INCREMENT - - = - - - 4 - - - - DEFAULT - - CHARSET - - = - - utf8mb4 - - COLLATE - - + = + + InnoDB AUTO_INCREMENT + + = + + + 4 + + + + DEFAULT + + CHARSET + + = + + utf8mb4 + + COLLATE + + + = + + utf8mb4_unicode_ci + +
+
- = - - utf8mb4_unicode_ci -
+ + + + +
@@ -6425,7 +6520,7 @@ exports[`SqlAnalyze/Order should get analyze data from origin 3`] = ` class="tab-cont-wrapper" >
-
-                      
-                        CREATE
-                      
-                       
-                      
+                      
- TABLE - - \`global_configuration_ldap\` ( + + + CREATE + + + + TABLE + + \`global_configuration_ldap\` ( \`id\` - - int - - ( - - 10 - - ) unsigned - - NOT - - - - NULL - - AUTO_INCREMENT, + + int + + ( + + 10 + + ) unsigned + + NOT + + + + NULL + + AUTO_INCREMENT, \`created_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + , \`updated_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - - - ON - - - - UPDATE - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + + + ON + + + + UPDATE + + + + CURRENT_TIMESTAMP + + , \`deleted_at\` datetime - - DEFAULT - - - - NULL - - , + + DEFAULT + + + + NULL + + , \`enable\` tinyint( - - 1 - - ) - - NOT - - - - NULL - - , + + 1 + + ) + + NOT + + + + NULL + + , \`enable_ssl\` tinyint( - - 1 - - ) - - NOT - - - - NULL - - , + + 1 + + ) + + NOT + + + + NULL + + , \`host\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`port\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`connect_dn\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`connect_secret_password\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`base_dn\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`user_name_rdn_key\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`user_email_rdn_key\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , - - PRIMARY - - KEY (\`id\`), + + PRIMARY + + KEY (\`id\`), KEY \`idx_global_configuration_ldap_deleted_at\` (\`deleted_at\`) ) ENGINE - - = - - InnoDB - - DEFAULT - - CHARSET - - = - - utf8mb4 - - COLLATE - - + = + + InnoDB + + DEFAULT + + CHARSET + + = + + utf8mb4 + + COLLATE + + + = + + utf8mb4_unicode_ci + +
+
- = - - utf8mb4_unicode_ci -
+ + + +
+
@@ -11477,492 +11603,523 @@ exports[`SqlAnalyze/Order should get analyze data from origin 3`] = `
-
-                      
-                        CREATE
-                      
-                       
-                      
+                      
- TABLE - - \`execute_sql_detail\` ( + + + CREATE + + + + TABLE + + \`execute_sql_detail\` ( \`id\` - - int - - ( - - 10 - - ) unsigned - - NOT - - - - NULL - - AUTO_INCREMENT, + + int + + ( + + 10 + + ) unsigned + + NOT + + + + NULL + + AUTO_INCREMENT, \`created_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + , \`updated_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - - - ON - - - - UPDATE - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + + + ON + + + + UPDATE + + + + CURRENT_TIMESTAMP + + , \`deleted_at\` datetime - - DEFAULT - - - - NULL - - , + + DEFAULT + + + + NULL + + , \`task_id\` - - int - - ( - - 10 - - ) unsigned - - DEFAULT - - - - NULL - - , + + int + + ( + + 10 + + ) unsigned + + DEFAULT + + + + NULL + + , \`number\` - - int - - ( - - 10 - - ) unsigned - - DEFAULT - - - - NULL - - , + + int + + ( + + 10 + + ) unsigned + + DEFAULT + + + + NULL + + , \`content\` longtext - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`description\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`start_binlog_file\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`start_binlog_pos\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`end_binlog_file\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`end_binlog_pos\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`row_affects\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`exec_status\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - 'initialized' - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + 'initialized' + + , \`exec_result\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`audit_status\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - 'initialized' - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + 'initialized' + + , \`audit_result\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`audit_fingerprint\` - - char - - ( - - 32 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + char + + ( + + 32 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`audit_level\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , - - PRIMARY - - KEY (\`id\`), + + PRIMARY + + KEY (\`id\`), KEY \`idx_execute_sql_detail_deleted_at\` (\`deleted_at\`), KEY \`idx_execute_sql_detail_task_id\` (\`task_id\`), KEY \`idx_execute_sql_detail_audit_fingerprint\` (\`audit_fingerprint\`) ) ENGINE - - = - - InnoDB AUTO_INCREMENT - - = - - - 4 - - - - DEFAULT - - CHARSET - - = - - utf8mb4 - - COLLATE - - + = + + InnoDB AUTO_INCREMENT + + = + + + 4 + + + + DEFAULT + + CHARSET + + = + + utf8mb4 + + COLLATE + + + = + + utf8mb4_unicode_ci + +
+
- = - - utf8mb4_unicode_ci -
+ + + + +
diff --git a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/test/__snapshots__/SqlAnalyze.test.tsx.snap b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/test/__snapshots__/SqlAnalyze.test.tsx.snap index c331db77f..ddaf8028f 100644 --- a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/test/__snapshots__/SqlAnalyze.test.tsx.snap +++ b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/test/__snapshots__/SqlAnalyze.test.tsx.snap @@ -58,7 +58,7 @@ exports[`SqlAnalyze/Global-SqlAnalyze render snap when data is empty 1`] = ` class="tab-cont-wrapper" >
-
+                      
+                        -
+                      
                     
-
+                      
+                        -
+                      
                     
-
-                        
-                          SELECT
-                        
-                         
-                        
+                        
- * - - - + + SELECT + + + + * + + + + from + + tasks; + +
+
- from - - tasks; -
+ + + +
+
-
-                        
-                          CREATE
-                        
-                         
-                        
+                        
- TABLE - - \`global_configuration_ldap\` ( + + + CREATE + + + + TABLE + + \`global_configuration_ldap\` ( \`id\` - - int - - ( - - 10 - - ) unsigned - - NOT - - - - NULL - - AUTO_INCREMENT, + + int + + ( + + 10 + + ) unsigned + + NOT + + + + NULL + + AUTO_INCREMENT, \`created_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + , \`updated_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - - - ON - - - - UPDATE - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + + + ON + + + + UPDATE + + + + CURRENT_TIMESTAMP + + , \`deleted_at\` datetime - - DEFAULT - - - - NULL - - , + + DEFAULT + + + + NULL + + , \`enable\` tinyint( - - 1 - - ) - - NOT - - - - NULL - - , + + 1 + + ) + + NOT + + + + NULL + + , \`enable_ssl\` tinyint( - - 1 - - ) - - NOT - - - - NULL - - , + + 1 + + ) + + NOT + + + + NULL + + , \`host\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`port\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`connect_dn\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`connect_secret_password\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`base_dn\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`user_name_rdn_key\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`user_email_rdn_key\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , - - PRIMARY - - KEY (\`id\`), + + PRIMARY + + KEY (\`id\`), KEY \`idx_global_configuration_ldap_deleted_at\` (\`deleted_at\`) ) ENGINE - - = - - InnoDB - - DEFAULT - - CHARSET - - = - - utf8mb4 - - COLLATE - - + = + + InnoDB + + DEFAULT + + CHARSET + + = + + utf8mb4 + + COLLATE + + + = + + utf8mb4_unicode_ci + +
+
- = - - utf8mb4_unicode_ci -
+ + + +
+ @@ -6280,492 +6346,523 @@ exports[`SqlAnalyze/Global-SqlAnalyze render snap when have data 1`] = `
-
-                        
-                          CREATE
-                        
-                         
-                        
+                        
- TABLE - - \`execute_sql_detail\` ( + + + CREATE + + + + TABLE + + \`execute_sql_detail\` ( \`id\` - - int - - ( - - 10 - - ) unsigned - - NOT - - - - NULL - - AUTO_INCREMENT, + + int + + ( + + 10 + + ) unsigned + + NOT + + + + NULL + + AUTO_INCREMENT, \`created_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + , \`updated_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - - - ON - - - - UPDATE - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + + + ON + + + + UPDATE + + + + CURRENT_TIMESTAMP + + , \`deleted_at\` datetime - - DEFAULT - - - - NULL - - , + + DEFAULT + + + + NULL + + , \`task_id\` - - int - - ( - - 10 - - ) unsigned - - DEFAULT - - - - NULL - - , + + int + + ( + + 10 + + ) unsigned + + DEFAULT + + + + NULL + + , \`number\` - - int - - ( - - 10 - - ) unsigned - - DEFAULT - - - - NULL - - , + + int + + ( + + 10 + + ) unsigned + + DEFAULT + + + + NULL + + , \`content\` longtext - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`description\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`start_binlog_file\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`start_binlog_pos\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`end_binlog_file\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`end_binlog_pos\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`row_affects\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`exec_status\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - 'initialized' - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + 'initialized' + + , \`exec_result\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`audit_status\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - 'initialized' - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + 'initialized' + + , \`audit_result\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`audit_fingerprint\` - - char - - ( - - 32 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + char + + ( + + 32 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`audit_level\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , - - PRIMARY - - KEY (\`id\`), + + PRIMARY + + KEY (\`id\`), KEY \`idx_execute_sql_detail_deleted_at\` (\`deleted_at\`), KEY \`idx_execute_sql_detail_task_id\` (\`task_id\`), KEY \`idx_execute_sql_detail_audit_fingerprint\` (\`audit_fingerprint\`) ) ENGINE - - = - - InnoDB AUTO_INCREMENT - - = - - - 4 - - - - DEFAULT - - CHARSET - - = - - utf8mb4 - - COLLATE - - + = + + InnoDB AUTO_INCREMENT + + = + + + 4 + + + + DEFAULT + + CHARSET + + = + + utf8mb4 + + COLLATE + + + = + + utf8mb4_unicode_ci + +
+
- = - - utf8mb4_unicode_ci -
+ + + + +
diff --git a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/test/__snapshots__/useSQLExecPlan.test.tsx.snap b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/test/__snapshots__/useSQLExecPlan.test.tsx.snap index 73551517b..c12e76d45 100644 --- a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/test/__snapshots__/useSQLExecPlan.test.tsx.snap +++ b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/test/__snapshots__/useSQLExecPlan.test.tsx.snap @@ -15,12 +15,8 @@ exports[`SqlAnalyze/useSQLExecPlan render generateSQLExecPlanContent when have d
-
CREATE TABLE IF NOT EXISTS task (  id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,  title VARCHAR(255) NOT NULL DEFAULT '',  description TEXT,  status ENUM('pending', 'completed') NOT NULL DEFAULT 'pending',  created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,  updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP);",
-          }
-        }
+      
     
@@ -112,12 +108,8 @@ exports[`SqlAnalyze/useSQLExecPlan render generateSQLExecPlanContent when have d
-
     
@@ -289,12 +281,8 @@ exports[`SqlAnalyze/useSQLExecPlan render generateSQLExecPlanContent when have d
-
     
@@ -386,12 +374,8 @@ exports[`SqlAnalyze/useSQLExecPlan render generateSQLExecPlanContent when have d
-
     
@@ -483,12 +467,8 @@ exports[`SqlAnalyze/useSQLExecPlan render generateSQLExecPlanContent when have e
-
     
@@ -580,12 +560,8 @@ exports[`SqlAnalyze/useSQLExecPlan render generateSQLExecPlanContent when have e
-
     
diff --git a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/test/__snapshots__/useTableSchema.test.tsx.snap b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/test/__snapshots__/useTableSchema.test.tsx.snap index 6996e747f..8701ba85b 100644 --- a/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/test/__snapshots__/useTableSchema.test.tsx.snap +++ b/packages/sqle/src/page/SqlAnalyze/SqlAnalyze/test/__snapshots__/useTableSchema.test.tsx.snap @@ -365,36 +365,32 @@ exports[`SqlAnalyze/useTableSchema render generateTableSchemaContent render ele
-
CREATE TABLE \`execute_sql_detail\` (
-  \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  \`created_at\` datetime DEFAULT CURRENT_TIMESTAMP,
-  \`updated_at\` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  \`deleted_at\` datetime DEFAULT NULL,
-  \`task_id\` int(10) unsigned DEFAULT NULL,
-  \`number\` int(10) unsigned DEFAULT NULL,
-  \`content\` longtext COLLATE utf8mb4_unicode_ci,
-  \`description\` text COLLATE utf8mb4_unicode_ci,
-  \`start_binlog_file\` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  \`start_binlog_pos\` bigint(20) DEFAULT NULL,
-  \`end_binlog_file\` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  \`end_binlog_pos\` bigint(20) DEFAULT NULL,
-  \`row_affects\` bigint(20) DEFAULT NULL,
-  \`exec_status\` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT 'initialized',
-  \`exec_result\` text COLLATE utf8mb4_unicode_ci,
-  \`audit_status\` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT 'initialized',
-  \`audit_result\` text COLLATE utf8mb4_unicode_ci,
-  \`audit_fingerprint\` char(32) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  \`audit_level\` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  PRIMARY KEY (\`id\`),
+        =InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
-            }
-          }
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci"
         />
       
@@ -450,12 +446,8 @@ exports[`SqlAnalyze/useTableSchema render generateTableSchemaContent render ele
-
       
@@ -505,12 +497,8 @@ exports[`SqlAnalyze/useTableSchema render generateTableSchemaContent render ele
-
       
diff --git a/packages/sqle/src/page/SqlAnalyze/SqlManage/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlAnalyze/SqlManage/__snapshots__/index.test.tsx.snap index c26cc39be..9c54cd422 100644 --- a/packages/sqle/src/page/SqlAnalyze/SqlManage/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlAnalyze/SqlManage/__snapshots__/index.test.tsx.snap @@ -81,7 +81,7 @@ exports[`SqlAnalyze/SQLManage should get analyze data from origin 1`] = ` class="tab-cont-wrapper" >
-
+                    
+                      -
+                    
                   
-
-                      
-                        SELECT
-                      
-                       
-                      
+                      
- * - - - + + SELECT + + + + * + + + + from + + tasks; + +
+
- from - - tasks; -
+ + + +
+
-
-                      
-                        CREATE
-                      
-                       
-                      
+                      
- TABLE - - \`global_configuration_ldap\` ( + + + CREATE + + + + TABLE + + \`global_configuration_ldap\` ( \`id\` - - int - - ( - - 10 - - ) unsigned - - NOT - - - - NULL - - AUTO_INCREMENT, + + int + + ( + + 10 + + ) unsigned + + NOT + + + + NULL + + AUTO_INCREMENT, \`created_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + , \`updated_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - - - ON - - - - UPDATE - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + + + ON + + + + UPDATE + + + + CURRENT_TIMESTAMP + + , \`deleted_at\` datetime - - DEFAULT - - - - NULL - - , + + DEFAULT + + + + NULL + + , \`enable\` tinyint( - - 1 - - ) - - NOT - - - - NULL - - , + + 1 + + ) + + NOT + + + + NULL + + , \`enable_ssl\` tinyint( - - 1 - - ) - - NOT - - - - NULL - - , + + 1 + + ) + + NOT + + + + NULL + + , \`host\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`port\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`connect_dn\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`connect_secret_password\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`base_dn\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`user_name_rdn_key\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`user_email_rdn_key\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , - - PRIMARY - - KEY (\`id\`), + + PRIMARY + + KEY (\`id\`), KEY \`idx_global_configuration_ldap_deleted_at\` (\`deleted_at\`) ) ENGINE - - = - - InnoDB - - DEFAULT - - CHARSET - - = - - utf8mb4 - - COLLATE - - + = + + InnoDB + + DEFAULT + + CHARSET + + = + + utf8mb4 + + COLLATE + + + = + + utf8mb4_unicode_ci + +
+
- = - - utf8mb4_unicode_ci -
+ + + +
+ @@ -5842,492 +5906,523 @@ exports[`SqlAnalyze/SQLManage should get analyze data from origin 2`] = `
-
-                      
-                        CREATE
-                      
-                       
-                      
+                      
- TABLE - - \`execute_sql_detail\` ( + + + CREATE + + + + TABLE + + \`execute_sql_detail\` ( \`id\` - - int - - ( - - 10 - - ) unsigned - - NOT - - - - NULL - - AUTO_INCREMENT, + + int + + ( + + 10 + + ) unsigned + + NOT + + + + NULL + + AUTO_INCREMENT, \`created_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + , \`updated_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - - - ON - - - - UPDATE - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + + + ON + + + + UPDATE + + + + CURRENT_TIMESTAMP + + , \`deleted_at\` datetime - - DEFAULT - - - - NULL - - , + + DEFAULT + + + + NULL + + , \`task_id\` - - int - - ( - - 10 - - ) unsigned - - DEFAULT - - - - NULL - - , + + int + + ( + + 10 + + ) unsigned + + DEFAULT + + + + NULL + + , \`number\` - - int - - ( - - 10 - - ) unsigned - - DEFAULT - - - - NULL - - , + + int + + ( + + 10 + + ) unsigned + + DEFAULT + + + + NULL + + , \`content\` longtext - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`description\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`start_binlog_file\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`start_binlog_pos\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`end_binlog_file\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`end_binlog_pos\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`row_affects\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , - \`exec_status\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - 'initialized' - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , + \`exec_status\` + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + 'initialized' + + , \`exec_result\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`audit_status\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - 'initialized' - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + 'initialized' + + , \`audit_result\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`audit_fingerprint\` - - char - - ( - - 32 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + char + + ( + + 32 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`audit_level\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , - - PRIMARY - - KEY (\`id\`), + + PRIMARY + + KEY (\`id\`), KEY \`idx_execute_sql_detail_deleted_at\` (\`deleted_at\`), KEY \`idx_execute_sql_detail_task_id\` (\`task_id\`), KEY \`idx_execute_sql_detail_audit_fingerprint\` (\`audit_fingerprint\`) ) ENGINE - - = - - InnoDB AUTO_INCREMENT - - = - - - 4 - - - - DEFAULT - - CHARSET - - = - - utf8mb4 - - COLLATE - - + = + + InnoDB AUTO_INCREMENT + + = + + + 4 + + + + DEFAULT + + CHARSET + + = + + utf8mb4 + + COLLATE + + + = + + utf8mb4_unicode_ci + +
+
- = - - utf8mb4_unicode_ci -
+ + + + +
@@ -6425,7 +6520,7 @@ exports[`SqlAnalyze/SQLManage should get analyze data from origin 3`] = ` class="tab-cont-wrapper" >
-
-                      
-                        CREATE
-                      
-                       
-                      
+                      
- TABLE - - \`global_configuration_ldap\` ( + + + CREATE + + + + TABLE + + \`global_configuration_ldap\` ( \`id\` - - int - - ( - - 10 - - ) unsigned - - NOT - - - - NULL - - AUTO_INCREMENT, + + int + + ( + + 10 + + ) unsigned + + NOT + + + + NULL + + AUTO_INCREMENT, \`created_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + , \`updated_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - - - ON - - - - UPDATE - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + + + ON + + + + UPDATE + + + + CURRENT_TIMESTAMP + + , \`deleted_at\` datetime - - DEFAULT - - - - NULL - - , + + DEFAULT + + + + NULL + + , \`enable\` tinyint( - - 1 - - ) - - NOT - - - - NULL - - , + + 1 + + ) + + NOT + + + + NULL + + , \`enable_ssl\` tinyint( - - 1 - - ) - - NOT - - - - NULL - - , + + 1 + + ) + + NOT + + + + NULL + + , \`host\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`port\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`connect_dn\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`connect_secret_password\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`base_dn\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`user_name_rdn_key\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , \`user_email_rdn_key\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - NOT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + NOT + + + + NULL + + , - - PRIMARY - - KEY (\`id\`), + + PRIMARY + + KEY (\`id\`), KEY \`idx_global_configuration_ldap_deleted_at\` (\`deleted_at\`) ) ENGINE - - = - - InnoDB - - DEFAULT - - CHARSET - - = - - utf8mb4 - - COLLATE - - + = + + InnoDB + + DEFAULT + + CHARSET + + = + + utf8mb4 + + COLLATE + + + = + + utf8mb4_unicode_ci + +
+
- = - - utf8mb4_unicode_ci -
+ + + +
+
@@ -11477,492 +11603,523 @@ exports[`SqlAnalyze/SQLManage should get analyze data from origin 3`] = `
-
-                      
-                        CREATE
-                      
-                       
-                      
+                      
- TABLE - - \`execute_sql_detail\` ( + + + CREATE + + + + TABLE + + \`execute_sql_detail\` ( \`id\` - - int - - ( - - 10 - - ) unsigned - - NOT - - - - NULL - - AUTO_INCREMENT, + + int + + ( + + 10 + + ) unsigned + + NOT + + + + NULL + + AUTO_INCREMENT, \`created_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + , \`updated_at\` datetime - - DEFAULT - - - - CURRENT_TIMESTAMP - - - - ON - - - - UPDATE - - - - CURRENT_TIMESTAMP - - , + + DEFAULT + + + + CURRENT_TIMESTAMP + + + + ON + + + + UPDATE + + + + CURRENT_TIMESTAMP + + , \`deleted_at\` datetime - - DEFAULT - - - - NULL - - , + + DEFAULT + + + + NULL + + , \`task_id\` - - int - - ( - - 10 - - ) unsigned - - DEFAULT - - - - NULL - - , + + int + + ( + + 10 + + ) unsigned + + DEFAULT + + + + NULL + + , \`number\` - - int - - ( - - 10 - - ) unsigned - - DEFAULT - - - - NULL - - , + + int + + ( + + 10 + + ) unsigned + + DEFAULT + + + + NULL + + , \`content\` longtext - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`description\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`start_binlog_file\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`start_binlog_pos\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`end_binlog_file\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`end_binlog_pos\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`row_affects\` - - bigint - - ( - - 20 - - ) - - DEFAULT - - - - NULL - - , + + bigint + + ( + + 20 + + ) + + DEFAULT + + + + NULL + + , \`exec_status\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - 'initialized' - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + 'initialized' + + , \`exec_result\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`audit_status\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - 'initialized' - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + 'initialized' + + , \`audit_result\` text - - COLLATE - - utf8mb4_unicode_ci, + + COLLATE + + utf8mb4_unicode_ci, \`audit_fingerprint\` - - char - - ( - - 32 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + char + + ( + + 32 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , \`audit_level\` - - varchar - - ( - - 255 - - ) - - COLLATE - - utf8mb4_unicode_ci - - DEFAULT - - - - NULL - - , + + varchar + + ( + + 255 + + ) + + COLLATE + + utf8mb4_unicode_ci + + DEFAULT + + + + NULL + + , - - PRIMARY - - KEY (\`id\`), + + PRIMARY + + KEY (\`id\`), KEY \`idx_execute_sql_detail_deleted_at\` (\`deleted_at\`), KEY \`idx_execute_sql_detail_task_id\` (\`task_id\`), KEY \`idx_execute_sql_detail_audit_fingerprint\` (\`audit_fingerprint\`) ) ENGINE - - = - - InnoDB AUTO_INCREMENT - - = - - - 4 - - - - DEFAULT - - CHARSET - - = - - utf8mb4 - - COLLATE - - + = + + InnoDB AUTO_INCREMENT + + = + + + 4 + + + + DEFAULT + + CHARSET + + = + + utf8mb4 + + COLLATE + + + = + + utf8mb4_unicode_ci + +
+
- = - - utf8mb4_unicode_ci -
+ + + + +