Sync v2

spelling_dict.txt

@@ -456,4 +456,5 @@ multipoint
 multilinestring
 multipolygon
 geometrycollection
-charlength
+charlength
+xmls

sqle/api/controller/v1/sql_audit_record.go

@@ -111,7 +111,7 @@
 
  var task *model.Task
  if req.InstanceName != "" {
  task, err = buildOnlineTaskForAudit(c, s, uint64(user.ID), req.InstanceName, req.InstanceSchema, projectUid, sqls)
  if err != nil {
  return controller.JSONBaseErrorReq(c, err)
  }
@@ -196,15 +196,15 @@
  return nil
 }
 
-func buildOnlineTaskForAudit(c echo.Context, s *model.Storage, userId uint64, instanceName, instanceSchema, projectUid string, sqls getSQLFromFileResp) (*model.Task, error) {
- instance, exist, err := dms.GetInstanceInProjectByName(c.Request().Context(), projectUid, instanceName)
+func buildOnlineTaskForAudit(c echo.Context, s *model.Storage, userId uint, instanceName, instanceSchema, projectName string, sqls getSQLFromFileResp) (*model.Task, error) {
+ instance, exist, err := s.GetInstanceByNameAndProjectName(instanceName, projectName)
  if err != nil {
  return nil, err
  }
  if !exist {
  return nil, ErrInstanceNoAccess
  }
  can, err := CheckCurrentUserCanAccessInstances(c.Request().Context(), projectUid, controller.GetUserID(c), []*model.Instance{instance})
  if err != nil {
  return nil, err
  }
@@ -226,7 +226,7 @@
  Schema: instanceSchema,
  InstanceId: instance.ID,
  Instance: instance,
  CreateUserId: userId,
  ExecuteSQLs: []*model.ExecuteSQL{},
  SQLSource: sqls.SourceType,
  DBType: instance.DbType,

sqle/driver/mysql/rule/rule.go

@@ -493,19 +493,19 @@ func getCreateTableAndOnCondition(input *RuleHandlerInput) (map[string]*ast.Crea
  if stmt.From == nil {
  return nil, nil
  }
- tableNameCreateTableStmtMap = getTableNameCreateTableStmtMap(input.Ctx, stmt.From.TableRefs)
+ tableNameCreateTableStmtMap = input.Ctx.GetTableNameCreateTableStmtMap(stmt.From.TableRefs)
  onConditions = util.GetTableFromOnCondition(stmt.From.TableRefs)
  case *ast.UpdateStmt:
  if stmt.TableRefs == nil {
  return nil, nil
  }
- tableNameCreateTableStmtMap = getTableNameCreateTableStmtMap(input.Ctx, stmt.TableRefs.TableRefs)
+ tableNameCreateTableStmtMap = input.Ctx.GetTableNameCreateTableStmtMap(stmt.TableRefs.TableRefs)
  onConditions = util.GetTableFromOnCondition(stmt.TableRefs.TableRefs)
  case *ast.DeleteStmt:
  if stmt.TableRefs == nil {
  return nil, nil
  }
- tableNameCreateTableStmtMap = getTableNameCreateTableStmtMap(input.Ctx, stmt.TableRefs.TableRefs)
+ tableNameCreateTableStmtMap = input.Ctx.GetTableNameCreateTableStmtMap(stmt.TableRefs.TableRefs)
  onConditions = util.GetTableFromOnCondition(stmt.TableRefs.TableRefs)
  default:
  return nil, nil
@@ -696,28 +696,6 @@ func getTableNameCreateTableStmtMapForJoinType(sessionContext *session.Context,
  return tableNameCreateTableStmtMap
 }
 
-func getTableNameCreateTableStmtMap(sessionContext *session.Context, joinStmt *ast.Join) map[string] /*table name or alias table name*/ *ast.CreateTableStmt {
- tableNameCreateTableStmtMap := make(map[string]*ast.CreateTableStmt)
- tableSources := util.GetTableSources(joinStmt)
- for _, tableSource := range tableSources {
- if tableNameStmt, ok := tableSource.Source.(*ast.TableName); ok {
- tableName := tableNameStmt.Name.L
- if tableSource.AsName.L != "" {
- // 如果使用别名，则需要用别名引用
- tableName = tableSource.AsName.L
- }
-
- createTableStmt, exist, err := sessionContext.GetCreateTableStmt(tableNameStmt)
- if err != nil || !exist {
- continue
- }
- // TODO: 跨库的 JOIN 无法区分
- tableNameCreateTableStmtMap[tableName] = createTableStmt
- }
- }
- return tableNameCreateTableStmtMap
-}
-
 func getOnConditionLeftAndRightType(onCondition *ast.OnCondition, createTableStmtMap map[string]*ast.CreateTableStmt) (byte, byte) {
  var leftType, rightType byte
  // onCondition在中的ColumnNameExpr.Refer为nil无法索引到原表名和表别名
@@ -3259,7 +3237,7 @@ func checkWhereConditionUseIndex(ctx *session.Context, whereVisitor *util.WhereW
  continue
  }
 
- tableNameCreateTableStmtMap := getTableNameCreateTableStmtMap(ctx, whereExpr.TableRef)
+ tableNameCreateTableStmtMap := ctx.GetTableNameCreateTableStmtMap(whereExpr.TableRef)
  util.ScanWhereStmt(func(expr ast.ExprNode) (skip bool) {
  switch x := expr.(type) {
  case *ast.ColumnNameExpr:
@@ -5465,7 +5443,7 @@ func judgeJoinFieldUseIndex(input *RuleHandlerInput) (bool, error) {
  // 如果SQL没有JOIN多表，则不需要审核
  return true, fmt.Errorf("sql have not join node")
  }
- tableNameCreateTableStmtMap := getTableNameCreateTableStmtMap(input.Ctx, joinNode)
+ tableNameCreateTableStmtMap := input.Ctx.GetTableNameCreateTableStmtMap(joinNode)
  tableIndexes := make(map[string][]*ast.Constraint, len(tableNameCreateTableStmtMap))
  for tableName, createTableStmt := range tableNameCreateTableStmtMap {
  tableIndexes[tableName] = createTableStmt.Constraints

sqle/driver/mysql/session/context.go

@@ -1121,3 +1121,25 @@ func (c *Context) GetExecutor() *executor.Executor {
 func (c *Context) GetTableIndexesInfo(schema, tableName string) ([]*executor.TableIndexesInfo, error) {
  return c.e.GetTableIndexesInfo(utils.SupplementalQuotationMarks(schema), utils.SupplementalQuotationMarks(tableName))
 }
+
+func (c *Context) GetTableNameCreateTableStmtMap(joinStmt *ast.Join) map[string] /*table name or alias table name*/ *ast.CreateTableStmt {
+ tableNameCreateTableStmtMap := make(map[string]*ast.CreateTableStmt)
+ tableSources := util.GetTableSources(joinStmt)
+ for _, tableSource := range tableSources {
+ if tableNameStmt, ok := tableSource.Source.(*ast.TableName); ok {
+ tableName := tableNameStmt.Name.L
+ if tableSource.AsName.L != "" {
+ // 如果使用别名，则需要用别名引用
+ tableName = tableSource.AsName.L
+ }
+
+ createTableStmt, exist, err := c.GetCreateTableStmt(tableNameStmt)
+ if err != nil || !exist {
+ continue
+ }
+ // TODO: 跨库的 JOIN 无法区分
+ tableNameCreateTableStmtMap[tableName] = createTableStmt
+ }
+ }
+ return tableNameCreateTableStmtMap
+}