Skip to content

Commit

Permalink
add DB level propagation for the Unscoped flag (#7007)
Browse files Browse the repository at this point in the history
* adds PropagateUnscoped to db Config

* adds PropagateUnscoped test

* adds PropagateUnscoped to Session and sets it accordingly
  • Loading branch information
sprataa authored Jun 17, 2024
1 parent 79bf7f9 commit 109f239
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 0 deletions.
10 changes: 10 additions & 0 deletions gorm.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ type Config struct {
CreateBatchSize int
// TranslateError enabling error translation
TranslateError bool
// PropagateUnscoped propagate Unscoped to every other nested statement
PropagateUnscoped bool

// ClauseBuilders clause builder
ClauseBuilders map[string]clause.ClauseBuilder
Expand Down Expand Up @@ -110,6 +112,7 @@ type Session struct {
DisableNestedTransaction bool
AllowGlobalUpdate bool
FullSaveAssociations bool
PropagateUnscoped bool
QueryFields bool
Context context.Context
Logger logger.Interface
Expand Down Expand Up @@ -241,6 +244,10 @@ func (db *DB) Session(config *Session) *DB {
txConfig.FullSaveAssociations = true
}

if config.PropagateUnscoped {
txConfig.PropagateUnscoped = true
}

if config.Context != nil || config.PrepareStmt || config.SkipHooks {
tx.Statement = tx.Statement.clone()
tx.Statement.DB = tx
Expand Down Expand Up @@ -409,6 +416,9 @@ func (db *DB) getInstance() *DB {
Vars: make([]interface{}, 0, 8),
SkipHooks: db.Statement.SkipHooks,
}
if db.Config.PropagateUnscoped {
tx.Statement.Unscoped = db.Statement.Unscoped
}
} else {
// with clone statement
tx.Statement = db.Statement.clone()
Expand Down
43 changes: 43 additions & 0 deletions tests/hooks_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package tests_test

import (
"errors"
"log"
"os"
"reflect"
"strings"
"testing"
Expand Down Expand Up @@ -566,3 +568,44 @@ func TestUpdateCallbacks(t *testing.T) {
t.Fatalf("before update should not be called")
}
}

type Product6 struct {
gorm.Model
Name string
Item *ProductItem2
}

type ProductItem2 struct {
gorm.Model
Product6ID uint
}

func (p *Product6) BeforeDelete(tx *gorm.DB) error {
if err := tx.Delete(&p.Item).Error; err != nil {
return err
}
return nil
}

func TestPropagateUnscoped(t *testing.T) {
_DB, err := OpenTestConnection(&gorm.Config{
PropagateUnscoped: true,
})
if err != nil {
log.Printf("failed to connect database, got error %v", err)
os.Exit(1)
}

_DB.Migrator().DropTable(&Product6{}, &ProductItem2{})
_DB.AutoMigrate(&Product6{}, &ProductItem2{})

p := Product6{
Name: "unique_code",
Item: &ProductItem2{},
}
_DB.Model(&Product6{}).Create(&p)

if err := _DB.Unscoped().Delete(&p).Error; err != nil {
t.Fatalf("unscoped did not propagate")
}
}

0 comments on commit 109f239

Please sign in to comment.