Skip to content
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

Jump to bottom

fix(db): use nullable string for release environments #2023

Merged
merged 1 commit into from
Oct 8, 2024
Merged

fix(db): use nullable string for release environments #2023

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
20 changes: 11 additions & 9 deletions pkg/db/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ func (h *DBHandler) processReleaseManifestRows(ctx context.Context, err error, r
//exhaustruct:ignore
var result = make(map[string]map[uint64][]string)
for rows.Next() {
var environmentsStr string
var environmentsStr sql.NullString
var appName string
var releaseVersion uint64
err := rows.Scan(&appName, &releaseVersion, &environmentsStr)
Expand All @@ -677,10 +677,12 @@ func (h *DBHandler) processReleaseManifestRows(ctx context.Context, err error, r
}
return nil, fmt.Errorf("Error scanning releases row from DB. Error: %w\n", err)
}
var environments []string
err = json.Unmarshal(([]byte)(environmentsStr), &environments)
if err != nil {
return nil, fmt.Errorf("Error during json unmarshal of environments for releases. Error: %w. Data: %s\n", err, environmentsStr)
environments := make([]string, 0)
if environmentsStr.Valid && environmentsStr.String != "" {
err = json.Unmarshal(([]byte)(environmentsStr.String), &environments)
if err != nil {
return nil, fmt.Errorf("Error during json unmarshal of environments for releases. Error: %w. Data: %s\n", err, environmentsStr.String)
}
}
if _, exists := result[appName]; !exists {
result[appName] = make(map[uint64][]string)
Expand Down Expand Up @@ -881,7 +883,7 @@ func (h *DBHandler) processReleaseRows(ctx context.Context, err error, rows *sql
var row = &DBReleaseWithMetaData{}
var metadataStr string
var manifestStr string
var environmentsStr string
var environmentsStr sql.NullString
err := rows.Scan(&row.EslVersion, &row.Created, &row.App, &metadataStr, &manifestStr, &row.ReleaseNumber, &row.Deleted, &environmentsStr)
if err != nil {
if errors.Is(err, sql.ErrNoRows) {
Expand Down Expand Up @@ -921,10 +923,10 @@ func (h *DBHandler) processReleaseRows(ctx context.Context, err error, rows *sql
}
row.Manifests = manifestData
environments := make([]string, 0)
if environmentsStr != "" {
err = json.Unmarshal(([]byte)(environmentsStr), &environments)
if environmentsStr.Valid && environmentsStr.String != "" {
err = json.Unmarshal(([]byte)(environmentsStr.String), &environments)
if err != nil {
return nil, fmt.Errorf("Error during json unmarshal of environments for releases. Error: %w. Data: %s\n", err, environmentsStr)
return nil, fmt.Errorf("Error during json unmarshal of environments for releases. Error: %w. Data: %s\n", err, environmentsStr.String)
}
}
row.Environments = environments
Expand Down
Loading