tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use NewDB to replace WithConditions for Session

Browse Source
This commit is contained in:
Jinzhu 2020-11-17 15:41:17 +08:00
parent f6e1786ca2
commit 26504f5cae
12 changed files with 35 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
association.go
View File

@ -417,7 +417,7 @@ func (association *Association) saveAssociation(clear bool, values ...interface{
appendToRelations(reflectValue.Index(i), reflect.Indirect(reflect.ValueOf(values[i])), clear) appendToRelations(reflectValue.Index(i), reflect.Indirect(reflect.ValueOf(values[i])), clear)
// TODO support save slice data, sql with case? // TODO support save slice data, sql with case?
association.Error = association.DB.Session(&Session{}).Select(selectedSaveColumns).Model(nil).Updates(reflectValue.Index(i).Addr().Interface()).Error association.Error = association.DB.Session(&Session{NewDB: true}).Select(selectedSaveColumns).Model(nil).Updates(reflectValue.Index(i).Addr().Interface()).Error
} }
case reflect.Struct: case reflect.Struct:
// clear old data // clear old data
@ -439,7 +439,7 @@ func (association *Association) saveAssociation(clear bool, values ...interface{
} }
if len(values) > 0 { if len(values) > 0 {
association.Error = association.DB.Session(&Session{}).Select(selectedSaveColumns).Model(nil).Updates(reflectValue.Addr().Interface()).Error association.Error = association.DB.Session(&Session{NewDB: true}).Select(selectedSaveColumns).Model(nil).Updates(reflectValue.Addr().Interface()).Error
} }
} }

14
callbacks/associations.go
View File

@ -66,7 +66,7 @@ func SaveBeforeAssociations(db *gorm.DB) {
} }
if elems.Len() > 0 { if elems.Len() > 0 {
if db.AddError(db.Session(&gorm.Session{}).Clauses(onConflictOption(db.Statement, rel.FieldSchema, nil)).Create(elems.Interface()).Error) == nil { if db.AddError(db.Session(&gorm.Session{NewDB: true}).Clauses(onConflictOption(db.Statement, rel.FieldSchema, nil)).Create(elems.Interface()).Error) == nil {
for i := 0; i < elems.Len(); i++ { for i := 0; i < elems.Len(); i++ {
setupReferences(objs[i], elems.Index(i)) setupReferences(objs[i], elems.Index(i))
} }
@ -79,7 +79,7 @@ func SaveBeforeAssociations(db *gorm.DB) {
rv = rv.Addr() rv = rv.Addr()
} }
if db.AddError(db.Session(&gorm.Session{}).Clauses(onConflictOption(db.Statement, rel.FieldSchema, nil)).Create(rv.Interface()).Error) == nil { if db.AddError(db.Session(&gorm.Session{NewDB: true}).Clauses(onConflictOption(db.Statement, rel.FieldSchema, nil)).Create(rv.Interface()).Error) == nil {
setupReferences(db.Statement.ReflectValue, rv) setupReferences(db.Statement.ReflectValue, rv)
} }
} }
@ -141,7 +141,7 @@ func SaveAfterAssociations(db *gorm.DB) {
assignmentColumns = append(assignmentColumns, ref.ForeignKey.DBName) assignmentColumns = append(assignmentColumns, ref.ForeignKey.DBName)
} }
db.AddError(db.Session(&gorm.Session{}).Clauses( db.AddError(db.Session(&gorm.Session{NewDB: true}).Clauses(
onConflictOption(db.Statement, rel.FieldSchema, assignmentColumns), onConflictOption(db.Statement, rel.FieldSchema, assignmentColumns),
).Create(elems.Interface()).Error) ).Create(elems.Interface()).Error)
} }
@ -163,7 +163,7 @@ func SaveAfterAssociations(db *gorm.DB) {
assignmentColumns = append(assignmentColumns, ref.ForeignKey.DBName) assignmentColumns = append(assignmentColumns, ref.ForeignKey.DBName)
} }
db.AddError(db.Session(&gorm.Session{}).Clauses( db.AddError(db.Session(&gorm.Session{NewDB: true}).Clauses(
onConflictOption(db.Statement, rel.FieldSchema, assignmentColumns), onConflictOption(db.Statement, rel.FieldSchema, assignmentColumns),
).Create(f.Interface()).Error) ).Create(f.Interface()).Error)
} }
@ -224,7 +224,7 @@ func SaveAfterAssociations(db *gorm.DB) {
assignmentColumns = append(assignmentColumns, ref.ForeignKey.DBName) assignmentColumns = append(assignmentColumns, ref.ForeignKey.DBName)
} }
db.AddError(db.Session(&gorm.Session{}).Clauses( db.AddError(db.Session(&gorm.Session{NewDB: true}).Clauses(
onConflictOption(db.Statement, rel.FieldSchema, assignmentColumns), onConflictOption(db.Statement, rel.FieldSchema, assignmentColumns),
).Create(elems.Interface()).Error) ).Create(elems.Interface()).Error)
} }
@ -291,7 +291,7 @@ func SaveAfterAssociations(db *gorm.DB) {
} }
if elems.Len() > 0 { if elems.Len() > 0 {
db.AddError(db.Session(&gorm.Session{}).Clauses(onConflictOption(db.Statement, rel.FieldSchema, nil)).Create(elems.Interface()).Error) db.AddError(db.Session(&gorm.Session{NewDB: true}).Clauses(onConflictOption(db.Statement, rel.FieldSchema, nil)).Create(elems.Interface()).Error)
for i := 0; i < elems.Len(); i++ { for i := 0; i < elems.Len(); i++ {
appendToJoins(objs[i], elems.Index(i)) appendToJoins(objs[i], elems.Index(i))
@ -299,7 +299,7 @@ func SaveAfterAssociations(db *gorm.DB) {
} }
if joins.Len() > 0 { if joins.Len() > 0 {
db.AddError(db.Session(&gorm.Session{}).Clauses(clause.OnConflict{DoNothing: true}).Create(joins.Interface()).Error) db.AddError(db.Session(&gorm.Session{NewDB: true}).Clauses(clause.OnConflict{DoNothing: true}).Create(joins.Interface()).Error)
} }
} }
} }

2
callbacks/callmethod.go
View File

@ -7,7 +7,7 @@ import (
) )
func callMethod(db *gorm.DB, fc func(value interface{}, tx *gorm.DB) bool) { func callMethod(db *gorm.DB, fc func(value interface{}, tx *gorm.DB) bool) {
tx := db.Session(&gorm.Session{}) tx := db.Session(&gorm.Session{NewDB: true})
if called := fc(db.Statement.ReflectValue.Interface(), tx); !called { if called := fc(db.Statement.ReflectValue.Interface(), tx); !called {
switch db.Statement.ReflectValue.Kind() { switch db.Statement.ReflectValue.Kind() {
case reflect.Slice, reflect.Array: case reflect.Slice, reflect.Array:

4
callbacks/delete.go
View File

@ -34,7 +34,7 @@ func DeleteBeforeAssociations(db *gorm.DB) {
case schema.HasOne, schema.HasMany: case schema.HasOne, schema.HasMany:
queryConds := rel.ToQueryConditions(db.Statement.ReflectValue) queryConds := rel.ToQueryConditions(db.Statement.ReflectValue)
modelValue := reflect.New(rel.FieldSchema.ModelType).Interface() modelValue := reflect.New(rel.FieldSchema.ModelType).Interface()
tx := db.Session(&gorm.Session{}).Model(modelValue) tx := db.Session(&gorm.Session{NewDB: true}).Model(modelValue)
withoutConditions := false withoutConditions := false
if len(db.Statement.Selects) > 0 { if len(db.Statement.Selects) > 0 {
@ -71,7 +71,7 @@ func DeleteBeforeAssociations(db *gorm.DB) {
relForeignKeys []string relForeignKeys []string
modelValue = reflect.New(rel.JoinTable.ModelType).Interface() modelValue = reflect.New(rel.JoinTable.ModelType).Interface()
table = rel.JoinTable.Table table = rel.JoinTable.Table
tx = db.Session(&gorm.Session{}).Model(modelValue).Table(table) tx = db.Session(&gorm.Session{NewDB: true}).Model(modelValue).Table(table)
) )
for _, ref := range rel.References { for _, ref := range rel.References {

2
callbacks/preload.go
View File

@ -13,7 +13,7 @@ func preload(db *gorm.DB, rels []*schema.Relationship, conds []interface{}) {
var ( var (
reflectValue = db.Statement.ReflectValue reflectValue = db.Statement.ReflectValue
rel = rels[len(rels)-1] rel = rels[len(rels)-1]
tx = db.Session(&gorm.Session{}) tx = db.Session(&gorm.Session{NewDB: true})
relForeignKeys []string relForeignKeys []string
relForeignFields []*schema.Field relForeignFields []*schema.Field
foreignFields []*schema.Field foreignFields []*schema.Field

8
finisher_api.go
View File

@ -78,7 +78,7 @@ func (db *DB) Save(value interface{}) (tx *DB) {
if tx.Error == nil && tx.RowsAffected == 0 && !tx.DryRun && !selectedUpdate { if tx.Error == nil && tx.RowsAffected == 0 && !tx.DryRun && !selectedUpdate {
result := reflect.New(tx.Statement.Schema.ModelType).Interface() result := reflect.New(tx.Statement.Schema.ModelType).Interface()
if err := tx.Session(&Session{WithConditions: true}).First(result).Error; errors.Is(err, ErrRecordNotFound) { if err := tx.Session(&Session{}).First(result).Error; errors.Is(err, ErrRecordNotFound) {
return tx.Create(value) return tx.Create(value)
} }
} }
@ -144,7 +144,7 @@ func (db *DB) FindInBatches(dest interface{}, batchSize int, fc func(tx *DB, bat
var ( var (
tx = db.Order(clause.OrderByColumn{ tx = db.Order(clause.OrderByColumn{
Column: clause.Column{Table: clause.CurrentTable, Name: clause.PrimaryKey}, Column: clause.Column{Table: clause.CurrentTable, Name: clause.PrimaryKey},
}).Session(&Session{WithConditions: true}) }).Session(&Session{})
queryDB = tx queryDB = tx
rowsAffected int64 rowsAffected int64
batch int batch int
@ -480,7 +480,7 @@ func (db *DB) Transaction(fc func(tx *DB) error, opts ...*sql.TxOptions) (err er
} }
}() }()
err = fc(db.Session(&Session{WithConditions: true})) err = fc(db.Session(&Session{}))
} else { } else {
tx := db.Begin(opts...) tx := db.Begin(opts...)
@ -506,7 +506,7 @@ func (db *DB) Transaction(fc func(tx *DB) error, opts ...*sql.TxOptions) (err er
func (db *DB) Begin(opts ...*sql.TxOptions) *DB { func (db *DB) Begin(opts ...*sql.TxOptions) *DB {
var ( var (
// clone statement // clone statement
tx = db.Session(&Session{WithConditions: true, Context: db.Statement.Context}) tx = db.Session(&Session{Context: db.Statement.Context})
opt *sql.TxOptions opt *sql.TxOptions
err error err error
) )

9
gorm.go
View File

@ -63,7 +63,7 @@ type DB struct {
type Session struct { type Session struct {
DryRun bool DryRun bool
PrepareStmt bool PrepareStmt bool
WithConditions bool NewDB bool
SkipHooks bool SkipHooks bool
SkipDefaultTransaction bool SkipDefaultTransaction bool
AllowGlobalUpdate bool AllowGlobalUpdate bool
@ -196,7 +196,7 @@ func (db *DB) Session(config *Session) *DB {
tx.Statement.UpdatingColumn = true tx.Statement.UpdatingColumn = true
} }
if config.WithConditions { if !config.NewDB {
tx.clone = 2 tx.clone = 2
} }
@ -217,14 +217,13 @@ func (db *DB) Session(config *Session) *DB {
// WithContext change current instance db's context to ctx // WithContext change current instance db's context to ctx
func (db *DB) WithContext(ctx context.Context) *DB { func (db *DB) WithContext(ctx context.Context) *DB {
return db.Session(&Session{WithConditions: true, Context: ctx}) return db.Session(&Session{Context: ctx})
} }
// Debug start debug mode // Debug start debug mode
func (db *DB) Debug() (tx *DB) { func (db *DB) Debug() (tx *DB) {
return db.Session(&Session{ return db.Session(&Session{
WithConditions: true, Logger: db.Logger.LogMode(logger.Info),
Logger: db.Logger.LogMode(logger.Info),
}) })
} }

2
migrator.go
View File

@ -7,7 +7,7 @@ import (
// Migrator returns migrator // Migrator returns migrator
func (db *DB) Migrator() Migrator { func (db *DB) Migrator() Migrator {
return db.Dialector.Migrator(db.Session(&Session{WithConditions: true})) return db.Dialector.Migrator(db.Session(&Session{}))
} }
// AutoMigrate run auto migration for given models // AutoMigrate run auto migration for given models

8
migrator/migrator.go
View File

@ -82,7 +82,7 @@ func (m Migrator) FullDataTypeOf(field *schema.Field) (expr clause.Expr) {
// AutoMigrate // AutoMigrate
func (m Migrator) AutoMigrate(values ...interface{}) error { func (m Migrator) AutoMigrate(values ...interface{}) error {
for _, value := range m.ReorderModels(values, true) { for _, value := range m.ReorderModels(values, true) {
tx := m.DB.Session(&gorm.Session{}) tx := m.DB.Session(&gorm.Session{NewDB: true})
if !tx.Migrator().HasTable(value) { if !tx.Migrator().HasTable(value) {
if err := tx.Migrator().CreateTable(value); err != nil { if err := tx.Migrator().CreateTable(value); err != nil {
return err return err
@ -154,7 +154,7 @@ func (m Migrator) AutoMigrate(values ...interface{}) error {
func (m Migrator) CreateTable(values ...interface{}) error { func (m Migrator) CreateTable(values ...interface{}) error {
for _, value := range m.ReorderModels(values, false) { for _, value := range m.ReorderModels(values, false) {
tx := m.DB.Session(&gorm.Session{}) tx := m.DB.Session(&gorm.Session{NewDB: true})
if err := m.RunWithValue(value, func(stmt *gorm.Statement) (errr error) { if err := m.RunWithValue(value, func(stmt *gorm.Statement) (errr error) {
var ( var (
createTableSQL = "CREATE TABLE ? (" createTableSQL = "CREATE TABLE ? ("
@ -237,7 +237,7 @@ func (m Migrator) CreateTable(values ...interface{}) error {
func (m Migrator) DropTable(values ...interface{}) error { func (m Migrator) DropTable(values ...interface{}) error {
values = m.ReorderModels(values, false) values = m.ReorderModels(values, false)
for i := len(values) - 1; i >= 0; i-- { for i := len(values) - 1; i >= 0; i-- {
tx := m.DB.Session(&gorm.Session{}) tx := m.DB.Session(&gorm.Session{NewDB: true})
if err := m.RunWithValue(values[i], func(stmt *gorm.Statement) error { if err := m.RunWithValue(values[i], func(stmt *gorm.Statement) error {
return tx.Exec("DROP TABLE IF EXISTS ?", m.CurrentTable(stmt)).Error return tx.Exec("DROP TABLE IF EXISTS ?", m.CurrentTable(stmt)).Error
}); err != nil { }); err != nil {
@ -404,7 +404,7 @@ func (m Migrator) MigrateColumn(value interface{}, field *schema.Field, columnTy
func (m Migrator) ColumnTypes(value interface{}) (columnTypes []gorm.ColumnType, err error) { func (m Migrator) ColumnTypes(value interface{}) (columnTypes []gorm.ColumnType, err error) {
columnTypes = make([]gorm.ColumnType, 0) columnTypes = make([]gorm.ColumnType, 0)
err = m.RunWithValue(value, func(stmt *gorm.Statement) error { err = m.RunWithValue(value, func(stmt *gorm.Statement) error {
rows, err := m.DB.Session(&gorm.Session{}).Table(stmt.Table).Limit(1).Rows() rows, err := m.DB.Session(&gorm.Session{NewDB: true}).Table(stmt.Table).Limit(1).Rows()
if err == nil { if err == nil {
defer rows.Close() defer rows.Close()
rawColumnTypes, err := rows.ColumnTypes() rawColumnTypes, err := rows.ColumnTypes()

2
statement.go
View File

@ -190,7 +190,7 @@ func (stmt *Statement) AddVar(writer clause.Writer, vars ...interface{}) {
writer.WriteString("(NULL)") writer.WriteString("(NULL)")
} }
case *DB: case *DB:
subdb := v.Session(&Session{Logger: logger.Discard, DryRun: true, WithConditions: true}).getInstance() subdb := v.Session(&Session{Logger: logger.Discard, DryRun: true}).getInstance()
subdb.Statement.Vars = append(subdb.Statement.Vars, stmt.Vars...) subdb.Statement.Vars = append(subdb.Statement.Vars, stmt.Vars...)
subdb.callbacks.Query().Execute(subdb) subdb.callbacks.Query().Execute(subdb)
writer.WriteString(subdb.Statement.SQL.String()) writer.WriteString(subdb.Statement.SQL.String())

2
tests/count_test.go
View File

@ -41,7 +41,7 @@ func TestCount(t *testing.T) {
t.Errorf("multiple count in chain should works") t.Errorf("multiple count in chain should works")
} }
tx := DB.Model(&User{}).Where("name = ?", user1.Name).Session(&gorm.Session{WithConditions: true}) tx := DB.Model(&User{}).Where("name = ?", user1.Name).Session(&gorm.Session{})
tx.Count(&count1) tx.Count(&count1)
tx.Or("name in ?", []string{user2.Name, user3.Name}).Count(&count2) tx.Or("name in ?", []string{user2.Name, user3.Name}).Count(&count2)
if count1 != 1 || count2 != 3 { if count1 != 1 || count2 != 3 {

7
tests/hooks_test.go
View File

@ -380,6 +380,13 @@ func TestSetColumn(t *testing.T) {
DB.First(&result2, product.ID) DB.First(&result2, product.ID)
AssertEqual(t, result2, product) AssertEqual(t, result2, product)
product2 := Product3{Name: "Product", Price: 0}
DB.Session(&gorm.Session{SkipHooks: true}).Create(&product2)
if product2.Price != 0 {
t.Errorf("invalid price after create without hooks, got %+v", product2)
}
} }
func TestHooksForSlice(t *testing.T) { func TestHooksForSlice(t *testing.T) {