Merge pull request #363 from actiontech/fix_missing_return_rule_error

Fix missing return rule error
actiontech · Feb 11, 2025 · e248da1 · e248da1
2 parents 68e81d9 + 4c42644
commit e248da1
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 13 deletions.
diff --git a/internal/dms/biz/cloudbeaver.go b/internal/dms/biz/cloudbeaver.go
@@ -592,13 +592,21 @@ func (cu *CloudbeaverUsecase) GraphQLDistributor() echo.MiddlewareFunc {
 
 func convertToResp(ctx context.Context, resp cloudbeaver.AuditResults) interface{} {
 	var messages []string
+	var executionFailedMessage []string
+	langTag := locale.Bundle.GetLangTagFromCtx(ctx)
 	for _, sqlResult := range resp.Results {
 		for _, audit := range sqlResult.AuditResult {
-			messages = append(messages, audit.GetAuditMsgByLangTag(locale.Bundle.GetLangTagFromCtx(ctx)))
+			msg := audit.GetAuditMsgByLangTag(langTag)
+			if audit.ExecutionFailed {
+				executionFailedMessage = append(executionFailedMessage, msg)
+			} else {
+				messages = append(messages, msg)
+			}
 		}
 	}
 
 	messageStr := strings.Join(messages, ",")
+	executionFailedMessageStr := strings.Join(executionFailedMessage, ",")
 	name := "SQL Audit Failed"
 
 	return struct {
@@ -614,8 +622,9 @@ func convertToResp(ctx context.Context, resp cloudbeaver.AuditResults) interface
 				Running: false,
 				Status:  &resp.SQL,
 				Error: &model.ServerError{
-					Message:    &messageStr,
-					StackTrace: &messageStr,
+					Message:                &messageStr,
+					ExecutionFailedMessage: &executionFailedMessageStr,
+					StackTrace:             &messageStr,
 				},
 			},
 		},

diff --git a/internal/pkg/cloudbeaver/model/models_gen.go b/internal/pkg/cloudbeaver/model/models_gen.go
diff --git a/internal/pkg/cloudbeaver/resolver/executor_gen.go b/internal/pkg/cloudbeaver/resolver/executor_gen.go
diff --git a/internal/pkg/cloudbeaver/schema/service.core.graphqls b/internal/pkg/cloudbeaver/schema/service.core.graphqls
@@ -67,6 +67,7 @@ type AsyncTaskInfo {
 
 type ServerError {
     message: String
+    executionFailedMessage: String
     errorCode: String
     errorType: String
     stackTrace: String