prefer to pass a sql.NullString to dbCrypt.encryptField

johnstcn · johnstcn · commit 18837ba2a241 · 2024-12-02T20:48:58.000Z
diff --git a/enterprise/dbcrypt/dbcrypt.go b/enterprise/dbcrypt/dbcrypt.go
@@ -262,7 +262,14 @@ func (db *dbCrypt) UpdateExternalAuthLink(ctx context.Context, params database.U
 }
 
 func (db *dbCrypt) UpdateExternalAuthLinkRefreshToken(ctx context.Context, params database.UpdateExternalAuthLinkRefreshTokenParams) error {
-	if err := db.encryptField(&params.OAuthRefreshToken, &sql.NullString{String: params.OAuthRefreshTokenKeyID, Valid: true}); err != nil {
+	// We would normally use a sql.NullString here, but sqlc does not want to make
+	// a params struct with a nullable string.
+	var digest sql.NullString
+	if params.OAuthRefreshTokenKeyID != "" {
+		digest.String = params.OAuthRefreshTokenKeyID
+		digest.Valid = true
+	}
+	if err := db.encryptField(&params.OAuthRefreshToken, &digest); err != nil {
 		return err
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,14 @@ func (db *dbCrypt) UpdateExternalAuthLink(ctx context.Context, params database.U`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`func (db *dbCrypt) UpdateExternalAuthLinkRefreshToken(ctx context.Context, params database.UpdateExternalAuthLinkRefreshTokenParams) error {`
`265`		`- if err := db.encryptField(&params.OAuthRefreshToken, &sql.NullString{String: params.OAuthRefreshTokenKeyID, Valid: true}); err != nil {`
	`265`	`+ // We would normally use a sql.NullString here, but sqlc does not want to make`
	`266`	`+ // a params struct with a nullable string.`
	`267`	`+ var digest sql.NullString`
	`268`	`+ if params.OAuthRefreshTokenKeyID != "" {`
	`269`	`+ digest.String = params.OAuthRefreshTokenKeyID`
	`270`	`+ digest.Valid = true`
	`271`	`+ }`
	`272`	`+ if err := db.encryptField(&params.OAuthRefreshToken, &digest); err != nil {`
`266`	`273`	`return err`
`267`	`274`	`}`
`268`	`275`