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

WIP - Null fields are ignored when scanning to a model struct #7233

Closed
wants to merge 8 commits into from
Closed

WIP - Null fields are ignored when scanning to a model struct #7233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0511057
Remove pgx replace
henryjcee Oct 8, 2024
72e580c
Partially revert the change made in https://github.com/go-gorm/gorm/p…
henryjcee Oct 8, 2024
65bfeca
Revert go.mod migration to 1.2x+
henryjcee Oct 9, 2024
bf5cd45
Merge pull request #1 from incident-io/henrycourse/upgrade-gorm-ww24
henryjcee Oct 10, 2024
0fc283c
Merge remote-tracking branch 'upstream/master'
henryjcee Oct 10, 2024
23b45b7
Run go fmt ./...
henryjcee Oct 10, 2024
11ee137
Tidy struct scanner if statement
henryjcee Oct 10, 2024
a1a3311
Revert change to replace directive
henryjcee Oct 10, 2024
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
7 changes: 4 additions & 3 deletions chainable_api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,9 +448,10 @@ func (db *DB) Assign(attrs ...interface{}) (tx *DB) {
// Unscoped allows queries to include records marked as deleted,
// overriding the soft deletion behavior.
// Example:
// var users []User
// db.Unscoped().Find(&users)
// // Retrieves all users, including deleted ones.
//
// var users []User
// db.Unscoped().Find(&users)
// // Retrieves all users, including deleted ones.
func (db *DB) Unscoped() (tx *DB) {
tx = db.getInstance()
tx.Statement.Unscoped = true
Expand Down
5 changes: 2 additions & 3 deletions schema/field.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"time"

"github.com/jinzhu/now"

"gorm.io/gorm/clause"
"gorm.io/gorm/utils"
)
Expand Down Expand Up @@ -919,10 +920,8 @@ func (field *Field) setupValuerAndSetter() {
// struct scanner
field.Set = func(ctx context.Context, value reflect.Value, v interface{}) (err error) {
reflectV := reflect.ValueOf(v)
if !reflectV.IsValid() {
if !reflectV.IsValid() || reflectV.Kind() == reflect.Ptr && reflectV.IsNil() {
field.ReflectValueOf(ctx, value).Set(reflect.New(field.FieldType).Elem())
} else if reflectV.Kind() == reflect.Ptr && reflectV.IsNil() {
return
} else if reflectV.Type().AssignableTo(field.FieldType) {
field.ReflectValueOf(ctx, value).Set(reflectV)
} else if reflectV.Kind() == reflect.Ptr {
Expand Down
Loading