mirror of
https://github.com/fleetdm/fleet
synced 2026-05-24 09:28:54 +00:00
acb563337e
<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #33907 # Checklist for submitter If some of the following don't apply, delete the relevant line. - [x] Changes file added for user-visible changes in `changes/` - [x] Input data is properly validated, `SELECT *` is avoided, SQL injection is prevented (using placeholders for values in statements) ## Testing - [x] Added/updated automated tests - [x] QA'd all new/changed functionality manually ## Database migrations - [x] Checked schema for all modified table for columns that will auto-update timestamps during migration. ~- [ ] Confirmed that updating the timestamps is acceptable, and will not cause unwanted side effects.~ N/A - [x] Ensured the correct collation is explicitly set for character columns (`COLLATE utf8mb4_unicode_ci`). <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit ## Release Notes * **New Features** * Windows software inventory now includes upgrade code data for better software identification and tracking. * **Chores** * Database schema updated to support upgrade code storage for software titles and inventory records. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
45 lines
1.8 KiB
Go
45 lines
1.8 KiB
Go
package tables
|
|
|
|
import (
|
|
"database/sql"
|
|
"fmt"
|
|
)
|
|
|
|
func init() {
|
|
MigrationClient.AddMigration(Up_20251107170854, Down_20251107170854)
|
|
}
|
|
|
|
func Up_20251107170854(tx *sql.Tx) error {
|
|
// CHAR(38) to account for 32 hex chars + 4 hyphens + open/close curly braces
|
|
_, err := tx.Exec(`ALTER TABLE software_titles ADD COLUMN upgrade_code CHAR(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL`)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to add software_titles.upgrade_code column: %w", err)
|
|
}
|
|
_, err = tx.Exec(`UPDATE software_titles SET upgrade_code = '' WHERE source = 'programs'`)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to add default empty string value to software_titles.upgrade_code column for rows where source = 'programs': %w", err)
|
|
}
|
|
|
|
_, err = tx.Exec(`ALTER TABLE software ADD COLUMN upgrade_code CHAR(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL`)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to add software.upgrade_code column: %w", err)
|
|
}
|
|
|
|
_, err = tx.Exec(`UPDATE software SET upgrade_code = '' WHERE source = 'programs'`)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to add default empty string value to software.upgrade_code column for rows where source = 'programs': %w", err)
|
|
}
|
|
|
|
// NULLIF(upgrade_code, "") prevents upgrade_code being used as the unique_identifier when it is
|
|
// the empty string, which will be the case for "programs"-sourced software but is obviously not unique
|
|
_, err = tx.Exec(`ALTER TABLE software_titles MODIFY COLUMN unique_identifier VARCHAR(255) GENERATED ALWAYS AS (COALESCE(bundle_identifier, application_id, NULLIF(upgrade_code, ""), name)) VIRTUAL`)
|
|
if err != nil {
|
|
return fmt.Errorf("failed to alter definition of software_titles.unique_identifier column to include upgrade_code in its COALESCE: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func Down_20251107170854(tx *sql.Tx) error {
|
|
return nil
|
|
}
|