more nullable fields

management/server/store/sqlstore_bench_test.go

@@ -923,9 +923,19 @@ func (s *SqlStore) GetAccountPureSQL(ctx context.Context, accountID string) (*ty
 		groups, err := pgx.CollectRows(rows, func(row pgx.CollectableRow) (*types.Group, error) {
 			var g types.Group
 			var resources []byte
-			err := row.Scan(&g.ID, &g.AccountID, &g.Name, &g.Issued, &resources, &g.IntegrationReference.ID, &g.IntegrationReference.IntegrationType)
+			var refID sql.NullInt64
-			if err == nil && resources != nil {
+			var refType sql.NullString
-				_ = json.Unmarshal(resources, &g.Resources)
+			err := row.Scan(&g.ID, &g.AccountID, &g.Name, &g.Issued, &resources, &refID, &refType)
+			if err == nil {
+				if refID.Valid {
+					g.IntegrationReference.ID = int(refID.Int64)
+				}
+				if refType.Valid {
+					g.IntegrationReference.IntegrationType = refType.String
+				}
+				if resources != nil {
+					_ = json.Unmarshal(resources, &g.Resources)
+				}
 			}
 			return &g, err
 		})
@@ -1190,15 +1200,23 @@ func (s *SqlStore) GetAccountPureSQL(ctx context.Context, accountID string) (*ty
 	go func() {
 		defer wg.Done()
 		const query = `SELECT account_id, onboarding_flow_pending, signup_form_pending, created_at, updated_at FROM account_onboardings WHERE account_id = $1`
+		var onboardingFlowPending, signupFormPending sql.NullBool
 		err := s.pool.QueryRow(ctx, query, accountID).Scan(
 			&account.Onboarding.AccountID,
-			&account.Onboarding.OnboardingFlowPending,
+			&onboardingFlowPending,
-			&account.Onboarding.SignupFormPending,
+			&signupFormPending,
 			&account.Onboarding.CreatedAt,
 			&account.Onboarding.UpdatedAt,
 		)
 		if err != nil && !errors.Is(err, pgx.ErrNoRows) {
 			errChan <- err
+			return
+		}
+		if onboardingFlowPending.Valid {
+			account.Onboarding.OnboardingFlowPending = onboardingFlowPending.Bool
+		}
+		if signupFormPending.Valid {
+			account.Onboarding.SignupFormPending = signupFormPending.Bool
 		}
 	}()