kirby/infra-dashboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switching to sql.nulltype

Browse Source
This commit is contained in:
kirby
2024-03-18 16:13:44 +01:00
parent 6879221996
commit 45c6cebc2c
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Database/os.go
View File

@@ -3,13 +3,15 @@ package database
import (
"database/sql"
"log"
"gopkg.in/guregu/null.v4"
)
type OS struct {
ID string `json:"id"`
Distribution string `json:"distribution"`
Version string `json:"version"`
End_of_support string `json:"end_of_support"`
ID int `json:"id"`
Distribution null.String `json:"distribution"`
Version null.String `json:"version"`
End_of_support null.String `json:"end_of_support"`
}
func GetOS(db *sql.DB) ([]OS, error) {
@@ -42,8 +44,8 @@ func GetOSbyID(db *sql.DB, id string) (OS, error) {
return os, nil
}
func GetDistributionList(db *sql.DB) ([]string, error) {
var list []string
func GetDistributionList(db *sql.DB) ([]null.String, error) {
var list []null.String
rows, err := db.Query("SELECT DISTINCT distribution FROM dashboard_os")
if err != nil {
log.Println("Error getting distribution list", err)
@@ -59,8 +61,8 @@ func GetDistributionList(db *sql.DB) ([]string, error) {
return list, nil
}
func GetVersionByDistributionList(db *sql.DB, d string) ([]string, error) {
var list []string
func GetVersionByDistributionList(db *sql.DB, d string) ([]null.String, error) {
var list []null.String
rows, err := db.Query("SELECT DISTINCT version FROM dashboard_os where distribution = ?", d)
if err != nil {
log.Println("Error getting distribution list", err)