stackrox · davdhacs · Apr 11, 2026 · Apr 12, 2026 · Apr 12, 2026 · Apr 12, 2026
diff --git a/central/alert/datastore/datastore_impl.go b/central/alert/datastore/datastore_impl.go
@@ -106,7 +106,7 @@ func (ds *datastoreImpl) SearchAlertPolicyNamesAndSeverities(ctx context.Context
 	}
 
 	var results []*alertviews.PolicyNameAndSeverity
-	err := pgSearch.RunSelectRequestForSchemaFn(ctx, ds.db, schema.AlertsSchema, clonedQuery, func(r *alertviews.PolicyNameAndSeverity) error {
+	err := pgSearch.RunSelectRequestForSchemaFn(ctx, ds.db, schema.AlertsSchema(), clonedQuery, func(r *alertviews.PolicyNameAndSeverity) error {
 		results = append(results, r)
 		return nil
 	})
@@ -129,7 +129,7 @@ func (ds *datastoreImpl) SearchAlertPolicySeverityCounts(ctx context.Context, q
 	emptyResult := &alertviews.PolicySeverityCounts{}
 	results := make([]*alertviews.PolicySeverityCounts, 0)
 	// TODO(ROX-33425): replace call with one specific for counts that only returns a single row
-	err := pgSearch.RunSelectRequestForSchemaFn(ctx, ds.db, schema.AlertsSchema, countQuery, func(r *alertviews.PolicySeverityCounts) error {
+	err := pgSearch.RunSelectRequestForSchemaFn(ctx, ds.db, schema.AlertsSchema(), countQuery, func(r *alertviews.PolicySeverityCounts) error {
 		results = append(results, r)
 		return nil
 	})
@@ -162,7 +162,7 @@ func (ds *datastoreImpl) SearchAlertPolicyGroups(ctx context.Context, q *v1.Quer
 	groupQuery := alertviews.WithAlertPolicyGroupQuery(q)
 
 	var results []*alertviews.AlertPolicyGroup
-	err := pgSearch.RunSelectRequestForSchemaFn(ctx, ds.db, schema.AlertsSchema, groupQuery, func(r *alertviews.AlertPolicyGroup) error {
+	err := pgSearch.RunSelectRequestForSchemaFn(ctx, ds.db, schema.AlertsSchema(), groupQuery, func(r *alertviews.AlertPolicyGroup) error {
 		results = append(results, r)
 		return nil
 	})
@@ -183,7 +183,7 @@ func (ds *datastoreImpl) SearchAlertTimeseriesEvents(ctx context.Context, q *v1.
 	timeseriesQuery := alertviews.WithAlertTimeseriesQuery(q)
 
 	var results []*alertviews.AlertTimeseriesEvent
-	err := pgSearch.RunSelectRequestForSchemaFn(ctx, ds.db, schema.AlertsSchema, timeseriesQuery, func(r *alertviews.AlertTimeseriesEvent) error {
+	err := pgSearch.RunSelectRequestForSchemaFn(ctx, ds.db, schema.AlertsSchema(), timeseriesQuery, func(r *alertviews.AlertTimeseriesEvent) error {
 		results = append(results, r)
 		return nil
 	})
@@ -209,7 +209,7 @@ func (ds *datastoreImpl) SearchAlertDeploymentIDs(ctx context.Context, q *v1.Que
 	clonedQuery.Pagination = nil
 
 	var ids []string
-	err := pgSearch.RunSelectRequestForSchemaFn(ctx, ds.db, schema.AlertsSchema, clonedQuery, func(r *alertviews.DeploymentIDResult) error {
+	err := pgSearch.RunSelectRequestForSchemaFn(ctx, ds.db, schema.AlertsSchema(), clonedQuery, func(r *alertviews.DeploymentIDResult) error {
 		if id := r.GetDeploymentID(); id != "" {
 			ids = append(ids, id)
 		}

diff --git a/central/alert/datastore/internal/store/postgres/store.go b/central/alert/datastore/internal/store/postgres/store.go
diff --git a/central/apitoken/datastore/internal/schedulestore/postgres/store.go b/central/apitoken/datastore/internal/schedulestore/postgres/store.go
diff --git a/central/apitoken/datastore/internal/store/postgres/store.go b/central/apitoken/datastore/internal/store/postgres/store.go
diff --git a/central/authprovider/datastore/internal/store/postgres/store.go b/central/authprovider/datastore/internal/store/postgres/store.go
diff --git a/central/baseimage/store/postgres/store.go b/central/baseimage/store/postgres/store.go
diff --git a/central/baseimage/store/repository/postgres/store.go b/central/baseimage/store/repository/postgres/store.go
diff --git a/central/baseimage/store/tag/postgres/store.go b/central/baseimage/store/tag/postgres/store.go
diff --git a/central/baseimagelayer/store/postgres/store.go b/central/baseimagelayer/store/postgres/store.go
diff --git a/central/blob/datastore/store/postgres/store.go b/central/blob/datastore/store/postgres/store.go
diff --git a/central/cluster/store/cluster/postgres/store.go b/central/cluster/store/cluster/postgres/store.go
diff --git a/central/cluster/store/clusterhealth/postgres/store.go b/central/cluster/store/clusterhealth/postgres/store.go
diff --git a/central/clustercveedge/datastore/store/postgres/store.go b/central/clustercveedge/datastore/store/postgres/store.go
diff --git a/central/clusterinit/store/postgres/store.go b/central/clusterinit/store/postgres/store.go
diff --git a/central/compliance/aggregation/aggregation.go b/central/compliance/aggregation/aggregation.go
@@ -611,17 +611,17 @@ func (a *aggregatorImpl) getSearchFuncs() map[storage.ComplianceAggregation_Scop
 		storage.ComplianceAggregation_CLUSTER: {
 			searchFunc: a.clusters.Search,
 			countFunc:  a.clusters.Count,
-			optionsMap: schema.ClustersSchema.OptionsMap,
+			optionsMap: schema.ClustersSchema().OptionsMap,
 		},
 		storage.ComplianceAggregation_NODE: {
 			searchFunc: a.nodes.Search,
 			countFunc:  a.nodes.Count,
-			optionsMap: schema.NodesSchema.OptionsMap,
+			optionsMap: schema.NodesSchema().OptionsMap,
 		},
 		storage.ComplianceAggregation_NAMESPACE: {
 			searchFunc: a.namespaces.Search,
 			countFunc:  a.namespaces.Count,
-			optionsMap: schema.NamespacesSchema.OptionsMap,
+			optionsMap: schema.NamespacesSchema().OptionsMap,
 		},
 		storage.ComplianceAggregation_CONTROL: {
 			searchFunc: wrapContextLessSearchFunc(a.standards.SearchControls),

diff --git a/central/compliance/datastore/internal/store/postgres/compliance_config/store.go b/central/compliance/datastore/internal/store/postgres/compliance_config/store.go
diff --git a/central/compliance/datastore/internal/store/postgres/domain/store.go b/central/compliance/datastore/internal/store/postgres/domain/store.go
diff --git a/central/compliance/datastore/internal/store/postgres/metadata/store.go b/central/compliance/datastore/internal/store/postgres/metadata/store.go
diff --git a/central/compliance/datastore/internal/store/postgres/results/store.go b/central/compliance/datastore/internal/store/postgres/results/store.go
diff --git a/central/compliance/datastore/internal/store/postgres/strings/store.go b/central/compliance/datastore/internal/store/postgres/strings/store.go
diff --git a/central/compliance/search/options.go b/central/compliance/search/options.go
@@ -24,9 +24,9 @@ var Options = []search.FieldLabel{
 var SearchOptionsMultiMap = search.MultiMapFromMapsFiltered(
 	Options,
 	index.StandardOptions,
-	schema.ClustersSchema.OptionsMap,
-	schema.NodesSchema.OptionsMap,
-	schema.NamespacesSchema.OptionsMap,
+	schema.ClustersSchema().OptionsMap,
+	schema.NodesSchema().OptionsMap,
+	schema.NamespacesSchema().OptionsMap,
 	index.ControlOptions,
 	deployments.OptionsMap,
 )
diff --git a/central/complianceoperator/checkresults/store/postgres/store.go b/central/complianceoperator/checkresults/store/postgres/store.go
diff --git a/central/complianceoperator/profiles/store/postgres/store.go b/central/complianceoperator/profiles/store/postgres/store.go
diff --git a/central/complianceoperator/rules/store/postgres/store.go b/central/complianceoperator/rules/store/postgres/store.go
diff --git a/central/complianceoperator/scans/store/postgres/store.go b/central/complianceoperator/scans/store/postgres/store.go
diff --git a/central/complianceoperator/scansettingbinding/store/postgres/store.go b/central/complianceoperator/scansettingbinding/store/postgres/store.go
diff --git a/central/complianceoperator/v2/checkresults/datastore/datastore_impl.go b/central/complianceoperator/v2/checkresults/datastore/datastore_impl.go
@@ -108,7 +108,7 @@ func (d *datastoreImpl) ComplianceCheckResultStats(ctx context.Context, query *v
 
 	countQuery := d.withCountByResultSelectQuery(cloned, search.ClusterID)
 	var countResults []*ResourceResultCountByClusterScan
-	err := pgSearch.RunSelectRequestForSchemaFn[ResourceResultCountByClusterScan](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema, countQuery, func(r *ResourceResultCountByClusterScan) error {
+	err := pgSearch.RunSelectRequestForSchemaFn[ResourceResultCountByClusterScan](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema(), countQuery, func(r *ResourceResultCountByClusterScan) error {
 		countResults = append(countResults, r)
 		return nil
 	})
@@ -146,7 +146,7 @@ func (d *datastoreImpl) ComplianceProfileResultStats(ctx context.Context, query
 
 	countQuery := d.withCountByResultSelectQuery(cloned, search.ComplianceOperatorProfileName)
 	var countResults []*ResourceResultCountByProfile
-	err := pgSearch.RunSelectRequestForSchemaFn[ResourceResultCountByProfile](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema, countQuery, func(r *ResourceResultCountByProfile) error {
+	err := pgSearch.RunSelectRequestForSchemaFn[ResourceResultCountByProfile](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema(), countQuery, func(r *ResourceResultCountByProfile) error {
 		countResults = append(countResults, r)
 		return nil
 	})
@@ -199,7 +199,7 @@ func (d *datastoreImpl) ComplianceProfileResults(ctx context.Context, query *v1.
 
 	countQuery := d.withCountByResultSelectQuery(cloned, search.ComplianceOperatorProfileName)
 	var results []*ResourceResultsByProfile
-	err := pgSearch.RunSelectRequestForSchemaFn[ResourceResultsByProfile](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema, countQuery, func(r *ResourceResultsByProfile) error {
+	err := pgSearch.RunSelectRequestForSchemaFn[ResourceResultsByProfile](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema(), countQuery, func(r *ResourceResultsByProfile) error {
 		results = append(results, r)
 		return nil
 	})
@@ -244,7 +244,7 @@ func (d *datastoreImpl) ComplianceClusterStats(ctx context.Context, query *v1.Qu
 
 	countQuery := d.withCountByResultSelectQuery(cloned, search.ClusterID)
 	var countResults []*ResultStatusCountByCluster
-	err := pgSearch.RunSelectRequestForSchemaFn[ResultStatusCountByCluster](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema, countQuery, func(r *ResultStatusCountByCluster) error {
+	err := pgSearch.RunSelectRequestForSchemaFn[ResultStatusCountByCluster](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema(), countQuery, func(r *ResultStatusCountByCluster) error {
 		countResults = append(countResults, r)
 		return nil
 	})
@@ -280,7 +280,7 @@ func (d *datastoreImpl) WalkByQuery(ctx context.Context, query *v1.Query, fn fun
 }
 
 func (d *datastoreImpl) countByCluster(ctx context.Context, query *v1.Query, field search.FieldLabel) (int, error) {
-	result, err := pgSearch.RunSelectOneForSchema[clusterCount](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema, withCountQuery(query, search.ClusterID))
+	result, err := pgSearch.RunSelectOneForSchema[clusterCount](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema(), withCountQuery(query, search.ClusterID))
 	if err != nil {
 		return 0, err
 	}
@@ -291,7 +291,7 @@ func (d *datastoreImpl) countByCluster(ctx context.Context, query *v1.Query, fie
 }
 
 func (d *datastoreImpl) countByProfile(ctx context.Context, query *v1.Query) (int, error) {
-	result, err := pgSearch.RunSelectOneForSchema[profileCount](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema, withCountQuery(query, search.ComplianceOperatorProfileName))
+	result, err := pgSearch.RunSelectOneForSchema[profileCount](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema(), withCountQuery(query, search.ComplianceOperatorProfileName))
 	if err != nil {
 		return 0, err
 	}
@@ -302,7 +302,7 @@ func (d *datastoreImpl) countByProfile(ctx context.Context, query *v1.Query) (in
 }
 
 func (d *datastoreImpl) countByCheck(ctx context.Context, query *v1.Query) (int, error) {
-	result, err := pgSearch.RunSelectOneForSchema[complianceCheckCount](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema, withCountQuery(query, search.ComplianceOperatorCheckName))
+	result, err := pgSearch.RunSelectOneForSchema[complianceCheckCount](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema(), withCountQuery(query, search.ComplianceOperatorCheckName))
 	if err != nil {
 		return 0, err
 	}
@@ -313,7 +313,7 @@ func (d *datastoreImpl) countByCheck(ctx context.Context, query *v1.Query) (int,
 }
 
 func (d *datastoreImpl) countByConfiguration(ctx context.Context, query *v1.Query) (int, error) {
-	result, err := pgSearch.RunSelectOneForSchema[configurationCount](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema, withCountQuery(query, search.ComplianceOperatorScanConfigName))
+	result, err := pgSearch.RunSelectOneForSchema[configurationCount](ctx, d.db, schema.ComplianceOperatorCheckResultV2Schema(), withCountQuery(query, search.ComplianceOperatorScanConfigName))
 	if err != nil {
 		return 0, err
 	}