Skip to content

Database governance built for humans and agents — controlling changes and access across every major database.

fix: quick fail (#19199)

ecmadaod1b3abf4468f
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.go
index 6c6ef09f87..cd9936a2e3 100644
--- a/backend/api/v1/sql_service.go
+++ b/backend/api/v1/sql_service.go
@@ -1077,13 +1077,11 @@ func doExport(
exportCount := 0
for i, result := range results {
if result.GetError() != "" {
- logExportError(database, "failed to query result", errors.New(result.GetError()))
- continue
+ return nil, duration, errors.Errorf("failed to exec the SQL with error: %v", result.GetError())
}
if err := exportResultToZip(ctx, zipw, stores, instance, database, result, request, i+1); err != nil {
- logExportError(database, "failed to export result to zip", err)
- continue
+ return nil, duration, errors.Errorf("failed to export result to zip with error: %v", result.GetError())
}
exportCount++
@@ -1102,16 +1100,6 @@ func doExport(
return buf.Bytes(), duration, nil
}
-// logExportError logs export-related errors with consistent database context.
-func logExportError(database *store.DatabaseMessage, message string, err error) {
- slog.Error(message,
- log.BBError(err),
- slog.String("instance", database.InstanceID),
- slog.String("database", database.DatabaseName),
- slog.String("project", database.ProjectID),
- )
-}
-
// exportResultToZip exports a single query result to the ZIP archive.
// It writes both the SQL statement and the formatted result data.
func exportResultToZip(
diff --git a/backend/runner/taskrun/data_export_executor.go b/backend/runner/taskrun/data_export_executor.go
index 751cc78041..32fe523ef3 100644
--- a/backend/runner/taskrun/data_export_executor.go
+++ b/backend/runner/taskrun/data_export_executor.go
@@ -104,7 +104,13 @@ func (exec *DataExportExecutor) RunOnce(ctx context.Context, _ context.Context,
// For approved DATABASE_EXPORT tasks, the approval itself authorizes access to the data.
bytes, exportErr := exec.executeExport(ctx, instance, database, dataSource, statement, exportConfig.Format, creatorUser)
if exportErr != nil {
- return nil, errors.Wrap(exportErr, "failed to export data")
+ slog.Error("failed to export",
+ log.BBError(err),
+ slog.String("instance", database.InstanceID),
+ slog.String("database", database.DatabaseName),
+ slog.String("project", database.ProjectID),
+ )
+ return nil, exportErr
}
exportArchive, err := exec.store.CreateExportArchive(ctx, &store.ExportArchiveMessage{
@@ -223,13 +229,11 @@ func (exec *DataExportExecutor) formatAndZipResults(
exportCount := 0
for i, result := range results {
if result.GetError() != "" {
- logExportError(database, "failed to query result", errors.New(result.GetError()))
- continue
+ return nil, errors.Errorf("failed to exec the SQL with error: %v", result.GetError())
}
if err := exec.exportResultToZip(ctx, zipw, instance, database, result, format, statement, i+1); err != nil {
- logExportError(database, "failed to export result to zip", err)
- continue
+ return nil, errors.Errorf("failed to export result to zip with error: %v", result.GetError())
}
exportCount++
@@ -336,13 +340,3 @@ func (exec *DataExportExecutor) exportSQLWithContext(
}
return export.SQLToWriter(w, instance.Metadata.GetEngine(), statementPrefix, result)
}
-
-// logExportError logs export-related errors with consistent database context.
-func logExportError(database *store.DatabaseMessage, message string, err error) {
- slog.Error(message,
- log.BBError(err),
- slog.String("instance", database.InstanceID),
- slog.String("database", database.DatabaseName),
- slog.String("project", database.ProjectID),
- )
-}