Skip to content

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

refactor: drop duplicate query data policy fetch in Query() (#21202)

h3n4lc6f9d7da556d
diff --git a/backend/api/v1/sql_service.go b/backend/api/v1/sql_service.go
index a002eddd4c..7a121765b4 100644
--- a/backend/api/v1/sql_service.go
+++ b/backend/api/v1/sql_service.go
@@ -347,14 +347,14 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR
}
}
- queryDataPolicy := getEffectiveQueryDataPolicy(
+ queryRestriction := getEffectiveQueryDataPolicy(
ctx,
s.store,
s.licenseService,
- 0,
+ request.Limit,
database.ProjectID,
)
- resolvedDataSourceID, err := resolveDataSourceID(ctx, instance, request.DataSourceId, statement, queryDataPolicy.AllowAdminDataSource)
+ resolvedDataSourceID, err := resolveDataSourceID(ctx, instance, request.DataSourceId, statement, queryRestriction.AllowAdminDataSource)
if err != nil {
return nil, err
}
@@ -384,13 +384,6 @@ func (s *SQLService) Query(ctx context.Context, req *connect.Request[v1pb.QueryR
}
startTime := time.Now()
- queryRestriction := getEffectiveQueryDataPolicy(
- ctx,
- s.store,
- s.licenseService,
- request.Limit,
- database.ProjectID,
- )
queryContext := db.QueryContext{
Explain: request.Explain,
Limit: int(queryRestriction.MaximumResultRows),