Database governance built for humans and agents — controlling changes and access across every major database.
Go cicddata-governancedata-maskingdata-securitydatabase-accessdatabase-governancedevopsdevsecopsflywaygitopsliquibasemongodbmysqloraclepostgresqlschema-migrationssecuritysql-clientsqlservertidb
feat: stop on error query (#18050)
p0ny7a6274e0c141
diff --git a/backend/api/v1/error.go b/backend/api/v1/error.goindex d21626e656..1c5cf386b3 100644--- a/backend/api/v1/error.go+++ b/backend/api/v1/error.go@@ -1,44 +1,15 @@package v1import (- "connectrpc.com/connect"- "github.com/pkg/errors"- "google.golang.org/genproto/googleapis/rpc/errdetails"+ v1pb "github.com/bytebase/bytebase/backend/generated-go/v1")-var (- // nonSelectSQLError returns an error indicating a non-SELECT SQL error.- nonSelectSQLError = func() *connect.Error {- err := connect.NewError(connect.CodeInvalidArgument, errors.New("Support SELECT sql statement only"))- detail, detailErr := connect.NewErrorDetail(&errdetails.BadRequest{- FieldViolations: []*errdetails.BadRequest_FieldViolation{- {- Field: "statement",- Description: "statement must be read-only SELECT statement",- },- },- })- if detailErr != nil {- panic(detailErr)- }- err.AddDetail(detail)- return err- }()- // nonReadOnlyCommandError returns an error indicating a non-read-only command error.- nonReadOnlyCommandError = func() *connect.Error {- err := connect.NewError(connect.CodeInvalidArgument, errors.New("Support read-only command statements only"))- detail, detailErr := connect.NewErrorDetail(&errdetails.BadRequest{- FieldViolations: []*errdetails.BadRequest_FieldViolation{- {- Field: "statement",- Description: "statement must be read-only command statement",- },- },- })- if detailErr != nil {- panic(detailErr)- }- err.AddDetail(detail)- return err- }()-)+type queryError struct {+ err error+ resource string+ commandType v1pb.QueryResult_PermissionDenied_CommandType+}++func (qe *queryError) Error() string {+ return qe.err.Error()+}diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.goindex 2e36f19008..cb02014f01 100644--- a/backend/api/v1/sql_service.go+++ b/backend/api/v1/sql_service.go@@ -208,7 +208,7 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryRif request.Schema != nil {queryContext.Schema = *request.Schema}- results, _, duration, queryErr := queryRetry(+ results, _, duration, queryErr := queryRetryStopOnError(ctx,s.store,user,@@ -232,29 +232,38 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR// Update activity.s.createQueryHistory(database, store.QueryHistoryTypeQuery, statement, user.ID, duration, queryErr)+if queryErr != nil {- code := connect.CodeInternal- // If queryErr is already a connect.Error, preserve its code- if connectErr, ok := queryErr.(*connect.Error); ok {- code = connectErr.Code()- } else if syntaxErr, ok := queryErr.(*parserbase.SyntaxError); ok {- err := connect.NewError(connect.CodeInvalidArgument, syntaxErr)- if detail, detailErr := connect.NewErrorDetail(&v1pb.PlanCheckRun_Result{- Code: int32(advisor.StatementSyntaxError),- Content: syntaxErr.Message,- Title: "Syntax error",- Status: v1pb.Advice_ERROR,- Report: &v1pb.PlanCheckRun_Result_SqlReviewReport_{- SqlReviewReport: &v1pb.PlanCheckRun_Result_SqlReviewReport{- StartPosition: convertToPosition(syntaxErr.Position),+ if len(results) == 0 {+ if _, ok := queryErr.(*connect.Error); ok {+ return nil, queryErr+ }+ return nil, connect.NewError(connect.CodeInternal, errors.New(queryErr.Error()))+ }+ // populate the detailed_error field of the last query result+ var qe *queryError+ var pe *parserbase.SyntaxError+ if errors.As(queryErr, &qe) {+ if qe.resource != "" {+ results[len(results)-1].DetailedError = &v1pb.QueryResult_PermissionDenied_{+ PermissionDenied: &v1pb.QueryResult_PermissionDenied{+ Resource: qe.resource,},+ }+ } else if qe.commandType != v1pb.QueryResult_PermissionDenied_COMMAND_TYPE_UNSPECIFIED {+ results[len(results)-1].DetailedError = &v1pb.QueryResult_PermissionDenied_{+ PermissionDenied: &v1pb.QueryResult_PermissionDenied{+ CommandType: qe.commandType,+ },+ }+ }+ } else if errors.As(queryErr, &pe) {+ results[len(results)-1].DetailedError = &v1pb.QueryResult_SyntaxError_{+ SyntaxError: &v1pb.QueryResult_SyntaxError{+ StartPosition: convertToPosition(pe.Position),},- }); detailErr == nil {- err.AddDetail(detail)}- return nil, err}- return nil, connect.NewError(code, errors.New(queryErr.Error()))}slog.Debug("request finished",@@ -679,6 +688,66 @@ func getSensitivePredicateColumnErrorMessages(sensitiveColumns []parserbase.Colureturn buf.String()}+// queryRetryStopOnError runs the query and stops on encountering errors.+// The error is both present in the returned QueryResult and error, the caller decides what to do.+func queryRetryStopOnError(+ ctx context.Context,+ stores *store.Store,+ user *store.UserMessage,+ instance *store.InstanceMessage,+ database *store.DatabaseMessage,+ driver db.Driver,+ conn *sql.Conn,+ statement string,+ queryContext db.QueryContext,+ licenseService *enterprise.LicenseService,+ optionalAccessCheck accessCheckFunc,+ schemaSyncer *schemasync.Syncer,+ action storepb.MaskingExceptionPolicy_MaskingException_Action,+) ([]*v1pb.QueryResult, []*parserbase.QuerySpan, time.Duration, error) {+ // Split the statement into individual SQLs+ statements, err := parserbase.SplitMultiSQL(instance.Metadata.GetEngine(), statement)+ if err != nil {+ // Fall back to executing as a single statement if splitting fails+ return queryRetry(ctx, stores, user, instance, database, driver, conn, statement, queryContext, licenseService, optionalAccessCheck, schemaSyncer, action)+ }++ var allResults []*v1pb.QueryResult+ var allSpans []*parserbase.QuerySpan+ var totalDuration time.Duration++ for _, stmt := range statements {+ // Skip empty statements+ if stmt.Empty {+ continue+ }++ results, spans, duration, err := queryRetry(ctx, stores, user, instance, database, driver, conn, stmt.Text, queryContext, licenseService, optionalAccessCheck, schemaSyncer, action)+ totalDuration += duration++ if err != nil {+ allResults = append(allResults, &v1pb.QueryResult{+ Error: err.Error(),+ Statement: stmt.Text,+ })+ allSpans = append(allSpans, nil)+ return allResults, allSpans, totalDuration, err+ }++ allResults = append(allResults, results...)+ allSpans = append(allSpans, spans...)++ // results may have swollen error.+ for _, result := range results {+ if result.Error != "" {+ return allResults, allSpans, totalDuration, nil+ }+ }+ }++ return allResults, allSpans, totalDuration, nil+}+func executeWithTimeout(ctx context.Context, stores *store.Store, licenseService *enterprise.LicenseService, driver db.Driver, conn *sql.Conn, statement string, queryContext db.QueryContext) ([]*v1pb.QueryResult, time.Duration, error) {queryCtx := ctxvar timeout time.Duration@@ -1417,17 +1486,23 @@ func (s *SQLService) accessCheck(return connect.NewError(connect.CodeInternal, errors.Errorf("failed to check access control for database: %q, error %v", column.Database, err))}if !ok {- resource := attributes[common.CELAttributeResourceDatabase]+ resource, ok := attributes[common.CELAttributeResourceDatabase].(string)+ if !ok {+ resource = ""+ }if schema, ok := attributes[common.CELAttributeResourceSchemaName]; ok && schema != "" {resource = fmt.Sprintf("%s/schemas/%s", resource, schema)}if table, ok := attributes[common.CELAttributeResourceTableName]; ok && table != "" {resource = fmt.Sprintf("%s/tables/%s", resource, table)}- return connect.NewError(- connect.CodePermissionDenied,- errors.Errorf("permission denied to access resource: %s", resource),- )+ return &queryError{+ err: connect.NewError(+ connect.CodePermissionDenied,+ errors.Errorf("permission denied to access resource: %s", resource),+ ),+ resource: resource,+ }}}}@@ -1498,11 +1573,9 @@ func validateQueryRequest(instance *store.InstanceMessage, statement string) errreturn err}if !ok {- switch instance.Metadata.GetEngine() {- case storepb.Engine_REDIS, storepb.Engine_MONGODB:- return nonReadOnlyCommandError- default:- return nonSelectSQLError+ return &queryError{+ err: connect.NewError(connect.CodeInvalidArgument, errors.New("Support read-only command statements only")),+ commandType: v1pb.QueryResult_PermissionDenied_NON_READ_ONLY,}}return nil@@ -1816,11 +1889,17 @@ func checkDataSourceQueryPolicy(ctx context.Context, storeInstance *store.Store,switch statementTp {case parserbase.DDL:if policy.DisallowDdl {- return connect.NewError(connect.CodePermissionDenied, errors.Errorf("disallow execute DDL statement in environment %q", environment.Title))+ return &queryError{+ err: connect.NewError(connect.CodePermissionDenied, errors.Errorf("disallow execute DDL statement in environment %q", environment.Title)),+ commandType: v1pb.QueryResult_PermissionDenied_DDL,+ }}case parserbase.DML:if policy.DisallowDml {- return connect.NewError(connect.CodePermissionDenied, errors.Errorf("disallow execute DML statement in environment %q", environment.Title))+ return &queryError{+ err: connect.NewError(connect.CodePermissionDenied, errors.Errorf("disallow execute DML statement in environment %q", environment.Title)),+ commandType: v1pb.QueryResult_PermissionDenied_DML,+ }}default:}diff --git a/backend/generated-go/v1/sql_service.pb.go b/backend/generated-go/v1/sql_service.pb.goindex 1117bc3adc..485b731a2c 100644--- a/backend/generated-go/v1/sql_service.pb.go+++ b/backend/generated-go/v1/sql_service.pb.go@@ -77,6 +77,58 @@ func (QueryOption_RedisRunCommandsOn) EnumDescriptor() ([]byte, []int) {return file_v1_sql_service_proto_rawDescGZIP(), []int{4, 0}}+type QueryResult_PermissionDenied_CommandType int32++const (+ QueryResult_PermissionDenied_COMMAND_TYPE_UNSPECIFIED QueryResult_PermissionDenied_CommandType = 0+ QueryResult_PermissionDenied_DDL QueryResult_PermissionDenied_CommandType = 1+ QueryResult_PermissionDenied_DML QueryResult_PermissionDenied_CommandType = 2+ QueryResult_PermissionDenied_NON_READ_ONLY QueryResult_PermissionDenied_CommandType = 3+)++// Enum value maps for QueryResult_PermissionDenied_CommandType.+var (+ QueryResult_PermissionDenied_CommandType_name = map[int32]string{+ 0: "COMMAND_TYPE_UNSPECIFIED",+ 1: "DDL",+ 2: "DML",+ 3: "NON_READ_ONLY",+ }+ QueryResult_PermissionDenied_CommandType_value = map[string]int32{+ "COMMAND_TYPE_UNSPECIFIED": 0,+ "DDL": 1,+ "DML": 2,+ "NON_READ_ONLY": 3,+ }+)++func (x QueryResult_PermissionDenied_CommandType) Enum() *QueryResult_PermissionDenied_CommandType {+ p := new(QueryResult_PermissionDenied_CommandType)+ *p = x+ return p+}++func (x QueryResult_PermissionDenied_CommandType) String() string {+ return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))+}++func (QueryResult_PermissionDenied_CommandType) Descriptor() protoreflect.EnumDescriptor {+ return file_v1_sql_service_proto_enumTypes[1].Descriptor()+}++func (QueryResult_PermissionDenied_CommandType) Type() protoreflect.EnumType {+ return &file_v1_sql_service_proto_enumTypes[1]+}++func (x QueryResult_PermissionDenied_CommandType) Number() protoreflect.EnumNumber {+ return protoreflect.EnumNumber(x)+}++// Deprecated: Use QueryResult_PermissionDenied_CommandType.Descriptor instead.+func (QueryResult_PermissionDenied_CommandType) EnumDescriptor() ([]byte, []int) {+ return file_v1_sql_service_proto_rawDescGZIP(), []int{5, 2, 0}+}+type QueryResult_Message_Level int32const (@@ -129,11 +181,11 @@ func (x QueryResult_Message_Level) String() string {}func (QueryResult_Message_Level) Descriptor() protoreflect.EnumDescriptor {- return file_v1_sql_service_proto_enumTypes[1].Descriptor()+ return file_v1_sql_service_proto_enumTypes[2].Descriptor()}func (QueryResult_Message_Level) Type() protoreflect.EnumType {- return &file_v1_sql_service_proto_enumTypes[1]+ return &file_v1_sql_service_proto_enumTypes[2]}func (x QueryResult_Message_Level) Number() protoreflect.EnumNumber {@@ -142,7 +194,7 @@ func (x QueryResult_Message_Level) Number() protoreflect.EnumNumber {// Deprecated: Use QueryResult_Message_Level.Descriptor instead.func (QueryResult_Message_Level) EnumDescriptor() ([]byte, []int) {- return file_v1_sql_service_proto_rawDescGZIP(), []int{5, 1, 0}+ return file_v1_sql_service_proto_rawDescGZIP(), []int{5, 3, 0}}// Level represents the severity level of the advice.@@ -186,11 +238,11 @@ func (x Advice_Level) String() string {}func (Advice_Level) Descriptor() protoreflect.EnumDescriptor {- return file_v1_sql_service_proto_enumTypes[2].Descriptor()+ return file_v1_sql_service_proto_enumTypes[3].Descriptor()}func (Advice_Level) Type() protoreflect.EnumType {- return &file_v1_sql_service_proto_enumTypes[2]+ return &file_v1_sql_service_proto_enumTypes[3]}func (x Advice_Level) Number() protoreflect.EnumNumber {@@ -241,11 +293,11 @@ func (x Advice_RuleType) String() string {}func (Advice_RuleType) Descriptor() protoreflect.EnumDescriptor {- return file_v1_sql_service_proto_enumTypes[3].Descriptor()+ return file_v1_sql_service_proto_enumTypes[4].Descriptor()}func (Advice_RuleType) Type() protoreflect.EnumType {- return &file_v1_sql_service_proto_enumTypes[3]+ return &file_v1_sql_service_proto_enumTypes[4]}func (x Advice_RuleType) Number() protoreflect.EnumNumber {@@ -293,11 +345,11 @@ func (x QueryHistory_Type) String() string {}func (QueryHistory_Type) Descriptor() protoreflect.EnumDescriptor {- return file_v1_sql_service_proto_enumTypes[4].Descriptor()+ return file_v1_sql_service_proto_enumTypes[5].Descriptor()}func (QueryHistory_Type) Type() protoreflect.EnumType {- return &file_v1_sql_service_proto_enumTypes[4]+ return &file_v1_sql_service_proto_enumTypes[5]}func (x QueryHistory_Type) Number() protoreflect.EnumNumber {@@ -659,6 +711,8 @@ type QueryResult struct {// Types that are valid to be assigned to DetailedError://// *QueryResult_PostgresError_+ // *QueryResult_SyntaxError_+ // *QueryResult_PermissionDenied_DetailedError isQueryResult_DetailedError `protobuf_oneof:"detailed_error"`// Informational or debug messages returned by the database engine during query execution.// Examples include PostgreSQL's RAISE NOTICE, MSSQL's PRINT, or Oracle's DBMS_OUTPUT.PUT_LINE.@@ -764,6 +818,24 @@ func (x *QueryResult) GetPostgresError() *QueryResult_PostgresError {return nil}+func (x *QueryResult) GetSyntaxError() *QueryResult_SyntaxError {+ if x != nil {+ if x, ok := x.DetailedError.(*QueryResult_SyntaxError_); ok {+ return x.SyntaxError+ }+ }+ return nil+}++func (x *QueryResult) GetPermissionDenied() *QueryResult_PermissionDenied {+ if x != nil {+ if x, ok := x.DetailedError.(*QueryResult_PermissionDenied_); ok {+ return x.PermissionDenied+ }+ }+ return nil+}+func (x *QueryResult) GetMessages() []*QueryResult_Message {if x != nil {return x.Messages@@ -786,8 +858,20 @@ type QueryResult_PostgresError_ struct {PostgresError *QueryResult_PostgresError `protobuf:"bytes,9,opt,name=postgres_error,json=postgresError,proto3,oneof"`}+type QueryResult_SyntaxError_ struct {+ SyntaxError *QueryResult_SyntaxError `protobuf:"bytes,13,opt,name=syntax_error,json=syntaxError,proto3,oneof"`+}++type QueryResult_PermissionDenied_ struct {+ PermissionDenied *QueryResult_PermissionDenied `protobuf:"bytes,14,opt,name=permission_denied,json=permissionDenied,proto3,oneof"`+}+func (*QueryResult_PostgresError_) isQueryResult_DetailedError() {}+func (*QueryResult_SyntaxError_) isQueryResult_DetailedError() {}++func (*QueryResult_PermissionDenied_) isQueryResult_DetailedError() {}+type MaskingReason struct {state protoimpl.MessageState `protogen:"open.v1"`// The semantic type that triggered masking (e.g., "SSN", "email", "phone").@@ -2100,6 +2184,113 @@ func (x *QueryResult_PostgresError) GetRoutine() string {return ""}+// Syntax error with position information for editor highlighting+type QueryResult_SyntaxError struct {+ state protoimpl.MessageState `protogen:"open.v1"`+ // Position information for highlighting in editor+ StartPosition *Position `protobuf:"bytes,1,opt,name=start_position,json=startPosition,proto3" json:"start_position,omitempty"`+ unknownFields protoimpl.UnknownFields+ sizeCache protoimpl.SizeCache+}++func (x *QueryResult_SyntaxError) Reset() {+ *x = QueryResult_SyntaxError{}+ mi := &file_v1_sql_service_proto_msgTypes[20]+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ ms.StoreMessageInfo(mi)+}++func (x *QueryResult_SyntaxError) String() string {+ return protoimpl.X.MessageStringOf(x)+}++func (*QueryResult_SyntaxError) ProtoMessage() {}++func (x *QueryResult_SyntaxError) ProtoReflect() protoreflect.Message {+ mi := &file_v1_sql_service_proto_msgTypes[20]+ if x != nil {+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ if ms.LoadMessageInfo() == nil {+ ms.StoreMessageInfo(mi)+ }+ return ms+ }+ return mi.MessageOf(x)+}++// Deprecated: Use QueryResult_SyntaxError.ProtoReflect.Descriptor instead.+func (*QueryResult_SyntaxError) Descriptor() ([]byte, []int) {+ return file_v1_sql_service_proto_rawDescGZIP(), []int{5, 1}+}++func (x *QueryResult_SyntaxError) GetStartPosition() *Position {+ if x != nil {+ return x.StartPosition+ }+ return nil+}++// Permission denied with resource information or disallowed command_type.+// Either resource or command_type is available.+type QueryResult_PermissionDenied struct {+ state protoimpl.MessageState `protogen:"open.v1"`+ // Denied to access the resource.+ // Format:+ // instances/{instance}/databases/{database}+ // instances/{instance}/databases/{database}/schemas/{schema}+ // instances/{instance}/databases/{database}/tables/{table}+ // instances/{instance}/databases/{database}/schemas/{schema}/tables/{table}+ Resource string `protobuf:"bytes,1,opt,name=resource,proto3" json:"resource,omitempty"`+ // Disallowed command_type.+ CommandType QueryResult_PermissionDenied_CommandType `protobuf:"varint,2,opt,name=command_type,json=commandType,proto3,enum=bytebase.v1.QueryResult_PermissionDenied_CommandType" json:"command_type,omitempty"`+ unknownFields protoimpl.UnknownFields+ sizeCache protoimpl.SizeCache+}++func (x *QueryResult_PermissionDenied) Reset() {+ *x = QueryResult_PermissionDenied{}+ mi := &file_v1_sql_service_proto_msgTypes[21]+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ ms.StoreMessageInfo(mi)+}++func (x *QueryResult_PermissionDenied) String() string {+ return protoimpl.X.MessageStringOf(x)+}++func (*QueryResult_PermissionDenied) ProtoMessage() {}++func (x *QueryResult_PermissionDenied) ProtoReflect() protoreflect.Message {+ mi := &file_v1_sql_service_proto_msgTypes[21]+ if x != nil {+ ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))+ if ms.LoadMessageInfo() == nil {+ ms.StoreMessageInfo(mi)+ }+ return ms+ }+ return mi.MessageOf(x)+}++// Deprecated: Use QueryResult_PermissionDenied.ProtoReflect.Descriptor instead.+func (*QueryResult_PermissionDenied) Descriptor() ([]byte, []int) {+ return file_v1_sql_service_proto_rawDescGZIP(), []int{5, 2}+}++func (x *QueryResult_PermissionDenied) GetResource() string {+ if x != nil {+ return x.Resource+ }+ return ""+}++func (x *QueryResult_PermissionDenied) GetCommandType() QueryResult_PermissionDenied_CommandType {+ if x != nil {+ return x.CommandType+ }+ return QueryResult_PermissionDenied_COMMAND_TYPE_UNSPECIFIED+}+type QueryResult_Message struct {state protoimpl.MessageState `protogen:"open.v1"`Level QueryResult_Message_Level `protobuf:"varint,1,opt,name=level,proto3,enum=bytebase.v1.QueryResult_Message_Level" json:"level,omitempty"`@@ -2110,7 +2301,7 @@ type QueryResult_Message struct {func (x *QueryResult_Message) Reset() {*x = QueryResult_Message{}- mi := &file_v1_sql_service_proto_msgTypes[20]+ mi := &file_v1_sql_service_proto_msgTypes[22]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}@@ -2122,7 +2313,7 @@ func (x *QueryResult_Message) String() string {func (*QueryResult_Message) ProtoMessage() {}func (x *QueryResult_Message) ProtoReflect() protoreflect.Message {- mi := &file_v1_sql_service_proto_msgTypes[20]+ mi := &file_v1_sql_service_proto_msgTypes[22]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))if ms.LoadMessageInfo() == nil {@@ -2135,7 +2326,7 @@ func (x *QueryResult_Message) ProtoReflect() protoreflect.Message {// Deprecated: Use QueryResult_Message.ProtoReflect.Descriptor instead.func (*QueryResult_Message) Descriptor() ([]byte, []int) {- return file_v1_sql_service_proto_rawDescGZIP(), []int{5, 1}+ return file_v1_sql_service_proto_rawDescGZIP(), []int{5, 3}}func (x *QueryResult_Message) GetLevel() QueryResult_Message_Level {@@ -2163,7 +2354,7 @@ type RowValue_Timestamp struct {func (x *RowValue_Timestamp) Reset() {*x = RowValue_Timestamp{}- mi := &file_v1_sql_service_proto_msgTypes[21]+ mi := &file_v1_sql_service_proto_msgTypes[23]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}@@ -2175,7 +2366,7 @@ func (x *RowValue_Timestamp) String() string {func (*RowValue_Timestamp) ProtoMessage() {}func (x *RowValue_Timestamp) ProtoReflect() protoreflect.Message {- mi := &file_v1_sql_service_proto_msgTypes[21]+ mi := &file_v1_sql_service_proto_msgTypes[23]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))if ms.LoadMessageInfo() == nil {@@ -2224,7 +2415,7 @@ type RowValue_TimestampTZ struct {func (x *RowValue_TimestampTZ) Reset() {*x = RowValue_TimestampTZ{}- mi := &file_v1_sql_service_proto_msgTypes[22]+ mi := &file_v1_sql_service_proto_msgTypes[24]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}@@ -2236,7 +2427,7 @@ func (x *RowValue_TimestampTZ) String() string {func (*RowValue_TimestampTZ) ProtoMessage() {}func (x *RowValue_TimestampTZ) ProtoReflect() protoreflect.Message {- mi := &file_v1_sql_service_proto_msgTypes[22]+ mi := &file_v1_sql_service_proto_msgTypes[24]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))if ms.LoadMessageInfo() == nil {@@ -2290,7 +2481,7 @@ type AICompletionRequest_Message struct {func (x *AICompletionRequest_Message) Reset() {*x = AICompletionRequest_Message{}- mi := &file_v1_sql_service_proto_msgTypes[23]+ mi := &file_v1_sql_service_proto_msgTypes[25]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}@@ -2302,7 +2493,7 @@ func (x *AICompletionRequest_Message) String() string {func (*AICompletionRequest_Message) ProtoMessage() {}func (x *AICompletionRequest_Message) ProtoReflect() protoreflect.Message {- mi := &file_v1_sql_service_proto_msgTypes[23]+ mi := &file_v1_sql_service_proto_msgTypes[25]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))if ms.LoadMessageInfo() == nil {@@ -2341,7 +2532,7 @@ type AICompletionResponse_Candidate struct {func (x *AICompletionResponse_Candidate) Reset() {*x = AICompletionResponse_Candidate{}- mi := &file_v1_sql_service_proto_msgTypes[24]+ mi := &file_v1_sql_service_proto_msgTypes[26]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}@@ -2353,7 +2544,7 @@ func (x *AICompletionResponse_Candidate) String() string {func (*AICompletionResponse_Candidate) ProtoMessage() {}func (x *AICompletionResponse_Candidate) ProtoReflect() protoreflect.Message {- mi := &file_v1_sql_service_proto_msgTypes[24]+ mi := &file_v1_sql_service_proto_msgTypes[26]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))if ms.LoadMessageInfo() == nil {@@ -2386,7 +2577,7 @@ type AICompletionResponse_Candidate_Content struct {func (x *AICompletionResponse_Candidate_Content) Reset() {*x = AICompletionResponse_Candidate_Content{}- mi := &file_v1_sql_service_proto_msgTypes[25]+ mi := &file_v1_sql_service_proto_msgTypes[27]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}@@ -2398,7 +2589,7 @@ func (x *AICompletionResponse_Candidate_Content) String() string {func (*AICompletionResponse_Candidate_Content) ProtoMessage() {}func (x *AICompletionResponse_Candidate_Content) ProtoReflect() protoreflect.Message {- mi := &file_v1_sql_service_proto_msgTypes[25]+ mi := &file_v1_sql_service_proto_msgTypes[27]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))if ms.LoadMessageInfo() == nil {@@ -2430,7 +2621,7 @@ type AICompletionResponse_Candidate_Content_Part struct {func (x *AICompletionResponse_Candidate_Content_Part) Reset() {*x = AICompletionResponse_Candidate_Content_Part{}- mi := &file_v1_sql_service_proto_msgTypes[26]+ mi := &file_v1_sql_service_proto_msgTypes[28]ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))ms.StoreMessageInfo(mi)}@@ -2442,7 +2633,7 @@ func (x *AICompletionResponse_Candidate_Content_Part) String() string {func (*AICompletionResponse_Candidate_Content_Part) ProtoMessage() {}func (x *AICompletionResponse_Candidate_Content_Part) ProtoReflect() protoreflect.Message {- mi := &file_v1_sql_service_proto_msgTypes[26]+ mi := &file_v1_sql_service_proto_msgTypes[28]if x != nil {ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))if ms.LoadMessageInfo() == nil {@@ -2503,7 +2694,7 @@ const file_v1_sql_service_proto_rawDesc = "" +"\x12RedisRunCommandsOn\x12%\n" +"!REDIS_RUN_COMMANDS_ON_UNSPECIFIED\x10\x00\x12\x0f\n" +"\vSINGLE_NODE\x10\x01\x12\r\n" +- "\tALL_NODES\x10\x02\"\xb4\t\n" ++ "\tALL_NODES\x10\x02\"\x83\r\n" +"\vQueryResult\x12!\n" +"\fcolumn_names\x18\x01 \x03(\tR\vcolumnNames\x12*\n" +"\x11column_type_names\x18\x02 \x03(\tR\x0fcolumnTypeNames\x12)\n" +@@ -2514,7 +2705,9 @@ const file_v1_sql_service_proto_rawDesc = "" +"\x05error\x18\x06 \x01(\tR\x05error\x123\n" +"\alatency\x18\a \x01(\v2\x19.google.protobuf.DurationR\alatency\x12\x1c\n" +"\tstatement\x18\b \x01(\tR\tstatement\x12O\n" +- "\x0epostgres_error\x18\t \x01(\v2&.bytebase.v1.QueryResult.PostgresErrorH\x00R\rpostgresError\x12<\n" ++ "\x0epostgres_error\x18\t \x01(\v2&.bytebase.v1.QueryResult.PostgresErrorH\x00R\rpostgresError\x12I\n" ++ "\fsyntax_error\x18\r \x01(\v2$.bytebase.v1.QueryResult.SyntaxErrorH\x00R\vsyntaxError\x12X\n" ++ "\x11permission_denied\x18\x0e \x01(\v2).bytebase.v1.QueryResult.PermissionDeniedH\x00R\x10permissionDenied\x12<\n" +"\bmessages\x18\f \x03(\v2 .bytebase.v1.QueryResult.MessageR\bmessages\x122\n" +"\x06masked\x18\x04 \x03(\v2\x1a.bytebase.v1.MaskingReasonR\x06masked\x1a\xfd\x03\n" +"\rPostgresError\x12\x1a\n" +@@ -2538,7 +2731,17 @@ const file_v1_sql_service_proto_rawDesc = "" +"\x0fconstraint_name\x18\x0e \x01(\tR\x0econstraintName\x12\x12\n" +"\x04file\x18\x0f \x01(\tR\x04file\x12\x12\n" +"\x04line\x18\x10 \x01(\x05R\x04line\x12\x18\n" +- "\aroutine\x18\x11 \x01(\tR\aroutine\x1a\xc7\x01\n" ++ "\aroutine\x18\x11 \x01(\tR\aroutine\x1aK\n" ++ "\vSyntaxError\x12<\n" ++ "\x0estart_position\x18\x01 \x01(\v2\x15.bytebase.v1.PositionR\rstartPosition\x1a\xda\x01\n" ++ "\x10PermissionDenied\x12\x1a\n" ++ "\bresource\x18\x01 \x01(\tR\bresource\x12X\n" ++ "\fcommand_type\x18\x02 \x01(\x0e25.bytebase.v1.QueryResult.PermissionDenied.CommandTypeR\vcommandType\"P\n" ++ "\vCommandType\x12\x1c\n" ++ "\x18COMMAND_TYPE_UNSPECIFIED\x10\x00\x12\a\n" ++ "\x03DDL\x10\x01\x12\a\n" ++ "\x03DML\x10\x02\x12\x11\n" ++ "\rNON_READ_ONLY\x10\x03\x1a\xc7\x01\n" +"\aMessage\x12<\n" +"\x05level\x18\x01 \x01(\x0e2&.bytebase.v1.QueryResult.Message.LevelR\x05level\x12\x18\n" +"\acontent\x18\x02 \x01(\tR\acontent\"d\n" +@@ -2695,104 +2898,111 @@ func file_v1_sql_service_proto_rawDescGZIP() []byte {return file_v1_sql_service_proto_rawDescData}-var file_v1_sql_service_proto_enumTypes = make([]protoimpl.EnumInfo, 5)-var file_v1_sql_service_proto_msgTypes = make([]protoimpl.MessageInfo, 27)+var file_v1_sql_service_proto_enumTypes = make([]protoimpl.EnumInfo, 6)+var file_v1_sql_service_proto_msgTypes = make([]protoimpl.MessageInfo, 29)var file_v1_sql_service_proto_goTypes = []any{(QueryOption_RedisRunCommandsOn)(0), // 0: bytebase.v1.QueryOption.RedisRunCommandsOn- (QueryResult_Message_Level)(0), // 1: bytebase.v1.QueryResult.Message.Level- (Advice_Level)(0), // 2: bytebase.v1.Advice.Level- (Advice_RuleType)(0), // 3: bytebase.v1.Advice.RuleType- (QueryHistory_Type)(0), // 4: bytebase.v1.QueryHistory.Type- (*AdminExecuteRequest)(nil), // 5: bytebase.v1.AdminExecuteRequest- (*AdminExecuteResponse)(nil), // 6: bytebase.v1.AdminExecuteResponse- (*QueryRequest)(nil), // 7: bytebase.v1.QueryRequest- (*QueryResponse)(nil), // 8: bytebase.v1.QueryResponse- (*QueryOption)(nil), // 9: bytebase.v1.QueryOption- (*QueryResult)(nil), // 10: bytebase.v1.QueryResult- (*MaskingReason)(nil), // 11: bytebase.v1.MaskingReason- (*QueryRow)(nil), // 12: bytebase.v1.QueryRow- (*RowValue)(nil), // 13: bytebase.v1.RowValue- (*Advice)(nil), // 14: bytebase.v1.Advice- (*ExportRequest)(nil), // 15: bytebase.v1.ExportRequest- (*ExportResponse)(nil), // 16: bytebase.v1.ExportResponse- (*DiffMetadataRequest)(nil), // 17: bytebase.v1.DiffMetadataRequest- (*DiffMetadataResponse)(nil), // 18: bytebase.v1.DiffMetadataResponse- (*SearchQueryHistoriesRequest)(nil), // 19: bytebase.v1.SearchQueryHistoriesRequest- (*SearchQueryHistoriesResponse)(nil), // 20: bytebase.v1.SearchQueryHistoriesResponse- (*QueryHistory)(nil), // 21: bytebase.v1.QueryHistory- (*AICompletionRequest)(nil), // 22: bytebase.v1.AICompletionRequest- (*AICompletionResponse)(nil), // 23: bytebase.v1.AICompletionResponse- (*QueryResult_PostgresError)(nil), // 24: bytebase.v1.QueryResult.PostgresError- (*QueryResult_Message)(nil), // 25: bytebase.v1.QueryResult.Message- (*RowValue_Timestamp)(nil), // 26: bytebase.v1.RowValue.Timestamp- (*RowValue_TimestampTZ)(nil), // 27: bytebase.v1.RowValue.TimestampTZ- (*AICompletionRequest_Message)(nil), // 28: bytebase.v1.AICompletionRequest.Message- (*AICompletionResponse_Candidate)(nil), // 29: bytebase.v1.AICompletionResponse.Candidate- (*AICompletionResponse_Candidate_Content)(nil), // 30: bytebase.v1.AICompletionResponse.Candidate.Content- (*AICompletionResponse_Candidate_Content_Part)(nil), // 31: bytebase.v1.AICompletionResponse.Candidate.Content.Part- (*durationpb.Duration)(nil), // 32: google.protobuf.Duration- (structpb.NullValue)(0), // 33: google.protobuf.NullValue- (*structpb.Value)(nil), // 34: google.protobuf.Value- (*Position)(nil), // 35: bytebase.v1.Position- (ExportFormat)(0), // 36: bytebase.v1.ExportFormat- (*DatabaseMetadata)(nil), // 37: bytebase.v1.DatabaseMetadata- (*DatabaseCatalog)(nil), // 38: bytebase.v1.DatabaseCatalog- (Engine)(0), // 39: bytebase.v1.Engine- (*timestamppb.Timestamp)(nil), // 40: google.protobuf.Timestamp+ (QueryResult_PermissionDenied_CommandType)(0), // 1: bytebase.v1.QueryResult.PermissionDenied.CommandType+ (QueryResult_Message_Level)(0), // 2: bytebase.v1.QueryResult.Message.Level+ (Advice_Level)(0), // 3: bytebase.v1.Advice.Level+ (Advice_RuleType)(0), // 4: bytebase.v1.Advice.RuleType+ (QueryHistory_Type)(0), // 5: bytebase.v1.QueryHistory.Type+ (*AdminExecuteRequest)(nil), // 6: bytebase.v1.AdminExecuteRequest+ (*AdminExecuteResponse)(nil), // 7: bytebase.v1.AdminExecuteResponse+ (*QueryRequest)(nil), // 8: bytebase.v1.QueryRequest+ (*QueryResponse)(nil), // 9: bytebase.v1.QueryResponse+ (*QueryOption)(nil), // 10: bytebase.v1.QueryOption+ (*QueryResult)(nil), // 11: bytebase.v1.QueryResult+ (*MaskingReason)(nil), // 12: bytebase.v1.MaskingReason+ (*QueryRow)(nil), // 13: bytebase.v1.QueryRow+ (*RowValue)(nil), // 14: bytebase.v1.RowValue+ (*Advice)(nil), // 15: bytebase.v1.Advice+ (*ExportRequest)(nil), // 16: bytebase.v1.ExportRequest+ (*ExportResponse)(nil), // 17: bytebase.v1.ExportResponse+ (*DiffMetadataRequest)(nil), // 18: bytebase.v1.DiffMetadataRequest+ (*DiffMetadataResponse)(nil), // 19: bytebase.v1.DiffMetadataResponse+ (*SearchQueryHistoriesRequest)(nil), // 20: bytebase.v1.SearchQueryHistoriesRequest+ (*SearchQueryHistoriesResponse)(nil), // 21: bytebase.v1.SearchQueryHistoriesResponse+ (*QueryHistory)(nil), // 22: bytebase.v1.QueryHistory+ (*AICompletionRequest)(nil), // 23: bytebase.v1.AICompletionRequest+ (*AICompletionResponse)(nil), // 24: bytebase.v1.AICompletionResponse+ (*QueryResult_PostgresError)(nil), // 25: bytebase.v1.QueryResult.PostgresError+ (*QueryResult_SyntaxError)(nil), // 26: bytebase.v1.QueryResult.SyntaxError+ (*QueryResult_PermissionDenied)(nil), // 27: bytebase.v1.QueryResult.PermissionDenied+ (*QueryResult_Message)(nil), // 28: bytebase.v1.QueryResult.Message+ (*RowValue_Timestamp)(nil), // 29: bytebase.v1.RowValue.Timestamp+ (*RowValue_TimestampTZ)(nil), // 30: bytebase.v1.RowValue.TimestampTZ+ (*AICompletionRequest_Message)(nil), // 31: bytebase.v1.AICompletionRequest.Message+ (*AICompletionResponse_Candidate)(nil), // 32: bytebase.v1.AICompletionResponse.Candidate+ (*AICompletionResponse_Candidate_Content)(nil), // 33: bytebase.v1.AICompletionResponse.Candidate.Content+ (*AICompletionResponse_Candidate_Content_Part)(nil), // 34: bytebase.v1.AICompletionResponse.Candidate.Content.Part+ (*durationpb.Duration)(nil), // 35: google.protobuf.Duration+ (structpb.NullValue)(0), // 36: google.protobuf.NullValue+ (*structpb.Value)(nil), // 37: google.protobuf.Value+ (*Position)(nil), // 38: bytebase.v1.Position+ (ExportFormat)(0), // 39: bytebase.v1.ExportFormat+ (*DatabaseMetadata)(nil), // 40: bytebase.v1.DatabaseMetadata+ (*DatabaseCatalog)(nil), // 41: bytebase.v1.DatabaseCatalog+ (Engine)(0), // 42: bytebase.v1.Engine+ (*timestamppb.Timestamp)(nil), // 43: google.protobuf.Timestamp}var file_v1_sql_service_proto_depIdxs = []int32{- 10, // 0: bytebase.v1.AdminExecuteResponse.results:type_name -> bytebase.v1.QueryResult- 9, // 1: bytebase.v1.QueryRequest.query_option:type_name -> bytebase.v1.QueryOption- 10, // 2: bytebase.v1.QueryResponse.results:type_name -> bytebase.v1.QueryResult+ 11, // 0: bytebase.v1.AdminExecuteResponse.results:type_name -> bytebase.v1.QueryResult+ 10, // 1: bytebase.v1.QueryRequest.query_option:type_name -> bytebase.v1.QueryOption+ 11, // 2: bytebase.v1.QueryResponse.results:type_name -> bytebase.v1.QueryResult0, // 3: bytebase.v1.QueryOption.redis_run_commands_on:type_name -> bytebase.v1.QueryOption.RedisRunCommandsOn- 12, // 4: bytebase.v1.QueryResult.rows:type_name -> bytebase.v1.QueryRow- 32, // 5: bytebase.v1.QueryResult.latency:type_name -> google.protobuf.Duration- 24, // 6: bytebase.v1.QueryResult.postgres_error:type_name -> bytebase.v1.QueryResult.PostgresError- 25, // 7: bytebase.v1.QueryResult.messages:type_name -> bytebase.v1.QueryResult.Message- 11, // 8: bytebase.v1.QueryResult.masked:type_name -> bytebase.v1.MaskingReason- 13, // 9: bytebase.v1.QueryRow.values:type_name -> bytebase.v1.RowValue- 33, // 10: bytebase.v1.RowValue.null_value:type_name -> google.protobuf.NullValue- 34, // 11: bytebase.v1.RowValue.value_value:type_name -> google.protobuf.Value- 26, // 12: bytebase.v1.RowValue.timestamp_value:type_name -> bytebase.v1.RowValue.Timestamp- 27, // 13: bytebase.v1.RowValue.timestamp_tz_value:type_name -> bytebase.v1.RowValue.TimestampTZ- 2, // 14: bytebase.v1.Advice.status:type_name -> bytebase.v1.Advice.Level- 35, // 15: bytebase.v1.Advice.start_position:type_name -> bytebase.v1.Position- 35, // 16: bytebase.v1.Advice.end_position:type_name -> bytebase.v1.Position- 3, // 17: bytebase.v1.Advice.rule_type:type_name -> bytebase.v1.Advice.RuleType- 36, // 18: bytebase.v1.ExportRequest.format:type_name -> bytebase.v1.ExportFormat- 37, // 19: bytebase.v1.DiffMetadataRequest.source_metadata:type_name -> bytebase.v1.DatabaseMetadata- 37, // 20: bytebase.v1.DiffMetadataRequest.target_metadata:type_name -> bytebase.v1.DatabaseMetadata- 38, // 21: bytebase.v1.DiffMetadataRequest.source_catalog:type_name -> bytebase.v1.DatabaseCatalog- 38, // 22: bytebase.v1.DiffMetadataRequest.target_catalog:type_name -> bytebase.v1.DatabaseCatalog- 39, // 23: bytebase.v1.DiffMetadataRequest.engine:type_name -> bytebase.v1.Engine- 21, // 24: bytebase.v1.SearchQueryHistoriesResponse.query_histories:type_name -> bytebase.v1.QueryHistory- 40, // 25: bytebase.v1.QueryHistory.create_time:type_name -> google.protobuf.Timestamp- 32, // 26: bytebase.v1.QueryHistory.duration:type_name -> google.protobuf.Duration- 4, // 27: bytebase.v1.QueryHistory.type:type_name -> bytebase.v1.QueryHistory.Type- 28, // 28: bytebase.v1.AICompletionRequest.messages:type_name -> bytebase.v1.AICompletionRequest.Message- 29, // 29: bytebase.v1.AICompletionResponse.candidates:type_name -> bytebase.v1.AICompletionResponse.Candidate- 1, // 30: bytebase.v1.QueryResult.Message.level:type_name -> bytebase.v1.QueryResult.Message.Level- 40, // 31: bytebase.v1.RowValue.Timestamp.google_timestamp:type_name -> google.protobuf.Timestamp- 40, // 32: bytebase.v1.RowValue.TimestampTZ.google_timestamp:type_name -> google.protobuf.Timestamp- 30, // 33: bytebase.v1.AICompletionResponse.Candidate.content:type_name -> bytebase.v1.AICompletionResponse.Candidate.Content- 31, // 34: bytebase.v1.AICompletionResponse.Candidate.Content.parts:type_name -> bytebase.v1.AICompletionResponse.Candidate.Content.Part- 7, // 35: bytebase.v1.SQLService.Query:input_type -> bytebase.v1.QueryRequest- 5, // 36: bytebase.v1.SQLService.AdminExecute:input_type -> bytebase.v1.AdminExecuteRequest- 19, // 37: bytebase.v1.SQLService.SearchQueryHistories:input_type -> bytebase.v1.SearchQueryHistoriesRequest- 15, // 38: bytebase.v1.SQLService.Export:input_type -> bytebase.v1.ExportRequest- 17, // 39: bytebase.v1.SQLService.DiffMetadata:input_type -> bytebase.v1.DiffMetadataRequest- 22, // 40: bytebase.v1.SQLService.AICompletion:input_type -> bytebase.v1.AICompletionRequest- 8, // 41: bytebase.v1.SQLService.Query:output_type -> bytebase.v1.QueryResponse- 6, // 42: bytebase.v1.SQLService.AdminExecute:output_type -> bytebase.v1.AdminExecuteResponse- 20, // 43: bytebase.v1.SQLService.SearchQueryHistories:output_type -> bytebase.v1.SearchQueryHistoriesResponse- 16, // 44: bytebase.v1.SQLService.Export:output_type -> bytebase.v1.ExportResponse- 18, // 45: bytebase.v1.SQLService.DiffMetadata:output_type -> bytebase.v1.DiffMetadataResponse- 23, // 46: bytebase.v1.SQLService.AICompletion:output_type -> bytebase.v1.AICompletionResponse- 41, // [41:47] is the sub-list for method output_type- 35, // [35:41] is the sub-list for method input_type- 35, // [35:35] is the sub-list for extension type_name- 35, // [35:35] is the sub-list for extension extendee- 0, // [0:35] is the sub-list for field type_name+ 13, // 4: bytebase.v1.QueryResult.rows:type_name -> bytebase.v1.QueryRow+ 35, // 5: bytebase.v1.QueryResult.latency:type_name -> google.protobuf.Duration+ 25, // 6: bytebase.v1.QueryResult.postgres_error:type_name -> bytebase.v1.QueryResult.PostgresError+ 26, // 7: bytebase.v1.QueryResult.syntax_error:type_name -> bytebase.v1.QueryResult.SyntaxError+ 27, // 8: bytebase.v1.QueryResult.permission_denied:type_name -> bytebase.v1.QueryResult.PermissionDenied+ 28, // 9: bytebase.v1.QueryResult.messages:type_name -> bytebase.v1.QueryResult.Message+ 12, // 10: bytebase.v1.QueryResult.masked:type_name -> bytebase.v1.MaskingReason+ 14, // 11: bytebase.v1.QueryRow.values:type_name -> bytebase.v1.RowValue+ 36, // 12: bytebase.v1.RowValue.null_value:type_name -> google.protobuf.NullValue+ 37, // 13: bytebase.v1.RowValue.value_value:type_name -> google.protobuf.Value+ 29, // 14: bytebase.v1.RowValue.timestamp_value:type_name -> bytebase.v1.RowValue.Timestamp+ 30, // 15: bytebase.v1.RowValue.timestamp_tz_value:type_name -> bytebase.v1.RowValue.TimestampTZ+ 3, // 16: bytebase.v1.Advice.status:type_name -> bytebase.v1.Advice.Level+ 38, // 17: bytebase.v1.Advice.start_position:type_name -> bytebase.v1.Position+ 38, // 18: bytebase.v1.Advice.end_position:type_name -> bytebase.v1.Position+ 4, // 19: bytebase.v1.Advice.rule_type:type_name -> bytebase.v1.Advice.RuleType+ 39, // 20: bytebase.v1.ExportRequest.format:type_name -> bytebase.v1.ExportFormat+ 40, // 21: bytebase.v1.DiffMetadataRequest.source_metadata:type_name -> bytebase.v1.DatabaseMetadata+ 40, // 22: bytebase.v1.DiffMetadataRequest.target_metadata:type_name -> bytebase.v1.DatabaseMetadata+ 41, // 23: bytebase.v1.DiffMetadataRequest.source_catalog:type_name -> bytebase.v1.DatabaseCatalog+ 41, // 24: bytebase.v1.DiffMetadataRequest.target_catalog:type_name -> bytebase.v1.DatabaseCatalog+ 42, // 25: bytebase.v1.DiffMetadataRequest.engine:type_name -> bytebase.v1.Engine+ 22, // 26: bytebase.v1.SearchQueryHistoriesResponse.query_histories:type_name -> bytebase.v1.QueryHistory+ 43, // 27: bytebase.v1.QueryHistory.create_time:type_name -> google.protobuf.Timestamp+ 35, // 28: bytebase.v1.QueryHistory.duration:type_name -> google.protobuf.Duration+ 5, // 29: bytebase.v1.QueryHistory.type:type_name -> bytebase.v1.QueryHistory.Type+ 31, // 30: bytebase.v1.AICompletionRequest.messages:type_name -> bytebase.v1.AICompletionRequest.Message+ 32, // 31: bytebase.v1.AICompletionResponse.candidates:type_name -> bytebase.v1.AICompletionResponse.Candidate+ 38, // 32: bytebase.v1.QueryResult.SyntaxError.start_position:type_name -> bytebase.v1.Position+ 1, // 33: bytebase.v1.QueryResult.PermissionDenied.command_type:type_name -> bytebase.v1.QueryResult.PermissionDenied.CommandType+ 2, // 34: bytebase.v1.QueryResult.Message.level:type_name -> bytebase.v1.QueryResult.Message.Level+ 43, // 35: bytebase.v1.RowValue.Timestamp.google_timestamp:type_name -> google.protobuf.Timestamp+ 43, // 36: bytebase.v1.RowValue.TimestampTZ.google_timestamp:type_name -> google.protobuf.Timestamp+ 33, // 37: bytebase.v1.AICompletionResponse.Candidate.content:type_name -> bytebase.v1.AICompletionResponse.Candidate.Content+ 34, // 38: bytebase.v1.AICompletionResponse.Candidate.Content.parts:type_name -> bytebase.v1.AICompletionResponse.Candidate.Content.Part+ 8, // 39: bytebase.v1.SQLService.Query:input_type -> bytebase.v1.QueryRequest+ 6, // 40: bytebase.v1.SQLService.AdminExecute:input_type -> bytebase.v1.AdminExecuteRequest+ 20, // 41: bytebase.v1.SQLService.SearchQueryHistories:input_type -> bytebase.v1.SearchQueryHistoriesRequest+ 16, // 42: bytebase.v1.SQLService.Export:input_type -> bytebase.v1.ExportRequest+ 18, // 43: bytebase.v1.SQLService.DiffMetadata:input_type -> bytebase.v1.DiffMetadataRequest+ 23, // 44: bytebase.v1.SQLService.AICompletion:input_type -> bytebase.v1.AICompletionRequest+ 9, // 45: bytebase.v1.SQLService.Query:output_type -> bytebase.v1.QueryResponse+ 7, // 46: bytebase.v1.SQLService.AdminExecute:output_type -> bytebase.v1.AdminExecuteResponse+ 21, // 47: bytebase.v1.SQLService.SearchQueryHistories:output_type -> bytebase.v1.SearchQueryHistoriesResponse+ 17, // 48: bytebase.v1.SQLService.Export:output_type -> bytebase.v1.ExportResponse+ 19, // 49: bytebase.v1.SQLService.DiffMetadata:output_type -> bytebase.v1.DiffMetadataResponse+ 24, // 50: bytebase.v1.SQLService.AICompletion:output_type -> bytebase.v1.AICompletionResponse+ 45, // [45:51] is the sub-list for method output_type+ 39, // [39:45] is the sub-list for method input_type+ 39, // [39:39] is the sub-list for extension type_name+ 39, // [39:39] is the sub-list for extension extendee+ 0, // [0:39] is the sub-list for field type_name}func init() { file_v1_sql_service_proto_init() }@@ -2808,6 +3018,8 @@ func file_v1_sql_service_proto_init() {file_v1_sql_service_proto_msgTypes[2].OneofWrappers = []any{}file_v1_sql_service_proto_msgTypes[5].OneofWrappers = []any{(*QueryResult_PostgresError_)(nil),+ (*QueryResult_SyntaxError_)(nil),+ (*QueryResult_PermissionDenied_)(nil),}file_v1_sql_service_proto_msgTypes[8].OneofWrappers = []any{(*RowValue_NullValue)(nil),@@ -2831,8 +3043,8 @@ func file_v1_sql_service_proto_init() {File: protoimpl.DescBuilder{GoPackagePath: reflect.TypeOf(x{}).PkgPath(),RawDescriptor: unsafe.Slice(unsafe.StringData(file_v1_sql_service_proto_rawDesc), len(file_v1_sql_service_proto_rawDesc)),- NumEnums: 5,- NumMessages: 27,+ NumEnums: 6,+ NumMessages: 29,NumExtensions: 0,NumServices: 1,},diff --git a/backend/generated-go/v1/sql_service_equal.pb.go b/backend/generated-go/v1/sql_service_equal.pb.goindex 575271e3d7..c0d5ec30f4 100644--- a/backend/generated-go/v1/sql_service_equal.pb.go+++ b/backend/generated-go/v1/sql_service_equal.pb.go@@ -178,6 +178,35 @@ func (x *QueryResult_PostgresError) Equal(y *QueryResult_PostgresError) bool {return true}+func (x *QueryResult_SyntaxError) Equal(y *QueryResult_SyntaxError) bool {+ if x == y {+ return true+ }+ if x == nil || y == nil {+ return x == nil && y == nil+ }+ if !x.StartPosition.Equal(y.StartPosition) {+ return false+ }+ return true+}++func (x *QueryResult_PermissionDenied) Equal(y *QueryResult_PermissionDenied) bool {+ if x == y {+ return true+ }+ if x == nil || y == nil {+ return x == nil && y == nil+ }+ if x.Resource != y.Resource {+ return false+ }+ if x.CommandType != y.CommandType {+ return false+ }+ return true+}+func (x *QueryResult_Message) Equal(y *QueryResult_Message) bool {if x == y {return true@@ -240,6 +269,12 @@ func (x *QueryResult) Equal(y *QueryResult) bool {if !x.GetPostgresError().Equal(y.GetPostgresError()) {return false}+ if !x.GetSyntaxError().Equal(y.GetSyntaxError()) {+ return false+ }+ if !x.GetPermissionDenied().Equal(y.GetPermissionDenied()) {+ return false+ }if len(x.Messages) != len(y.Messages) {return false}diff --git a/backend/tests/sensitive_data_test.go b/backend/tests/sensitive_data_test.goindex 39abd2a08c..03fa2cdbc7 100644--- a/backend/tests/sensitive_data_test.go+++ b/backend/tests/sensitive_data_test.go@@ -171,23 +171,22 @@ func TestSensitiveData(t *testing.T) {a.NoError(err)database := databaseResp.Msg- // Validate query syntax error.- _, err = ctl.sqlServiceClient.Query(ctx, connect.NewRequest(&v1pb.QueryRequest{+ // Validate query syntax error - with new ACL system, syntax errors are returned in query results+ syntaxErrorResp, err := ctl.sqlServiceClient.Query(ctx, connect.NewRequest(&v1pb.QueryRequest{Name: database.Name,Statement: "SELECT hello TO world;",DataSourceId: "admin",}))- a.Error(err)- // TODO(d): deprecate the details with diagonose check. And the error is not reached anyway.- /*- st := status.Convert(err)- a.Len(st.Details(), 1)- report, ok := st.Details()[0].(*v1pb.PlanCheckRun_Result_SqlReviewReport)- a.True(ok)- a.Equal(int32(1), report.Line)- a.Equal(int32(13), report.Column)- a.Equal("Syntax error at line 1:13 \nrelated text: SELECT hello TO", report.Detail)- */+ a.NoError(err)+ a.Equal(1, len(syntaxErrorResp.Msg.Results))+ a.NotEmpty(syntaxErrorResp.Msg.Results[0].Error)+ a.Contains(syntaxErrorResp.Msg.Results[0].Error, "Syntax error")+ // Check the detailed_error field for syntax_error with position+ syntaxErr := syntaxErrorResp.Msg.Results[0].GetSyntaxError()+ a.NotNil(syntaxErr)+ a.NotNil(syntaxErr.StartPosition)+ a.Equal(int32(1), syntaxErr.StartPosition.Line)+ a.Equal(int32(14), syntaxErr.StartPosition.Column)sheetResp, err := ctl.sheetServiceClient.CreateSheet(ctx, connect.NewRequest(&v1pb.CreateSheetRequest{Parent: ctl.project.Name,diff --git a/backend/tests/sql_stop_on_error_test.go b/backend/tests/sql_stop_on_error_test.gonew file mode 100644index 0000000000..6e1a730eed--- /dev/null+++ b/backend/tests/sql_stop_on_error_test.go@@ -0,0 +1,448 @@+package tests++import (+ "context"+ "fmt"+ "testing"++ "connectrpc.com/connect"+ "github.com/stretchr/testify/require"++ storepb "github.com/bytebase/bytebase/backend/generated-go/store"+ v1pb "github.com/bytebase/bytebase/backend/generated-go/v1"+)++func TestSQLQueryStopOnError(t *testing.T) {+ tests := []struct {+ name string+ databaseName string+ dbType storepb.Engine+ environment string // Environment to create database in (defaults to prod if empty)+ prepareStatements string+ query string+ wantResults int // Number of successful results before error+ wantError bool+ wantSyntaxError bool // Whether to expect syntax_error in detailed_error+ wantPermissionDenied bool // Whether to expect permission_denied in detailed_error+ }{+ {+ name: "MySQL - All statements succeed",+ databaseName: "TestStopOnError1",+ dbType: storepb.Engine_MYSQL,+ prepareStatements: "CREATE TABLE tbl1(id INT PRIMARY KEY, name VARCHAR(64));",+ query: "INSERT INTO tbl1 VALUES(1, 'Alice'); INSERT INTO tbl1 VALUES(2, 'Bob'); SELECT * FROM tbl1;",+ wantResults: 3, // 2 inserts + 1 select+ wantError: false,+ },+ {+ name: "MySQL - Second statement fails",+ databaseName: "TestStopOnError2",+ dbType: storepb.Engine_MYSQL,+ prepareStatements: "CREATE TABLE tbl2(id INT PRIMARY KEY, name VARCHAR(64));",+ query: "INSERT INTO tbl2 VALUES(1, 'Alice'); INSERT INTO nonexistent VALUES(2, 'Bob'); INSERT INTO tbl2 VALUES(3, 'Charlie');",+ wantResults: 2, // First insert succeeds + error result+ wantError: true,+ },+ {+ name: "MySQL - First statement fails",+ databaseName: "TestStopOnError3",+ dbType: storepb.Engine_MYSQL,+ prepareStatements: "CREATE TABLE tbl3(id INT PRIMARY KEY, name VARCHAR(64));",+ query: "INSERT INTO nonexistent VALUES(1, 'Alice'); INSERT INTO tbl3 VALUES(2, 'Bob');",+ wantResults: 1, // Error result only+ wantError: true,+ },+ {+ name: "PostgreSQL - All statements succeed",+ databaseName: "TestStopOnError4",+ dbType: storepb.Engine_POSTGRES,+ prepareStatements: "CREATE TABLE tbl4(id INT PRIMARY KEY, name VARCHAR(64));",+ query: "INSERT INTO tbl4 VALUES(1, 'Alice'); INSERT INTO tbl4 VALUES(2, 'Bob'); SELECT * FROM tbl4;",+ wantResults: 3,+ wantError: false,+ },+ {+ name: "PostgreSQL - Second statement fails",+ databaseName: "TestStopOnError5",+ dbType: storepb.Engine_POSTGRES,+ prepareStatements: "CREATE TABLE tbl5(id INT PRIMARY KEY, name VARCHAR(64));",+ query: "INSERT INTO tbl5 VALUES(1, 'Alice'); INSERT INTO nonexistent VALUES(2, 'Bob'); INSERT INTO tbl5 VALUES(3, 'Charlie');",+ wantResults: 2, // First insert succeeds + error result+ wantError: true,+ },+ {+ name: "MySQL - Syntax error",+ databaseName: "TestStopOnError6",+ dbType: storepb.Engine_MYSQL,+ query: "SELECT * FORM invalid_table;",+ wantResults: 1, // Error result+ wantError: true,+ wantSyntaxError: true,+ },+ {+ name: "PostgreSQL - Syntax error",+ databaseName: "TestStopOnError7",+ dbType: storepb.Engine_POSTGRES,+ query: "SELCT * FROM tbl5;",+ wantResults: 1, // Error result+ wantError: true,+ wantSyntaxError: true,+ },+ {+ name: "MySQL - Non-read-only command in Query API",+ databaseName: "TestStopOnError8",+ dbType: storepb.Engine_MYSQL,+ environment: "test",+ prepareStatements: "CREATE TABLE tbl8(id INT PRIMARY KEY);",+ query: "INSERT INTO tbl8 VALUES(1);",+ wantResults: 1, // Error result+ wantError: true,+ wantPermissionDenied: true,+ },+ {+ name: "PostgreSQL - Non-read-only command in Query API",+ databaseName: "TestStopOnError9",+ dbType: storepb.Engine_POSTGRES,+ environment: "test",+ prepareStatements: "CREATE TABLE tbl9(id INT PRIMARY KEY);",+ query: "INSERT INTO tbl9 VALUES(1);",+ wantResults: 1, // Error result+ wantError: true,+ wantPermissionDenied: true,+ },+ }++ t.Parallel()+ a := require.New(t)+ ctx := context.Background()+ ctl := &controller{}+ ctx, err := ctl.StartServerWithExternalPg(ctx)+ a.NoError(err)+ t.Cleanup(func() {+ ctl.Close(ctx)+ })++ mysqlContainer, err := getMySQLContainer(ctx)+ t.Cleanup(func() {+ mysqlContainer.Close(ctx)+ })+ a.NoError(err)++ pgContainer, err := getPgContainer(ctx)+ t.Cleanup(func() {+ pgContainer.Close(ctx)+ })+ a.NoError(err)++ mysqlInstanceResp, err := ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ InstanceId: generateRandomString("instance"),+ Instance: &v1pb.Instance{+ Title: "mysqlInstance",+ Engine: v1pb.Engine_MYSQL,+ Environment: stringPtr("environments/prod"),+ Activation: true,+ DataSources: []*v1pb.DataSource{{Type: v1pb.DataSourceType_ADMIN, Host: mysqlContainer.host, Port: mysqlContainer.port, Username: "root", Password: "root-password", Id: "admin"}},+ },+ }))+ a.NoError(err)+ mysqlInstance := mysqlInstanceResp.Msg++ pgInstanceResp, err := ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ InstanceId: generateRandomString("instance"),+ Instance: &v1pb.Instance{+ Title: "pgInstance",+ Engine: v1pb.Engine_POSTGRES,+ Environment: stringPtr("environments/prod"),+ Activation: true,+ DataSources: []*v1pb.DataSource{{Type: v1pb.DataSourceType_ADMIN, Host: pgContainer.host, Port: pgContainer.port, Username: "postgres", Password: "root-password", Id: "admin"}},+ },+ }))+ a.NoError(err)+ pgInstance := pgInstanceResp.Msg++ // Create instances for test environment (with DML policy)+ mysqlTestInstanceResp, err := ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ InstanceId: generateRandomString("instance"),+ Instance: &v1pb.Instance{+ Title: "mysqlTestInstance",+ Engine: v1pb.Engine_MYSQL,+ Environment: stringPtr("environments/test"),+ Activation: true,+ DataSources: []*v1pb.DataSource{{Type: v1pb.DataSourceType_ADMIN, Host: mysqlContainer.host, Port: mysqlContainer.port, Username: "root", Password: "root-password", Id: "admin"}},+ },+ }))+ a.NoError(err)+ mysqlTestInstance := mysqlTestInstanceResp.Msg++ pgTestInstanceResp, err := ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ InstanceId: generateRandomString("instance"),+ Instance: &v1pb.Instance{+ Title: "pgTestInstance",+ Engine: v1pb.Engine_POSTGRES,+ Environment: stringPtr("environments/test"),+ Activation: true,+ DataSources: []*v1pb.DataSource{{Type: v1pb.DataSourceType_ADMIN, Host: pgContainer.host, Port: pgContainer.port, Username: "postgres", Password: "root-password", Id: "admin"}},+ },+ }))+ a.NoError(err)+ pgTestInstance := pgTestInstanceResp.Msg++ // Set up test environment policy to disallow DML+ _, err = ctl.orgPolicyServiceClient.CreatePolicy(ctx, connect.NewRequest(&v1pb.CreatePolicyRequest{+ Parent: "environments/test",+ Policy: &v1pb.Policy{+ Type: v1pb.PolicyType_DATA_SOURCE_QUERY,+ Policy: &v1pb.Policy_DataSourceQueryPolicy{+ DataSourceQueryPolicy: &v1pb.DataSourceQueryPolicy{+ DisallowDml: true,+ },+ },+ },+ }))+ a.NoError(err)++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ t.Parallel()+ a := require.New(t)++ var instance *v1pb.Instance+ databaseOwner := ""+ if tt.environment == "test" {+ switch tt.dbType {+ case storepb.Engine_MYSQL:+ instance = mysqlTestInstance+ case storepb.Engine_POSTGRES:+ instance = pgTestInstance+ databaseOwner = "postgres"+ default:+ a.FailNow("unsupported db type")+ }+ } else {+ switch tt.dbType {+ case storepb.Engine_MYSQL:+ instance = mysqlInstance+ case storepb.Engine_POSTGRES:+ instance = pgInstance+ databaseOwner = "postgres"+ default:+ a.FailNow("unsupported db type")+ }+ }++ err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil, tt.databaseName, databaseOwner)+ a.NoError(err)++ databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{+ Name: fmt.Sprintf("%s/databases/%s", instance.Name, tt.databaseName),+ }))+ a.NoError(err)+ database := databaseResp.Msg++ sheetResp, err := ctl.sheetServiceClient.CreateSheet(ctx, connect.NewRequest(&v1pb.CreateSheetRequest{+ Parent: ctl.project.Name,+ Sheet: &v1pb.Sheet{+ Title: "prepareStatements",+ Content: []byte(tt.prepareStatements),+ },+ }))+ a.NoError(err)+ sheet := sheetResp.Msg++ a.NotNil(database.InstanceResource)+ a.Equal(1, len(database.InstanceResource.DataSources))++ err = ctl.changeDatabase(ctx, ctl.project, database, sheet, v1pb.MigrationType_DDL)+ a.NoError(err)++ // Execute the query using the Query API (not AdminExecute)+ queryResp, err := ctl.sqlServiceClient.Query(ctx, connect.NewRequest(&v1pb.QueryRequest{+ Name: database.Name,+ Statement: tt.query,+ DataSourceId: "admin",+ }))++ if tt.wantError {+ // Service returns SUCCESS but one or more results contain errors+ a.NoError(err, "[%s] expected no error from service", tt.name)+ a.NotNil(queryResp, "[%s] expected non-nil response", tt.name)+ a.NotNil(queryResp.Msg, "[%s] expected non-nil response message", tt.name)+ a.Equal(tt.wantResults, len(queryResp.Msg.Results), "[%s] expected %d results", tt.name, tt.wantResults)++ // Find which result has the error+ var errorResult *v1pb.QueryResult+ for _, result := range queryResp.Msg.Results {+ if result.Error != "" {+ errorResult = result+ break+ }+ }+ a.NotNil(errorResult, "[%s] expected at least one result with error", tt.name)+ a.NotEmpty(errorResult.Error, "[%s] error result should have error message", tt.name)++ if tt.wantSyntaxError {+ a.NotNil(errorResult.GetSyntaxError(), "[%s] expected syntax_error in detailed_error", tt.name)+ a.NotNil(errorResult.GetSyntaxError().StartPosition, "[%s] syntax error should have start position", tt.name)+ }+ if tt.wantPermissionDenied {+ a.NotNil(errorResult.GetPermissionDenied(), "[%s] expected permission_denied in detailed_error", tt.name)+ }+ } else {+ a.NoError(err)+ a.NotNil(queryResp)+ a.Equal(tt.wantResults, len(queryResp.Msg.Results), "expected %d results, got %d", tt.wantResults, len(queryResp.Msg.Results))++ // Verify all results are successful (no errors)+ for i, result := range queryResp.Msg.Results {+ a.Empty(result.Error, "result %d should not have error", i)+ a.Nil(result.DetailedError, "result %d should not have detailed_error", i)+ }+ }+ })+ }+}++func TestSQLAdminExecuteStopOnError(t *testing.T) {+ tests := []struct {+ name string+ databaseName string+ dbType storepb.Engine+ prepareStatements string+ query string+ wantResults int+ wantError bool+ }{+ {+ name: "MySQL AdminExecute - Second statement fails",+ databaseName: "TestAdminStopOnError1",+ dbType: storepb.Engine_MYSQL,+ prepareStatements: "CREATE TABLE admin_tbl1(id INT PRIMARY KEY, name VARCHAR(64));",+ query: "INSERT INTO admin_tbl1 VALUES(1, 'Alice'); INSERT INTO nonexistent VALUES(2, 'Bob'); INSERT INTO admin_tbl1 VALUES(3, 'Charlie');",+ wantResults: 1,+ wantError: true,+ },+ {+ name: "PostgreSQL AdminExecute - Second statement fails",+ databaseName: "TestAdminStopOnError2",+ dbType: storepb.Engine_POSTGRES,+ prepareStatements: "CREATE TABLE admin_tbl2(id INT PRIMARY KEY, name VARCHAR(64));",+ query: "INSERT INTO admin_tbl2 VALUES(1, 'Alice'); INSERT INTO nonexistent VALUES(2, 'Bob'); INSERT INTO admin_tbl2 VALUES(3, 'Charlie');",+ wantResults: 1,+ wantError: true,+ },+ }++ t.Parallel()+ a := require.New(t)+ ctx := context.Background()+ ctl := &controller{}+ ctx, err := ctl.StartServerWithExternalPg(ctx)+ a.NoError(err)+ t.Cleanup(func() {+ ctl.Close(ctx)+ })++ mysqlContainer, err := getMySQLContainer(ctx)+ t.Cleanup(func() {+ mysqlContainer.Close(ctx)+ })+ a.NoError(err)++ pgContainer, err := getPgContainer(ctx)+ t.Cleanup(func() {+ pgContainer.Close(ctx)+ })+ a.NoError(err)++ mysqlInstanceResp, err := ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ InstanceId: generateRandomString("instance"),+ Instance: &v1pb.Instance{+ Title: "mysqlInstance",+ Engine: v1pb.Engine_MYSQL,+ Environment: stringPtr("environments/prod"),+ Activation: true,+ DataSources: []*v1pb.DataSource{{Type: v1pb.DataSourceType_ADMIN, Host: mysqlContainer.host, Port: mysqlContainer.port, Username: "root", Password: "root-password", Id: "admin"}},+ },+ }))+ a.NoError(err)+ mysqlInstance := mysqlInstanceResp.Msg++ pgInstanceResp, err := ctl.instanceServiceClient.CreateInstance(ctx, connect.NewRequest(&v1pb.CreateInstanceRequest{+ InstanceId: generateRandomString("instance"),+ Instance: &v1pb.Instance{+ Title: "pgInstance",+ Engine: v1pb.Engine_POSTGRES,+ Environment: stringPtr("environments/prod"),+ Activation: true,+ DataSources: []*v1pb.DataSource{{Type: v1pb.DataSourceType_ADMIN, Host: pgContainer.host, Port: pgContainer.port, Username: "postgres", Password: "root-password", Id: "admin"}},+ },+ }))+ a.NoError(err)+ pgInstance := pgInstanceResp.Msg++ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ t.Parallel()+ a := require.New(t)++ var instance *v1pb.Instance+ databaseOwner := ""+ switch tt.dbType {+ case storepb.Engine_MYSQL:+ instance = mysqlInstance+ case storepb.Engine_POSTGRES:+ instance = pgInstance+ databaseOwner = "postgres"+ default:+ a.FailNow("unsupported db type")+ }++ err = ctl.createDatabaseV2(ctx, ctl.project, instance, nil, tt.databaseName, databaseOwner)+ a.NoError(err)++ databaseResp, err := ctl.databaseServiceClient.GetDatabase(ctx, connect.NewRequest(&v1pb.GetDatabaseRequest{+ Name: fmt.Sprintf("%s/databases/%s", instance.Name, tt.databaseName),+ }))+ a.NoError(err)+ database := databaseResp.Msg++ sheetResp, err := ctl.sheetServiceClient.CreateSheet(ctx, connect.NewRequest(&v1pb.CreateSheetRequest{+ Parent: ctl.project.Name,+ Sheet: &v1pb.Sheet{+ Title: "prepareStatements",+ Content: []byte(tt.prepareStatements),+ },+ }))+ a.NoError(err)+ sheet := sheetResp.Msg++ a.NotNil(database.InstanceResource)+ a.Equal(1, len(database.InstanceResource.DataSources))++ err = ctl.changeDatabase(ctx, ctl.project, database, sheet, v1pb.MigrationType_DDL)+ a.NoError(err)++ // Use AdminExecute (streaming API)+ // Note: AdminExecute doesn't use queryRetryStopOnError, so this test verifies+ // that the regular behavior is unchanged+ results, err := ctl.adminQuery(ctx, database, tt.query)++ // AdminExecute returns results with errors in the result objects+ a.NoError(err)+ a.NotNil(results)++ // Check that we got some results+ a.GreaterOrEqual(len(results), tt.wantResults)++ // Check if any result has an error+ hasError := false+ for _, result := range results {+ if result.Error != "" {+ hasError = true+ break+ }+ }+ a.Equal(tt.wantError, hasError)+ })+ }+}diff --git a/frontend/src/composables/useExecuteSQL.ts b/frontend/src/composables/useExecuteSQL.tsindex 0c37dc5168..71dcd6b7c4 100644--- a/frontend/src/composables/useExecuteSQL.ts+++ b/frontend/src/composables/useExecuteSQL.ts@@ -31,6 +31,7 @@ import { DatabaseGroupView } from "@/types/proto-es/v1/database_group_service_pbimport {QueryRequestSchema,QueryOptionSchema,+ QueryResult_PermissionDenied_CommandType,} from "@/types/proto-es/v1/sql_service_pb";import { PlanFeature } from "@/types/proto-es/v1/subscription_service_pb";import {@@ -353,17 +354,16 @@ const useExecuteSQL = () => {};const isOnlySelectError = (resultSet: SQLResultSetV1) => {- const patterns = [- /Support SELECT sql statement only/,- /disallow execute (DML|DDL) statement/,- /Support read-only command statements only/,- ];- return (- patterns.some((pattern) => resultSet.error.match(pattern)) ||- resultSet.results.some((result) => {- return patterns.some((pattern) => result.error.match(pattern));- })- );+ return resultSet.results.some((result) => {+ return (+ result.detailedError.case === "permissionDenied" &&+ [+ QueryResult_PermissionDenied_CommandType.DDL,+ QueryResult_PermissionDenied_CommandType.DML,+ QueryResult_PermissionDenied_CommandType.NON_READ_ONLY,+ ].includes(result.detailedError.value.commandType)+ );+ });};export { useExecuteSQL };diff --git a/frontend/src/types/proto-es/v1/sql_service_pb.d.ts b/frontend/src/types/proto-es/v1/sql_service_pb.d.tsindex 00bb7ad266..0bf442f48d 100644--- a/frontend/src/types/proto-es/v1/sql_service_pb.d.ts+++ b/frontend/src/types/proto-es/v1/sql_service_pb.d.ts@@ -278,6 +278,18 @@ export declare type QueryResult = Message<"bytebase.v1.QueryResult"> & {*/value: QueryResult_PostgresError;case: "postgresError";+ } | {+ /**+ * @generated from field: bytebase.v1.QueryResult.SyntaxError syntax_error = 13;+ */+ value: QueryResult_SyntaxError;+ case: "syntaxError";+ } | {+ /**+ * @generated from field: bytebase.v1.QueryResult.PermissionDenied permission_denied = 14;+ */+ value: QueryResult_PermissionDenied;+ case: "permissionDenied";} | { case: undefined; value?: undefined };/**@@ -401,6 +413,89 @@ export declare type QueryResult_PostgresError = Message<"bytebase.v1.QueryResult*/export declare const QueryResult_PostgresErrorSchema: GenMessage<QueryResult_PostgresError>;+/**+ * Syntax error with position information for editor highlighting+ *+ * @generated from message bytebase.v1.QueryResult.SyntaxError+ */+export declare type QueryResult_SyntaxError = Message<"bytebase.v1.QueryResult.SyntaxError"> & {+ /**+ * Position information for highlighting in editor+ *+ * @generated from field: bytebase.v1.Position start_position = 1;+ */+ startPosition?: Position;+};++/**+ * Describes the message bytebase.v1.QueryResult.SyntaxError.+ * Use `create(QueryResult_SyntaxErrorSchema)` to create a new message.+ */+export declare const QueryResult_SyntaxErrorSchema: GenMessage<QueryResult_SyntaxError>;++/**+ * Permission denied with resource information or disallowed command_type.+ * Either resource or command_type is available.+ *+ * @generated from message bytebase.v1.QueryResult.PermissionDenied+ */+export declare type QueryResult_PermissionDenied = Message<"bytebase.v1.QueryResult.PermissionDenied"> & {+ /**+ * Denied to access the resource.+ * Format:+ * instances/{instance}/databases/{database}+ * instances/{instance}/databases/{database}/schemas/{schema}+ * instances/{instance}/databases/{database}/tables/{table}+ * instances/{instance}/databases/{database}/schemas/{schema}/tables/{table}+ *+ * @generated from field: string resource = 1;+ */+ resource: string;++ /**+ * Disallowed command_type.+ *+ * @generated from field: bytebase.v1.QueryResult.PermissionDenied.CommandType command_type = 2;+ */+ commandType: QueryResult_PermissionDenied_CommandType;+};++/**+ * Describes the message bytebase.v1.QueryResult.PermissionDenied.+ * Use `create(QueryResult_PermissionDeniedSchema)` to create a new message.+ */+export declare const QueryResult_PermissionDeniedSchema: GenMessage<QueryResult_PermissionDenied>;++/**+ * @generated from enum bytebase.v1.QueryResult.PermissionDenied.CommandType+ */+export enum QueryResult_PermissionDenied_CommandType {+ /**+ * @generated from enum value: COMMAND_TYPE_UNSPECIFIED = 0;+ */+ COMMAND_TYPE_UNSPECIFIED = 0,++ /**+ * @generated from enum value: DDL = 1;+ */+ DDL = 1,++ /**+ * @generated from enum value: DML = 2;+ */+ DML = 2,++ /**+ * @generated from enum value: NON_READ_ONLY = 3;+ */+ NON_READ_ONLY = 3,+}++/**+ * Describes the enum bytebase.v1.QueryResult.PermissionDenied.CommandType.+ */+export declare const QueryResult_PermissionDenied_CommandTypeSchema: GenEnum<QueryResult_PermissionDenied_CommandType>;+/*** @generated from message bytebase.v1.QueryResult.Message*/diff --git a/frontend/src/types/proto-es/v1/sql_service_pb.js b/frontend/src/types/proto-es/v1/sql_service_pb.jsindex c59c7a95f2..abba9da86d 100644--- a/frontend/src/types/proto-es/v1/sql_service_pb.js+++ b/frontend/src/types/proto-es/v1/sql_service_pb.js@@ -16,7 +16,7 @@ import { file_v1_database_service } from "./database_service_pb";* Describes the file v1/sql_service.proto.*/export const file_v1_sql_service = /*@__PURE__*/- fileDesc("ChR2MS9zcWxfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEisAEKE0FkbWluRXhlY3V0ZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAMgASgJEg0KBWxpbWl0GAQgASgFEhMKBnNjaGVtYRgGIAEoCUgAiAEBEhYKCWNvbnRhaW5lchgHIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lckoECAIQAyJBChRBZG1pbkV4ZWN1dGVSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQihwIKDFF1ZXJ5UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAyABKAkSDQoFbGltaXQYBCABKAUSGwoOZGF0YV9zb3VyY2VfaWQYBiABKAlCA+BBAhIPCgdleHBsYWluGAcgASgIEhMKBnNjaGVtYRgIIAEoCUgAiAEBEi4KDHF1ZXJ5X29wdGlvbhgJIAEoCzIYLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uEhYKCWNvbnRhaW5lchgKIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lckoECAIQAyJACg1RdWVyeVJlc3BvbnNlEikKB3Jlc3VsdHMYASADKAsyGC5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdEoECAIQAyK2AQoLUXVlcnlPcHRpb24SSgoVcmVkaXNfcnVuX2NvbW1hbmRzX29uGAEgASgOMisuYnl0ZWJhc2UudjEuUXVlcnlPcHRpb24uUmVkaXNSdW5Db21tYW5kc09uIlsKElJlZGlzUnVuQ29tbWFuZHNPbhIlCiFSRURJU19SVU5fQ09NTUFORFNfT05fVU5TUEVDSUZJRUQQABIPCgtTSU5HTEVfTk9ERRABEg0KCUFMTF9OT0RFUxACIooHCgtRdWVyeVJlc3VsdBIUCgxjb2x1bW5fbmFtZXMYASADKAkSGQoRY29sdW1uX3R5cGVfbmFtZXMYAiADKAkSIwoEcm93cxgDIAMoCzIVLmJ5dGViYXNlLnYxLlF1ZXJ5Um93EhIKCnJvd3NfY291bnQYCiABKAMSDQoFZXJyb3IYBiABKAkSKgoHbGF0ZW5jeRgHIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIRCglzdGF0ZW1lbnQYCCABKAkSQAoOcG9zdGdyZXNfZXJyb3IYCSABKAsyJi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5Qb3N0Z3Jlc0Vycm9ySAASMgoIbWVzc2FnZXMYDCADKAsyIC5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5NZXNzYWdlEioKBm1hc2tlZBgEIAMoCzIaLmJ5dGViYXNlLnYxLk1hc2tpbmdSZWFzb24azgIKDVBvc3RncmVzRXJyb3ISEAoIc2V2ZXJpdHkYASABKAkSDAoEY29kZRgCIAEoCRIPCgdtZXNzYWdlGAMgASgJEg4KBmRldGFpbBgEIAEoCRIMCgRoaW50GAUgASgJEhAKCHBvc2l0aW9uGAYgASgFEhkKEWludGVybmFsX3Bvc2l0aW9uGAcgASgFEhYKDmludGVybmFsX3F1ZXJ5GAggASgJEg0KBXdoZXJlGAkgASgJEhMKC3NjaGVtYV9uYW1lGAogASgJEhIKCnRhYmxlX25hbWUYCyABKAkSEwoLY29sdW1uX25hbWUYDCABKAkSFgoOZGF0YV90eXBlX25hbWUYDSABKAkSFwoPY29uc3RyYWludF9uYW1lGA4gASgJEgwKBGZpbGUYDyABKAkSDAoEbGluZRgQIAEoBRIPCgdyb3V0aW5lGBEgASgJGrcBCgdNZXNzYWdlEjUKBWxldmVsGAEgASgOMiYuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuTWVzc2FnZS5MZXZlbBIPCgdjb250ZW50GAIgASgJImQKBUxldmVsEhUKEUxFVkVMX1VOU1BFQ0lGSUVEEAASCAoESU5GTxABEgsKB1dBUk5JTkcQAhIJCgVERUJVRxADEgcKA0xPRxAEEgoKBk5PVElDRRAFEg0KCUVYQ0VQVElPThAGQhAKDmRldGFpbGVkX2Vycm9ySgQICxAMIr0BCg1NYXNraW5nUmVhc29uEhgKEHNlbWFudGljX3R5cGVfaWQYASABKAkSGwoTc2VtYW50aWNfdHlwZV90aXRsZRgCIAEoCRIXCg9tYXNraW5nX3J1bGVfaWQYAyABKAkSEQoJYWxnb3JpdGhtGAQgASgJEg8KB2NvbnRleHQYBSABKAkSHAoUY2xhc3NpZmljYXRpb25fbGV2ZWwYBiABKAkSGgoSc2VtYW50aWNfdHlwZV9pY29uGAcgASgJIjEKCFF1ZXJ5Um93EiUKBnZhbHVlcxgBIAMoCzIVLmJ5dGViYXNlLnYxLlJvd1ZhbHVlIowFCghSb3dWYWx1ZRIwCgpudWxsX3ZhbHVlGAEgASgOMhouZ29vZ2xlLnByb3RvYnVmLk51bGxWYWx1ZUgAEhQKCmJvb2xfdmFsdWUYAiABKAhIABIVCgtieXRlc192YWx1ZRgDIAEoDEgAEhYKDGRvdWJsZV92YWx1ZRgEIAEoAUgAEhUKC2Zsb2F0X3ZhbHVlGAUgASgCSAASFQoLaW50MzJfdmFsdWUYBiABKAVIABIVCgtpbnQ2NF92YWx1ZRgHIAEoA0gAEhYKDHN0cmluZ192YWx1ZRgIIAEoCUgAEhYKDHVpbnQzMl92YWx1ZRgJIAEoDUgAEhYKDHVpbnQ2NF92YWx1ZRgKIAEoBEgAEi0KC3ZhbHVlX3ZhbHVlGAsgASgLMhYuZ29vZ2xlLnByb3RvYnVmLlZhbHVlSAASOgoPdGltZXN0YW1wX3ZhbHVlGAwgASgLMh8uYnl0ZWJhc2UudjEuUm93VmFsdWUuVGltZXN0YW1wSAASPwoSdGltZXN0YW1wX3R6X3ZhbHVlGA0gASgLMiEuYnl0ZWJhc2UudjEuUm93VmFsdWUuVGltZXN0YW1wVFpIABpTCglUaW1lc3RhbXASNAoQZ29vZ2xlX3RpbWVzdGFtcBgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASEAoIYWNjdXJhY3kYAiABKAUacwoLVGltZXN0YW1wVFoSNAoQZ29vZ2xlX3RpbWVzdGFtcBgBIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASDAoEem9uZRgCIAEoCRIOCgZvZmZzZXQYAyABKAUSEAoIYWNjdXJhY3kYBCABKAVCBgoEa2luZCKVAwoGQWR2aWNlEikKBnN0YXR1cxgBIAEoDjIZLmJ5dGViYXNlLnYxLkFkdmljZS5MZXZlbBIMCgRjb2RlGAIgASgFEg0KBXRpdGxlGAMgASgJEg8KB2NvbnRlbnQYBCABKAkSLQoOc3RhcnRfcG9zaXRpb24YCCABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhIrCgxlbmRfcG9zaXRpb24YCSABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhIvCglydWxlX3R5cGUYCiABKA4yHC5ieXRlYmFzZS52MS5BZHZpY2UuUnVsZVR5cGUiSgoFTGV2ZWwSHAoYQURWSUNFX0xFVkVMX1VOU1BFQ0lGSUVEEAASCwoHU1VDQ0VTUxABEgsKB1dBUk5JTkcQAhIJCgVFUlJPUhADIkcKCFJ1bGVUeXBlEhkKFVJVTEVfVFlQRV9VTlNQRUNJRklFRBAAEhAKDFBBUlNFUl9CQVNFRBABEg4KCkFJX1BPV0VSRUQQAkoECAcQCEoECAUQBkoECAYQByLoAQoNRXhwb3J0UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAyABKAkSDQoFbGltaXQYBCABKAUSKQoGZm9ybWF0GAUgASgOMhkuYnl0ZWJhc2UudjEuRXhwb3J0Rm9ybWF0Eg0KBWFkbWluGAYgASgIEhAKCHBhc3N3b3JkGAcgASgJEhYKDmRhdGFfc291cmNlX2lkGAggASgJEhMKBnNjaGVtYRgJIAEoCUgAiAEBQgkKB19zY2hlbWFKBAgCEAMiIQoORXhwb3J0UmVzcG9uc2USDwoHY29udGVudBgBIAEoDCLEAgoTRGlmZk1ldGFkYXRhUmVxdWVzdBI7Cg9zb3VyY2VfbWV0YWRhdGEYASABKAsyHS5ieXRlYmFzZS52MS5EYXRhYmFzZU1ldGFkYXRhQgPgQQISOwoPdGFyZ2V0X21ldGFkYXRhGAIgASgLMh0uYnl0ZWJhc2UudjEuRGF0YWJhc2VNZXRhZGF0YUID4EECEjQKDnNvdXJjZV9jYXRhbG9nGAUgASgLMhwuYnl0ZWJhc2UudjEuRGF0YWJhc2VDYXRhbG9nEjQKDnRhcmdldF9jYXRhbG9nGAYgASgLMhwuYnl0ZWJhc2UudjEuRGF0YWJhc2VDYXRhbG9nEiMKBmVuZ2luZRgDIAEoDjITLmJ5dGViYXNlLnYxLkVuZ2luZRIiChpjbGFzc2lmaWNhdGlvbl9mcm9tX2NvbmZpZxgEIAEoCCIkChREaWZmTWV0YWRhdGFSZXNwb25zZRIMCgRkaWZmGAEgASgJIlQKG1NlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVxdWVzdBIRCglwYWdlX3NpemUYASABKAUSEgoKcGFnZV90b2tlbhgCIAEoCRIOCgZmaWx0ZXIYAyABKAkicAocU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXNwb25zZRI3Cg9xdWVyeV9oaXN0b3JpZXMYASADKAsyGS5ieXRlYmFzZS52MS5RdWVyeUhpc3RvcnlCA+BBAxIXCg9uZXh0X3BhZ2VfdG9rZW4YAiABKAki1AIKDFF1ZXJ5SGlzdG9yeRIRCgRuYW1lGAEgASgJQgPgQQMSFQoIZGF0YWJhc2UYAiABKAlCA+BBAxIUCgdjcmVhdG9yGAMgASgJQgPgQQMSNAoLY3JlYXRlX3RpbWUYBCABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wQgPgQQMSFgoJc3RhdGVtZW50GAUgASgJQgPgQQMSFwoFZXJyb3IYBiABKAlCA+BBA0gAiAEBEjAKCGR1cmF0aW9uGAcgASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uQgPgQQMSLAoEdHlwZRgIIAEoDjIeLmJ5dGViYXNlLnYxLlF1ZXJ5SGlzdG9yeS5UeXBlIjMKBFR5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEgkKBVFVRVJZEAESCgoGRVhQT1JUEAJCCAoGX2Vycm9yInsKE0FJQ29tcGxldGlvblJlcXVlc3QSOgoIbWVzc2FnZXMYASADKAsyKC5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXF1ZXN0Lk1lc3NhZ2UaKAoHTWVzc2FnZRIMCgRyb2xlGAEgASgJEg8KB2NvbnRlbnQYAiABKAkilQIKFEFJQ29tcGxldGlvblJlc3BvbnNlEj8KCmNhbmRpZGF0ZXMYASADKAsyKy5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZS5DYW5kaWRhdGUauwEKCUNhbmRpZGF0ZRJECgdjb250ZW50GAEgASgLMjMuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UuQ2FuZGlkYXRlLkNvbnRlbnQaaAoHQ29udGVudBJHCgVwYXJ0cxgBIAMoCzI4LmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlLkNhbmRpZGF0ZS5Db250ZW50LlBhcnQaFAoEUGFydBIMCgR0ZXh0GAEgASgJMr0HCgpTUUxTZXJ2aWNlEo8BCgVRdWVyeRIZLmJ5dGViYXNlLnYxLlF1ZXJ5UmVxdWVzdBoaLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzcG9uc2UiT4rqMBBiYi5kYXRhYmFzZXMuZ2V0kOowAZjqMAGC0+STAi06ASoiKC92MS97bmFtZT1pbnN0YW5jZXMvKi9kYXRhYmFzZXMvKn06cXVlcnkSiQEKDEFkbWluRXhlY3V0ZRIgLmJ5dGViYXNlLnYxLkFkbWluRXhlY3V0ZVJlcXVlc3QaIS5ieXRlYmFzZS52MS5BZG1pbkV4ZWN1dGVSZXNwb25zZSIwiuowDGJiLnNxbC5hZG1pbpDqMAGY6jABgtPkkwISEhAvdjE6YWRtaW5FeGVjdXRlKAEwARKVAQoUU2VhcmNoUXVlcnlIaXN0b3JpZXMSKC5ieXRlYmFzZS52MS5TZWFyY2hRdWVyeUhpc3Rvcmllc1JlcXVlc3QaKS5ieXRlYmFzZS52MS5TZWFyY2hRdWVyeUhpc3Rvcmllc1Jlc3BvbnNlIiiQ6jACgtPkkwIeOgEqIhkvdjEvcXVlcnlIaXN0b3JpZXM6c2VhcmNoEvoBCgZFeHBvcnQSGi5ieXRlYmFzZS52MS5FeHBvcnRSZXF1ZXN0GhsuYnl0ZWJhc2UudjEuRXhwb3J0UmVzcG9uc2UitgGK6jAQYmIuZGF0YWJhc2VzLmdldJDqMAGY6jABgtPkkwKTAToBKlosOgEqIicvdjEve25hbWU9cHJvamVjdHMvKi9yb2xsb3V0cy8qfTpleHBvcnRaNToBKiIwL3YxL3tuYW1lPXByb2plY3RzLyovcm9sbG91dHMvKi9zdGFnZXMvKn06ZXhwb3J0IikvdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9OmV4cG9ydBKBAQoMRGlmZk1ldGFkYXRhEiAuYnl0ZWJhc2UudjEuRGlmZk1ldGFkYXRhUmVxdWVzdBohLmJ5dGViYXNlLnYxLkRpZmZNZXRhZGF0YVJlc3BvbnNlIiyA6jABgtPkkwIiOgEqIh0vdjEvc2NoZW1hRGVzaWduOmRpZmZNZXRhZGF0YRJ4CgxBSUNvbXBsZXRpb24SIC5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXF1ZXN0GiEuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UiI5DqMAKC0+STAhk6ASoiFC92MS9zcWwvYWlDb21wbGV0aW9uQqUBCg9jb20uYnl0ZWJhc2UudjFCD1NxbFNlcnZpY2VQcm90b1ABWjRnaXRodWIuY29tL2J5dGViYXNlL2J5dGViYXNlL2JhY2tlbmQvZ2VuZXJhdGVkLWdvL3YxogIDQlhYqgILQnl0ZWJhc2UuVjHKAgtCeXRlYmFzZVxWMeICF0J5dGViYXNlXFYxXEdQQk1ldGFkYXRh6gIMQnl0ZWJhc2U6OlYxYgZwcm90bzM", [file_google_api_annotations, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_struct, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_database_catalog_service, file_v1_database_service]);+ fileDesc("ChR2MS9zcWxfc2VydmljZS5wcm90bxILYnl0ZWJhc2UudjEisAEKE0FkbWluRXhlY3V0ZVJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAMgASgJEg0KBWxpbWl0GAQgASgFEhMKBnNjaGVtYRgGIAEoCUgAiAEBEhYKCWNvbnRhaW5lchgHIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lckoECAIQAyJBChRBZG1pbkV4ZWN1dGVSZXNwb25zZRIpCgdyZXN1bHRzGAEgAygLMhguYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQihwIKDFF1ZXJ5UmVxdWVzdBIrCgRuYW1lGAEgASgJQh3gQQL6QRcKFWJ5dGViYXNlLmNvbS9EYXRhYmFzZRIRCglzdGF0ZW1lbnQYAyABKAkSDQoFbGltaXQYBCABKAUSGwoOZGF0YV9zb3VyY2VfaWQYBiABKAlCA+BBAhIPCgdleHBsYWluGAcgASgIEhMKBnNjaGVtYRgIIAEoCUgAiAEBEi4KDHF1ZXJ5X29wdGlvbhgJIAEoCzIYLmJ5dGViYXNlLnYxLlF1ZXJ5T3B0aW9uEhYKCWNvbnRhaW5lchgKIAEoCUgBiAEBQgkKB19zY2hlbWFCDAoKX2NvbnRhaW5lckoECAIQAyJACg1RdWVyeVJlc3BvbnNlEikKB3Jlc3VsdHMYASADKAsyGC5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdEoECAIQAyK2AQoLUXVlcnlPcHRpb24SSgoVcmVkaXNfcnVuX2NvbW1hbmRzX29uGAEgASgOMisuYnl0ZWJhc2UudjEuUXVlcnlPcHRpb24uUmVkaXNSdW5Db21tYW5kc09uIlsKElJlZGlzUnVuQ29tbWFuZHNPbhIlCiFSRURJU19SVU5fQ09NTUFORFNfT05fVU5TUEVDSUZJRUQQABIPCgtTSU5HTEVfTk9ERRABEg0KCUFMTF9OT0RFUxACIpQKCgtRdWVyeVJlc3VsdBIUCgxjb2x1bW5fbmFtZXMYASADKAkSGQoRY29sdW1uX3R5cGVfbmFtZXMYAiADKAkSIwoEcm93cxgDIAMoCzIVLmJ5dGViYXNlLnYxLlF1ZXJ5Um93EhIKCnJvd3NfY291bnQYCiABKAMSDQoFZXJyb3IYBiABKAkSKgoHbGF0ZW5jeRgHIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbhIRCglzdGF0ZW1lbnQYCCABKAkSQAoOcG9zdGdyZXNfZXJyb3IYCSABKAsyJi5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5Qb3N0Z3Jlc0Vycm9ySAASPAoMc3ludGF4X2Vycm9yGA0gASgLMiQuYnl0ZWJhc2UudjEuUXVlcnlSZXN1bHQuU3ludGF4RXJyb3JIABJGChFwZXJtaXNzaW9uX2RlbmllZBgOIAEoCzIpLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0LlBlcm1pc3Npb25EZW5pZWRIABIyCghtZXNzYWdlcxgMIAMoCzIgLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0Lk1lc3NhZ2USKgoGbWFza2VkGAQgAygLMhouYnl0ZWJhc2UudjEuTWFza2luZ1JlYXNvbhrOAgoNUG9zdGdyZXNFcnJvchIQCghzZXZlcml0eRgBIAEoCRIMCgRjb2RlGAIgASgJEg8KB21lc3NhZ2UYAyABKAkSDgoGZGV0YWlsGAQgASgJEgwKBGhpbnQYBSABKAkSEAoIcG9zaXRpb24YBiABKAUSGQoRaW50ZXJuYWxfcG9zaXRpb24YByABKAUSFgoOaW50ZXJuYWxfcXVlcnkYCCABKAkSDQoFd2hlcmUYCSABKAkSEwoLc2NoZW1hX25hbWUYCiABKAkSEgoKdGFibGVfbmFtZRgLIAEoCRITCgtjb2x1bW5fbmFtZRgMIAEoCRIWCg5kYXRhX3R5cGVfbmFtZRgNIAEoCRIXCg9jb25zdHJhaW50X25hbWUYDiABKAkSDAoEZmlsZRgPIAEoCRIMCgRsaW5lGBAgASgFEg8KB3JvdXRpbmUYESABKAkaPAoLU3ludGF4RXJyb3ISLQoOc3RhcnRfcG9zaXRpb24YASABKAsyFS5ieXRlYmFzZS52MS5Qb3NpdGlvbhrDAQoQUGVybWlzc2lvbkRlbmllZBIQCghyZXNvdXJjZRgBIAEoCRJLCgxjb21tYW5kX3R5cGUYAiABKA4yNS5ieXRlYmFzZS52MS5RdWVyeVJlc3VsdC5QZXJtaXNzaW9uRGVuaWVkLkNvbW1hbmRUeXBlIlAKC0NvbW1hbmRUeXBlEhwKGENPTU1BTkRfVFlQRV9VTlNQRUNJRklFRBAAEgcKA0RETBABEgcKA0RNTBACEhEKDU5PTl9SRUFEX09OTFkQAxq3AQoHTWVzc2FnZRI1CgVsZXZlbBgBIAEoDjImLmJ5dGViYXNlLnYxLlF1ZXJ5UmVzdWx0Lk1lc3NhZ2UuTGV2ZWwSDwoHY29udGVudBgCIAEoCSJkCgVMZXZlbBIVChFMRVZFTF9VTlNQRUNJRklFRBAAEggKBElORk8QARILCgdXQVJOSU5HEAISCQoFREVCVUcQAxIHCgNMT0cQBBIKCgZOT1RJQ0UQBRINCglFWENFUFRJT04QBkIQCg5kZXRhaWxlZF9lcnJvckoECAsQDCK9AQoNTWFza2luZ1JlYXNvbhIYChBzZW1hbnRpY190eXBlX2lkGAEgASgJEhsKE3NlbWFudGljX3R5cGVfdGl0bGUYAiABKAkSFwoPbWFza2luZ19ydWxlX2lkGAMgASgJEhEKCWFsZ29yaXRobRgEIAEoCRIPCgdjb250ZXh0GAUgASgJEhwKFGNsYXNzaWZpY2F0aW9uX2xldmVsGAYgASgJEhoKEnNlbWFudGljX3R5cGVfaWNvbhgHIAEoCSIxCghRdWVyeVJvdxIlCgZ2YWx1ZXMYASADKAsyFS5ieXRlYmFzZS52MS5Sb3dWYWx1ZSKMBQoIUm93VmFsdWUSMAoKbnVsbF92YWx1ZRgBIAEoDjIaLmdvb2dsZS5wcm90b2J1Zi5OdWxsVmFsdWVIABIUCgpib29sX3ZhbHVlGAIgASgISAASFQoLYnl0ZXNfdmFsdWUYAyABKAxIABIWCgxkb3VibGVfdmFsdWUYBCABKAFIABIVCgtmbG9hdF92YWx1ZRgFIAEoAkgAEhUKC2ludDMyX3ZhbHVlGAYgASgFSAASFQoLaW50NjRfdmFsdWUYByABKANIABIWCgxzdHJpbmdfdmFsdWUYCCABKAlIABIWCgx1aW50MzJfdmFsdWUYCSABKA1IABIWCgx1aW50NjRfdmFsdWUYCiABKARIABItCgt2YWx1ZV92YWx1ZRgLIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5WYWx1ZUgAEjoKD3RpbWVzdGFtcF92YWx1ZRgMIAEoCzIfLmJ5dGViYXNlLnYxLlJvd1ZhbHVlLlRpbWVzdGFtcEgAEj8KEnRpbWVzdGFtcF90el92YWx1ZRgNIAEoCzIhLmJ5dGViYXNlLnYxLlJvd1ZhbHVlLlRpbWVzdGFtcFRaSAAaUwoJVGltZXN0YW1wEjQKEGdvb2dsZV90aW1lc3RhbXAYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEhAKCGFjY3VyYWN5GAIgASgFGnMKC1RpbWVzdGFtcFRaEjQKEGdvb2dsZV90aW1lc3RhbXAYASABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEgwKBHpvbmUYAiABKAkSDgoGb2Zmc2V0GAMgASgFEhAKCGFjY3VyYWN5GAQgASgFQgYKBGtpbmQilQMKBkFkdmljZRIpCgZzdGF0dXMYASABKA4yGS5ieXRlYmFzZS52MS5BZHZpY2UuTGV2ZWwSDAoEY29kZRgCIAEoBRINCgV0aXRsZRgDIAEoCRIPCgdjb250ZW50GAQgASgJEi0KDnN0YXJ0X3Bvc2l0aW9uGAggASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24SKwoMZW5kX3Bvc2l0aW9uGAkgASgLMhUuYnl0ZWJhc2UudjEuUG9zaXRpb24SLwoJcnVsZV90eXBlGAogASgOMhwuYnl0ZWJhc2UudjEuQWR2aWNlLlJ1bGVUeXBlIkoKBUxldmVsEhwKGEFEVklDRV9MRVZFTF9VTlNQRUNJRklFRBAAEgsKB1NVQ0NFU1MQARILCgdXQVJOSU5HEAISCQoFRVJST1IQAyJHCghSdWxlVHlwZRIZChVSVUxFX1RZUEVfVU5TUEVDSUZJRUQQABIQCgxQQVJTRVJfQkFTRUQQARIOCgpBSV9QT1dFUkVEEAJKBAgHEAhKBAgFEAZKBAgGEAci6AEKDUV4cG9ydFJlcXVlc3QSKwoEbmFtZRgBIAEoCUId4EEC+kEXChVieXRlYmFzZS5jb20vRGF0YWJhc2USEQoJc3RhdGVtZW50GAMgASgJEg0KBWxpbWl0GAQgASgFEikKBmZvcm1hdBgFIAEoDjIZLmJ5dGViYXNlLnYxLkV4cG9ydEZvcm1hdBINCgVhZG1pbhgGIAEoCBIQCghwYXNzd29yZBgHIAEoCRIWCg5kYXRhX3NvdXJjZV9pZBgIIAEoCRITCgZzY2hlbWEYCSABKAlIAIgBAUIJCgdfc2NoZW1hSgQIAhADIiEKDkV4cG9ydFJlc3BvbnNlEg8KB2NvbnRlbnQYASABKAwixAIKE0RpZmZNZXRhZGF0YVJlcXVlc3QSOwoPc291cmNlX21ldGFkYXRhGAEgASgLMh0uYnl0ZWJhc2UudjEuRGF0YWJhc2VNZXRhZGF0YUID4EECEjsKD3RhcmdldF9tZXRhZGF0YRgCIAEoCzIdLmJ5dGViYXNlLnYxLkRhdGFiYXNlTWV0YWRhdGFCA+BBAhI0Cg5zb3VyY2VfY2F0YWxvZxgFIAEoCzIcLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2F0YWxvZxI0Cg50YXJnZXRfY2F0YWxvZxgGIAEoCzIcLmJ5dGViYXNlLnYxLkRhdGFiYXNlQ2F0YWxvZxIjCgZlbmdpbmUYAyABKA4yEy5ieXRlYmFzZS52MS5FbmdpbmUSIgoaY2xhc3NpZmljYXRpb25fZnJvbV9jb25maWcYBCABKAgiJAoURGlmZk1ldGFkYXRhUmVzcG9uc2USDAoEZGlmZhgBIAEoCSJUChtTZWFyY2hRdWVyeUhpc3Rvcmllc1JlcXVlc3QSEQoJcGFnZV9zaXplGAEgASgFEhIKCnBhZ2VfdG9rZW4YAiABKAkSDgoGZmlsdGVyGAMgASgJInAKHFNlYXJjaFF1ZXJ5SGlzdG9yaWVzUmVzcG9uc2USNwoPcXVlcnlfaGlzdG9yaWVzGAEgAygLMhkuYnl0ZWJhc2UudjEuUXVlcnlIaXN0b3J5QgPgQQMSFwoPbmV4dF9wYWdlX3Rva2VuGAIgASgJItQCCgxRdWVyeUhpc3RvcnkSEQoEbmFtZRgBIAEoCUID4EEDEhUKCGRhdGFiYXNlGAIgASgJQgPgQQMSFAoHY3JlYXRvchgDIAEoCUID4EEDEjQKC2NyZWF0ZV90aW1lGAQgASgLMhouZ29vZ2xlLnByb3RvYnVmLlRpbWVzdGFtcEID4EEDEhYKCXN0YXRlbWVudBgFIAEoCUID4EEDEhcKBWVycm9yGAYgASgJQgPgQQNIAIgBARIwCghkdXJhdGlvbhgHIAEoCzIZLmdvb2dsZS5wcm90b2J1Zi5EdXJhdGlvbkID4EEDEiwKBHR5cGUYCCABKA4yHi5ieXRlYmFzZS52MS5RdWVyeUhpc3RvcnkuVHlwZSIzCgRUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABIJCgVRVUVSWRABEgoKBkVYUE9SVBACQggKBl9lcnJvciJ7ChNBSUNvbXBsZXRpb25SZXF1ZXN0EjoKCG1lc3NhZ2VzGAEgAygLMiguYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVxdWVzdC5NZXNzYWdlGigKB01lc3NhZ2USDAoEcm9sZRgBIAEoCRIPCgdjb250ZW50GAIgASgJIpUCChRBSUNvbXBsZXRpb25SZXNwb25zZRI/CgpjYW5kaWRhdGVzGAEgAygLMisuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVzcG9uc2UuQ2FuZGlkYXRlGrsBCglDYW5kaWRhdGUSRAoHY29udGVudBgBIAEoCzIzLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlLkNhbmRpZGF0ZS5Db250ZW50GmgKB0NvbnRlbnQSRwoFcGFydHMYASADKAsyOC5ieXRlYmFzZS52MS5BSUNvbXBsZXRpb25SZXNwb25zZS5DYW5kaWRhdGUuQ29udGVudC5QYXJ0GhQKBFBhcnQSDAoEdGV4dBgBIAEoCTK9BwoKU1FMU2VydmljZRKPAQoFUXVlcnkSGS5ieXRlYmFzZS52MS5RdWVyeVJlcXVlc3QaGi5ieXRlYmFzZS52MS5RdWVyeVJlc3BvbnNlIk+K6jAQYmIuZGF0YWJhc2VzLmdldJDqMAGY6jABgtPkkwItOgEqIigvdjEve25hbWU9aW5zdGFuY2VzLyovZGF0YWJhc2VzLyp9OnF1ZXJ5EokBCgxBZG1pbkV4ZWN1dGUSIC5ieXRlYmFzZS52MS5BZG1pbkV4ZWN1dGVSZXF1ZXN0GiEuYnl0ZWJhc2UudjEuQWRtaW5FeGVjdXRlUmVzcG9uc2UiMIrqMAxiYi5zcWwuYWRtaW6Q6jABmOowAYLT5JMCEhIQL3YxOmFkbWluRXhlY3V0ZSgBMAESlQEKFFNlYXJjaFF1ZXJ5SGlzdG9yaWVzEiguYnl0ZWJhc2UudjEuU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXF1ZXN0GikuYnl0ZWJhc2UudjEuU2VhcmNoUXVlcnlIaXN0b3JpZXNSZXNwb25zZSIokOowAoLT5JMCHjoBKiIZL3YxL3F1ZXJ5SGlzdG9yaWVzOnNlYXJjaBL6AQoGRXhwb3J0EhouYnl0ZWJhc2UudjEuRXhwb3J0UmVxdWVzdBobLmJ5dGViYXNlLnYxLkV4cG9ydFJlc3BvbnNlIrYBiuowEGJiLmRhdGFiYXNlcy5nZXSQ6jABmOowAYLT5JMCkwE6ASpaLDoBKiInL3YxL3tuYW1lPXByb2plY3RzLyovcm9sbG91dHMvKn06ZXhwb3J0WjU6ASoiMC92MS97bmFtZT1wcm9qZWN0cy8qL3JvbGxvdXRzLyovc3RhZ2VzLyp9OmV4cG9ydCIpL3YxL3tuYW1lPWluc3RhbmNlcy8qL2RhdGFiYXNlcy8qfTpleHBvcnQSgQEKDERpZmZNZXRhZGF0YRIgLmJ5dGViYXNlLnYxLkRpZmZNZXRhZGF0YVJlcXVlc3QaIS5ieXRlYmFzZS52MS5EaWZmTWV0YWRhdGFSZXNwb25zZSIsgOowAYLT5JMCIjoBKiIdL3YxL3NjaGVtYURlc2lnbjpkaWZmTWV0YWRhdGESeAoMQUlDb21wbGV0aW9uEiAuYnl0ZWJhc2UudjEuQUlDb21wbGV0aW9uUmVxdWVzdBohLmJ5dGViYXNlLnYxLkFJQ29tcGxldGlvblJlc3BvbnNlIiOQ6jACgtPkkwIZOgEqIhQvdjEvc3FsL2FpQ29tcGxldGlvbkKlAQoPY29tLmJ5dGViYXNlLnYxQg9TcWxTZXJ2aWNlUHJvdG9QAVo0Z2l0aHViLmNvbS9ieXRlYmFzZS9ieXRlYmFzZS9iYWNrZW5kL2dlbmVyYXRlZC1nby92MaICA0JYWKoCC0J5dGViYXNlLlYxygILQnl0ZWJhc2VcVjHiAhdCeXRlYmFzZVxWMVxHUEJNZXRhZGF0YeoCDEJ5dGViYXNlOjpWMWIGcHJvdG8z", [file_google_api_annotations, file_google_api_field_behavior, file_google_api_resource, file_google_protobuf_duration, file_google_protobuf_struct, file_google_protobuf_timestamp, file_v1_annotation, file_v1_common, file_v1_database_catalog_service, file_v1_database_service]);/*** Describes the message bytebase.v1.AdminExecuteRequest.@@ -79,18 +79,44 @@ export const QueryResultSchema = /*@__PURE__*/export const QueryResult_PostgresErrorSchema = /*@__PURE__*/messageDesc(file_v1_sql_service, 5, 0);+/**+ * Describes the message bytebase.v1.QueryResult.SyntaxError.+ * Use `create(QueryResult_SyntaxErrorSchema)` to create a new message.+ */+export const QueryResult_SyntaxErrorSchema = /*@__PURE__*/+ messageDesc(file_v1_sql_service, 5, 1);++/**+ * Describes the message bytebase.v1.QueryResult.PermissionDenied.+ * Use `create(QueryResult_PermissionDeniedSchema)` to create a new message.+ */+export const QueryResult_PermissionDeniedSchema = /*@__PURE__*/+ messageDesc(file_v1_sql_service, 5, 2);++/**+ * Describes the enum bytebase.v1.QueryResult.PermissionDenied.CommandType.+ */+export const QueryResult_PermissionDenied_CommandTypeSchema = /*@__PURE__*/+ enumDesc(file_v1_sql_service, 5, 2, 0);++/**+ * @generated from enum bytebase.v1.QueryResult.PermissionDenied.CommandType+ */+export const QueryResult_PermissionDenied_CommandType = /*@__PURE__*/+ tsEnum(QueryResult_PermissionDenied_CommandTypeSchema);+/*** Describes the message bytebase.v1.QueryResult.Message.* Use `create(QueryResult_MessageSchema)` to create a new message.*/export const QueryResult_MessageSchema = /*@__PURE__*/- messageDesc(file_v1_sql_service, 5, 1);+ messageDesc(file_v1_sql_service, 5, 3);/*** Describes the enum bytebase.v1.QueryResult.Message.Level.*/export const QueryResult_Message_LevelSchema = /*@__PURE__*/- enumDesc(file_v1_sql_service, 5, 1, 0);+ enumDesc(file_v1_sql_service, 5, 3, 0);/*** @generated from enum bytebase.v1.QueryResult.Message.Leveldiff --git a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vueindex 92a089118c..6d4d68cfe5 100644--- a/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue+++ b/frontend/src/views/sql-editor/EditorCommon/ResultView/ResultViewV1.vue@@ -146,7 +146,6 @@<script lang="ts" setup>import { create } from "@bufbuild/protobuf";-import { Code } from "@connectrpc/connect";import dayjs from "dayjs";import { Info } from "lucide-vue-next";import {@@ -254,18 +253,15 @@ const detail: SQLResultViewContext["detail"] = ref(undefined);provideBinaryFormatContext(computed(() => props.contextId));const missingResource = computed((): DatabaseResource | undefined => {- if (props.resultSet?.status !== Code.PermissionDenied) {- return;- }- const prefix = "permission denied to access resource: ";- if (!props.resultSet.error.includes(prefix)) {- return;- }- const resource = props.resultSet.error.split(prefix).pop();- if (!resource) {- return;+ for (const result of props.resultSet?.results ?? []) {+ if (+ result.detailedError.case === "permissionDenied" &&+ result.detailedError.value?.resource !== ""+ ) {+ return parseStringToResource(result.detailedError.value?.resource);+ }}- return parseStringToResource(resource);+ return undefined;});const showRequestQueryButton = computed(() => {diff --git a/proto/gen/grpc-doc/openapi.yaml b/proto/gen/grpc-doc/openapi.yamlindex ea3ddf8b4f..5a808a25d3 100644--- a/proto/gen/grpc-doc/openapi.yaml+++ b/proto/gen/grpc-doc/openapi.yaml@@ -12253,6 +12253,10 @@ components:description: The query statement for the result.postgresError:$ref: '#/components/schemas/QueryResult_PostgresError'+ syntaxError:+ $ref: '#/components/schemas/QueryResult_SyntaxError'+ permissionDenied:+ $ref: '#/components/schemas/QueryResult_PermissionDenied'messages:type: arrayitems:@@ -12281,6 +12285,30 @@ components:format: enumcontent:type: string+ QueryResult_PermissionDenied:+ type: object+ properties:+ resource:+ type: string+ description: |-+ Denied to access the resource.+ Format:+ instances/{instance}/databases/{database}+ instances/{instance}/databases/{database}/schemas/{schema}+ instances/{instance}/databases/{database}/tables/{table}+ instances/{instance}/databases/{database}/schemas/{schema}/tables/{table}+ commandType:+ enum:+ - COMMAND_TYPE_UNSPECIFIED+ - DDL+ - DML+ - NON_READ_ONLY+ type: string+ description: Disallowed command_type.+ format: enum+ description: |-+ Permission denied with resource information or disallowed command_type.+ Either resource or command_type is available.QueryResult_PostgresError:type: objectproperties:@@ -12324,6 +12352,14 @@ components:description: |-refer https://www.postgresql.org/docs/11/protocol-error-fields.htmlfor field description.+ QueryResult_SyntaxError:+ type: object+ properties:+ startPosition:+ allOf:+ - $ref: '#/components/schemas/Position'+ description: Position information for highlighting in editor+ description: Syntax error with position information for editor highlightingQueryRow:type: objectproperties:diff --git a/proto/gen/grpc-doc/v1/README.md b/proto/gen/grpc-doc/v1/README.mdindex 05f47201f4..5002766d3f 100644--- a/proto/gen/grpc-doc/v1/README.md+++ b/proto/gen/grpc-doc/v1/README.md@@ -472,7 +472,9 @@- [QueryResponse](#bytebase-v1-QueryResponse)- [QueryResult](#bytebase-v1-QueryResult)- [QueryResult.Message](#bytebase-v1-QueryResult-Message)+ - [QueryResult.PermissionDenied](#bytebase-v1-QueryResult-PermissionDenied)- [QueryResult.PostgresError](#bytebase-v1-QueryResult-PostgresError)+ - [QueryResult.SyntaxError](#bytebase-v1-QueryResult-SyntaxError)- [QueryRow](#bytebase-v1-QueryRow)- [RowValue](#bytebase-v1-RowValue)- [RowValue.Timestamp](#bytebase-v1-RowValue-Timestamp)@@ -485,6 +487,7 @@- [QueryHistory.Type](#bytebase-v1-QueryHistory-Type)- [QueryOption.RedisRunCommandsOn](#bytebase-v1-QueryOption-RedisRunCommandsOn)- [QueryResult.Message.Level](#bytebase-v1-QueryResult-Message-Level)+ - [QueryResult.PermissionDenied.CommandType](#bytebase-v1-QueryResult-PermissionDenied-CommandType)- [SQLService](#bytebase-v1-SQLService)@@ -7857,6 +7860,8 @@ OrgPolicyService manages organizational policies at various resource levels.| latency | [google.protobuf.Duration](#google-protobuf-Duration) | | The time it takes to execute the query. || statement | [string](#string) | | The query statement for the result. || postgres_error | [QueryResult.PostgresError](#bytebase-v1-QueryResult-PostgresError) | | |+| syntax_error | [QueryResult.SyntaxError](#bytebase-v1-QueryResult-SyntaxError) | | |+| permission_denied | [QueryResult.PermissionDenied](#bytebase-v1-QueryResult-PermissionDenied) | | || messages | [QueryResult.Message](#bytebase-v1-QueryResult-Message) | repeated | Informational or debug messages returned by the database engine during query execution. Examples include PostgreSQL's RAISE NOTICE, MSSQL's PRINT, or Oracle's DBMS_OUTPUT.PUT_LINE. || masked | [MaskingReason](#bytebase-v1-MaskingReason) | repeated | Masking reasons for each column (empty for non-masked columns). |@@ -7881,6 +7886,23 @@ OrgPolicyService manages organizational policies at various resource levels.+<a name="bytebase-v1-QueryResult-PermissionDenied"></a>++### QueryResult.PermissionDenied+Permission denied with resource information or disallowed command_type.+Either resource or command_type is available.+++| Field | Type | Label | Description |+| ----- | ---- | ----- | ----------- |+| resource | [string](#string) | | Denied to access the resource. Format: instances/{instance}/databases/{database} instances/{instance}/databases/{database}/schemas/{schema} instances/{instance}/databases/{database}/tables/{table} instances/{instance}/databases/{database}/schemas/{schema}/tables/{table} |+| command_type | [QueryResult.PermissionDenied.CommandType](#bytebase-v1-QueryResult-PermissionDenied-CommandType) | | Disallowed command_type. |++++++<a name="bytebase-v1-QueryResult-PostgresError"></a>### QueryResult.PostgresError@@ -7913,6 +7935,21 @@ for field description.+<a name="bytebase-v1-QueryResult-SyntaxError"></a>++### QueryResult.SyntaxError+Syntax error with position information for editor highlighting+++| Field | Type | Label | Description |+| ----- | ---- | ----- | ----------- |+| start_position | [Position](#bytebase-v1-Position) | | Position information for highlighting in editor |++++++<a name="bytebase-v1-QueryRow"></a>### QueryRow@@ -8097,6 +8134,20 @@ RuleType indicates the source of the linting rule.| EXCEPTION | 6 | Exception message indicating error conditions. |++<a name="bytebase-v1-QueryResult-PermissionDenied-CommandType"></a>++### QueryResult.PermissionDenied.CommandType+++| Name | Number | Description |+| ---- | ------ | ----------- |+| COMMAND_TYPE_UNSPECIFIED | 0 | |+| DDL | 1 | |+| DML | 2 | |+| NON_READ_ONLY | 3 | |++diff --git a/proto/gen/grpc-doc/v1/index.html b/proto/gen/grpc-doc/v1/index.htmlindex 8c36310c40..9145964064 100644--- a/proto/gen/grpc-doc/v1/index.html+++ b/proto/gen/grpc-doc/v1/index.html@@ -1983,10 +1983,18 @@<a href="#bytebase.v1.QueryResult.Message"><span class="badge">M</span>QueryResult.Message</a></li>+ <li>+ <a href="#bytebase.v1.QueryResult.PermissionDenied"><span class="badge">M</span>QueryResult.PermissionDenied</a>+ </li>+<li><a href="#bytebase.v1.QueryResult.PostgresError"><span class="badge">M</span>QueryResult.PostgresError</a></li>+ <li>+ <a href="#bytebase.v1.QueryResult.SyntaxError"><span class="badge">M</span>QueryResult.SyntaxError</a>+ </li>+<li><a href="#bytebase.v1.QueryRow"><span class="badge">M</span>QueryRow</a></li>@@ -2032,6 +2040,10 @@<a href="#bytebase.v1.QueryResult.Message.Level"><span class="badge">E</span>QueryResult.Message.Level</a></li>+ <li>+ <a href="#bytebase.v1.QueryResult.PermissionDenied.CommandType"><span class="badge">E</span>QueryResult.PermissionDenied.CommandType</a>+ </li>+<li>@@ -22126,6 +22138,20 @@ The types come from the Golang SQL driver. </p></td><td><p> </p></td></tr>+ <tr>+ <td>syntax_error</td>+ <td><a href="#bytebase.v1.QueryResult.SyntaxError">QueryResult.SyntaxError</a></td>+ <td></td>+ <td><p> </p></td>+ </tr>++ <tr>+ <td>permission_denied</td>+ <td><a href="#bytebase.v1.QueryResult.PermissionDenied">QueryResult.PermissionDenied</a></td>+ <td></td>+ <td><p> </p></td>+ </tr>+<tr><td>messages</td><td><a href="#bytebase.v1.QueryResult.Message">QueryResult.Message</a></td>@@ -22179,6 +22205,42 @@ Examples include PostgreSQL's RAISE NOTICE, MSSQL's PRINT, or Oracle'+ <h3 id="bytebase.v1.QueryResult.PermissionDenied">QueryResult.PermissionDenied</h3>+ <p>Permission denied with resource information or disallowed command_type.</p><p>Either resource or command_type is available.</p>+++ <table class="field-table">+ <thead>+ <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>+ </thead>+ <tbody>++ <tr>+ <td>resource</td>+ <td><a href="#string">string</a></td>+ <td></td>+ <td><p>Denied to access the resource.+Format:+instances/{instance}/databases/{database}+instances/{instance}/databases/{database}/schemas/{schema}+instances/{instance}/databases/{database}/tables/{table}+instances/{instance}/databases/{database}/schemas/{schema}/tables/{table} </p></td>+ </tr>++ <tr>+ <td>command_type</td>+ <td><a href="#bytebase.v1.QueryResult.PermissionDenied.CommandType">QueryResult.PermissionDenied.CommandType</a></td>+ <td></td>+ <td><p>Disallowed command_type. </p></td>+ </tr>++ </tbody>+ </table>+++++<h3 id="bytebase.v1.QueryResult.PostgresError">QueryResult.PostgresError</h3><p>refer https://www.postgresql.org/docs/11/protocol-error-fields.html</p><p>for field description.</p>@@ -22315,6 +22377,30 @@ Examples include PostgreSQL's RAISE NOTICE, MSSQL's PRINT, or Oracle'+ <h3 id="bytebase.v1.QueryResult.SyntaxError">QueryResult.SyntaxError</h3>+ <p>Syntax error with position information for editor highlighting</p>+++ <table class="field-table">+ <thead>+ <tr><td>Field</td><td>Type</td><td>Label</td><td>Description</td></tr>+ </thead>+ <tbody>++ <tr>+ <td>start_position</td>+ <td><a href="#bytebase.v1.Position">Position</a></td>+ <td></td>+ <td><p>Position information for highlighting in editor </p></td>+ </tr>++ </tbody>+ </table>+++++<h3 id="bytebase.v1.QueryRow">QueryRow</h3><p></p>@@ -22803,6 +22889,41 @@ These are custom, flexible checks powered by AI models.</p></td></tbody></table>+ <h3 id="bytebase.v1.QueryResult.PermissionDenied.CommandType">QueryResult.PermissionDenied.CommandType</h3>+ <p></p>+ <table class="enum-table">+ <thead>+ <tr><td>Name</td><td>Number</td><td>Description</td></tr>+ </thead>+ <tbody>++ <tr>+ <td>COMMAND_TYPE_UNSPECIFIED</td>+ <td>0</td>+ <td><p></p></td>+ </tr>++ <tr>+ <td>DDL</td>+ <td>1</td>+ <td><p></p></td>+ </tr>++ <tr>+ <td>DML</td>+ <td>2</td>+ <td><p></p></td>+ </tr>++ <tr>+ <td>NON_READ_ONLY</td>+ <td>3</td>+ <td><p></p></td>+ </tr>++ </tbody>+ </table>+diff --git a/proto/v1/v1/sql_service.proto b/proto/v1/v1/sql_service.protoindex 6222bf6a2f..01f3e46e44 100644--- a/proto/v1/v1/sql_service.proto+++ b/proto/v1/v1/sql_service.proto@@ -201,6 +201,8 @@ message QueryResult {oneof detailed_error {PostgresError postgres_error = 9;+ SyntaxError syntax_error = 13;+ PermissionDenied permission_denied = 14;}// refer https://www.postgresql.org/docs/11/protocol-error-fields.html@@ -225,6 +227,34 @@ message QueryResult {string routine = 17;}+ // Syntax error with position information for editor highlighting+ message SyntaxError {+ // Position information for highlighting in editor+ Position start_position = 1;+ }++ // Permission denied with resource information or disallowed command_type.+ // Either resource or command_type is available.+ message PermissionDenied {+ // Denied to access the resource.+ // Format:+ // instances/{instance}/databases/{database}+ // instances/{instance}/databases/{database}/schemas/{schema}+ // instances/{instance}/databases/{database}/tables/{table}+ // instances/{instance}/databases/{database}/schemas/{schema}/tables/{table}+ string resource = 1;++ // Disallowed command_type.+ CommandType command_type = 2;++ enum CommandType {+ COMMAND_TYPE_UNSPECIFIED = 0;+ DDL = 1;+ DML = 2;+ NON_READ_ONLY = 3;+ }+ }+reserved 11;message Message {