sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-18 16:26:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[management] use sql null vars (#5844)

Browse Source
This commit is contained in:
Pascal Fischer
2026-04-09 18:12:38 +02:00
committed by GitHub
parent 099c493b18
commit ee343d5d77
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
management/server/store/sql_store.go
View File

@@ -2099,7 +2099,8 @@ func (s *SqlStore) getServices(ctx context.Context, accountID string) ([]*rpserv
var createdAt, certIssuedAt sql.NullTime var createdAt, certIssuedAt sql.NullTime
var status, proxyCluster, sessionPrivateKey, sessionPublicKey sql.NullString var status, proxyCluster, sessionPrivateKey, sessionPublicKey sql.NullString
var mode, source, sourcePeer sql.NullString var mode, source, sourcePeer sql.NullString
var terminated sql.NullBool var terminated, portAutoAssigned sql.NullBool
var listenPort sql.NullInt64
err := row.Scan( err := row.Scan(
&s.ID, &s.ID,
&s.AccountID, &s.AccountID,
@@ -2116,8 +2117,8 @@ func (s *SqlStore) getServices(ctx context.Context, accountID string) ([]*rpserv
&sessionPrivateKey, &sessionPrivateKey,
&sessionPublicKey, &sessionPublicKey,
&mode, &mode,
&s.ListenPort, &listenPort,
&s.PortAutoAssigned, &portAutoAssigned,
&source, &source,
&sourcePeer, &sourcePeer,
&terminated, &terminated,
@@ -2164,6 +2165,12 @@ func (s *SqlStore) getServices(ctx context.Context, accountID string) ([]*rpserv
if terminated.Valid { if terminated.Valid {
s.Terminated = terminated.Bool s.Terminated = terminated.Bool
} }
if portAutoAssigned.Valid {
s.PortAutoAssigned = portAutoAssigned.Bool
}
if listenPort.Valid {
s.ListenPort = uint16(listenPort.Int64)
}
s.Targets = []*rpservice.Target{} s.Targets = []*rpservice.Target{}
return &s, nil return &s, nil
}) })