Skip to content

fix(db): add missing offering columns to GetActivePurchaseHistory SELECT (production-down) #1472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cristim merged 1 commit into from
Jul 20, 2026
Merged

fix(db): add missing offering columns to GetActivePurchaseHistory SELECT (production-down) #1472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion internal/config/store_postgres.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1810,11 +1810,17 @@ func (s *PostgresStore) GetActivePurchaseHistory(ctx context.Context, asOf time.
args := []any{asOf}
conds, args = appendAccountPredicate(conds, args, accountIDs, externalIDsByProvider)

// The column list MUST match scanPurchaseHistoryRow's scan destinations
// exactly (pgx errors on a field/destination count mismatch). #808 added
// offering_class, listing_id, listing_state to the scanner and every other
// purchase-history SELECT but missed this one, which broke every real-Postgres
// call here (dashboard KPIs, /api/inventory/*, analytics collector).
query := fmt.Sprintf(`
SELECT account_id, purchase_id, timestamp, provider, service, region,
resource_type, count, term, payment, upfront_cost, monthly_cost,
estimated_savings, plan_id, plan_name, ramp_step, cloud_account_id,
revocation_window_closes_at, revoked_at, revoked_via, support_case_id
revocation_window_closes_at, revoked_at, revoked_via, support_case_id,
offering_class, listing_id, listing_state
FROM purchase_history
WHERE %s
ORDER BY timestamp DESC
Expand Down
2 changes: 1 addition & 1 deletion internal/config/store_postgres_pgxmock_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ func TestPGXMock_GetActivePurchaseHistory_Unscoped(t *testing.T) {
now := time.Now().Truncate(time.Second)
rows := pgxmock.NewRows(purchaseHistoryCols).AddRow(purchaseHistoryRow(now, "aws", "acct-1")...)
mock.ExpectQuery(
`SELECT account_id, purchase_id, .*revocation_window_closes_at, revoked_at, revoked_via, support_case_id FROM purchase_history WHERE term > 0 AND timestamp \+ make_interval\(hours => term \* 8760\) >= \$1 AND revoked_at IS NULL ORDER BY timestamp DESC$`,
`SELECT account_id, purchase_id, .*revocation_window_closes_at, revoked_at, revoked_via, support_case_id, offering_class, listing_id, listing_state FROM purchase_history WHERE term > 0 AND timestamp \+ make_interval\(hours => term \* 8760\) >= \$1 AND revoked_at IS NULL ORDER BY timestamp DESC$`,
).WithArgs(now).WillReturnRows(rows)

records, err := store.GetActivePurchaseHistory(ctx, now, nil, nil)
Expand Down
Loading