From 564aeec91f17d4fa68abdcf58bf274340356975d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Mar 2023 04:02:01 +0000
Subject: [PATCH] Bump gorm.io/gorm from 1.24.5 to 1.24.6

Bumps [gorm.io/gorm](https://github.com/go-gorm/gorm) from 1.24.5 to 1.24.6.
- [Release notes](https://github.com/go-gorm/gorm/releases)
- [Commits](https://github.com/go-gorm/gorm/compare/v1.24.5...v1.24.6)

---
updated-dependencies:
- dependency-name: gorm.io/gorm
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 go.mod                                      |  2 +-
 go.sum                                      |  4 +--
 vendor/gorm.io/gorm/association.go          |  8 +++--
 vendor/gorm.io/gorm/callbacks/callmethod.go | 13 +++++--
 vendor/gorm.io/gorm/callbacks/query.go      |  1 +
 vendor/gorm.io/gorm/callbacks/row.go        |  2 +-
 vendor/gorm.io/gorm/callbacks/update.go     |  4 ++-
 vendor/gorm.io/gorm/chainable_api.go        |  5 ++-
 vendor/gorm.io/gorm/errors.go               |  4 +++
 vendor/gorm.io/gorm/finisher_api.go         | 11 +++---
 vendor/gorm.io/gorm/migrator.go             |  6 ++--
 vendor/gorm.io/gorm/migrator/migrator.go    | 40 +++++++++++++++++----
 vendor/gorm.io/gorm/model.go                |  7 ++--
 vendor/gorm.io/gorm/schema/field.go         |  2 +-
 vendor/gorm.io/gorm/schema/relationship.go  | 23 ++++++------
 vendor/gorm.io/gorm/schema/serializer.go    |  9 ++---
 vendor/gorm.io/gorm/schema/utils.go         |  2 +-
 vendor/gorm.io/gorm/statement.go            |  2 ++
 vendor/modules.txt                          |  2 +-
 19 files changed, 99 insertions(+), 48 deletions(-)

diff --git a/go.mod b/go.mod
index e7d8ad7edf..064646e2b4 100644
--- a/go.mod
+++ b/go.mod
@@ -51,7 +51,7 @@ require (
 	gorm.io/driver/mysql v1.4.7
 	gorm.io/driver/postgres v1.4.8
 	gorm.io/driver/sqlite v1.4.4
-	gorm.io/gorm v1.24.5
+	gorm.io/gorm v1.24.6
 	gvisor.dev/gvisor v0.0.0-20220817001344-846276b3dbc5
 	modernc.org/sqlite v1.21.0
 )
diff --git a/go.sum b/go.sum
index c3a55aed6c..a96ee18ca7 100644
--- a/go.sum
+++ b/go.sum
@@ -459,8 +459,8 @@ gorm.io/driver/sqlite v1.4.4/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2e
 gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
 gorm.io/gorm v1.24.0/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
 gorm.io/gorm v1.24.2/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
-gorm.io/gorm v1.24.5 h1:g6OPREKqqlWq4kh/3MCQbZKImeB9e6Xgc4zD+JgNZGE=
-gorm.io/gorm v1.24.5/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
+gorm.io/gorm v1.24.6 h1:wy98aq9oFEetsc4CAbKD2SoBCdMzsbSIvSUUFJuHi5s=
+gorm.io/gorm v1.24.6/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
 gvisor.dev/gvisor v0.0.0-20220817001344-846276b3dbc5 h1:cv/zaNV0nr1mJzaeo4S5mHIm5va1W0/9J3/5prlsuRM=
 gvisor.dev/gvisor v0.0.0-20220817001344-846276b3dbc5/go.mod h1:TIvkJD0sxe8pIob3p6T8IzxXunlp6yfgktvTNp+DGNM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/vendor/gorm.io/gorm/association.go b/vendor/gorm.io/gorm/association.go
index 06229caa78..6719a1d048 100644
--- a/vendor/gorm.io/gorm/association.go
+++ b/vendor/gorm.io/gorm/association.go
@@ -353,9 +353,13 @@ func (association *Association) saveAssociation(clear bool, values ...interface{
 			}
 		case schema.HasMany, schema.Many2Many:
 			elemType := association.Relationship.Field.IndirectFieldType.Elem()
-			fieldValue := reflect.Indirect(association.Relationship.Field.ReflectValueOf(association.DB.Statement.Context, source))
+			oldFieldValue := reflect.Indirect(association.Relationship.Field.ReflectValueOf(association.DB.Statement.Context, source))
+			var fieldValue reflect.Value
 			if clear {
-				fieldValue = reflect.New(association.Relationship.Field.IndirectFieldType).Elem()
+				fieldValue = reflect.MakeSlice(oldFieldValue.Type(), 0, oldFieldValue.Cap())
+			} else {
+				fieldValue = reflect.MakeSlice(oldFieldValue.Type(), oldFieldValue.Len(), oldFieldValue.Cap())
+				reflect.Copy(fieldValue, oldFieldValue)
 			}
 
 			appendToFieldValues := func(ev reflect.Value) {
diff --git a/vendor/gorm.io/gorm/callbacks/callmethod.go b/vendor/gorm.io/gorm/callbacks/callmethod.go
index bcaa03f3d9..fb90003790 100644
--- a/vendor/gorm.io/gorm/callbacks/callmethod.go
+++ b/vendor/gorm.io/gorm/callbacks/callmethod.go
@@ -13,11 +13,20 @@ func callMethod(db *gorm.DB, fc func(value interface{}, tx *gorm.DB) bool) {
 		case reflect.Slice, reflect.Array:
 			db.Statement.CurDestIndex = 0
 			for i := 0; i < db.Statement.ReflectValue.Len(); i++ {
-				fc(reflect.Indirect(db.Statement.ReflectValue.Index(i)).Addr().Interface(), tx)
+				if value := reflect.Indirect(db.Statement.ReflectValue.Index(i)); value.CanAddr() {
+					fc(value.Addr().Interface(), tx)
+				} else {
+					db.AddError(gorm.ErrInvalidValue)
+					return
+				}
 				db.Statement.CurDestIndex++
 			}
 		case reflect.Struct:
-			fc(db.Statement.ReflectValue.Addr().Interface(), tx)
+			if db.Statement.ReflectValue.CanAddr() {
+				fc(db.Statement.ReflectValue.Addr().Interface(), tx)
+			} else {
+				db.AddError(gorm.ErrInvalidValue)
+			}
 		}
 	}
 }
diff --git a/vendor/gorm.io/gorm/callbacks/query.go b/vendor/gorm.io/gorm/callbacks/query.go
index 97fe8a49c4..9a6d4f4a8a 100644
--- a/vendor/gorm.io/gorm/callbacks/query.go
+++ b/vendor/gorm.io/gorm/callbacks/query.go
@@ -257,6 +257,7 @@ func Preload(db *gorm.DB) {
 			return
 		}
 		preloadDB.Statement.ReflectValue = db.Statement.ReflectValue
+		preloadDB.Statement.Unscoped = db.Statement.Unscoped
 
 		for _, name := range preloadNames {
 			if rel := preloadDB.Statement.Schema.Relationships.Relations[name]; rel != nil {
diff --git a/vendor/gorm.io/gorm/callbacks/row.go b/vendor/gorm.io/gorm/callbacks/row.go
index 56be742e81..beaa189e1c 100644
--- a/vendor/gorm.io/gorm/callbacks/row.go
+++ b/vendor/gorm.io/gorm/callbacks/row.go
@@ -7,7 +7,7 @@ import (
 func RowQuery(db *gorm.DB) {
 	if db.Error == nil {
 		BuildQuerySQL(db)
-		if db.DryRun {
+		if db.DryRun || db.Error != nil {
 			return
 		}
 
diff --git a/vendor/gorm.io/gorm/callbacks/update.go b/vendor/gorm.io/gorm/callbacks/update.go
index b596df9a06..fe6f099411 100644
--- a/vendor/gorm.io/gorm/callbacks/update.go
+++ b/vendor/gorm.io/gorm/callbacks/update.go
@@ -137,7 +137,9 @@ func ConvertToAssignments(stmt *gorm.Statement) (set clause.Set) {
 	case reflect.Slice, reflect.Array:
 		assignValue = func(field *schema.Field, value interface{}) {
 			for i := 0; i < stmt.ReflectValue.Len(); i++ {
-				field.Set(stmt.Context, stmt.ReflectValue.Index(i), value)
+				if stmt.ReflectValue.CanAddr() {
+					field.Set(stmt.Context, stmt.ReflectValue.Index(i), value)
+				}
 			}
 		}
 	case reflect.Struct:
diff --git a/vendor/gorm.io/gorm/chainable_api.go b/vendor/gorm.io/gorm/chainable_api.go
index 676fe914c5..a85235e011 100644
--- a/vendor/gorm.io/gorm/chainable_api.go
+++ b/vendor/gorm.io/gorm/chainable_api.go
@@ -253,7 +253,10 @@ func joins(db *DB, joinType clause.JoinType, query string, args ...interface{})
 
 	if len(args) == 1 {
 		if db, ok := args[0].(*DB); ok {
-			j := join{Name: query, Conds: args, Selects: db.Statement.Selects, Omits: db.Statement.Omits}
+			j := join{
+				Name: query, Conds: args, Selects: db.Statement.Selects,
+				Omits: db.Statement.Omits, JoinType: joinType,
+			}
 			if where, ok := db.Statement.Clauses["WHERE"].Expression.(clause.Where); ok {
 				j.On = &where
 			}
diff --git a/vendor/gorm.io/gorm/errors.go b/vendor/gorm.io/gorm/errors.go
index 49cbfe64ac..5bfd0f8210 100644
--- a/vendor/gorm.io/gorm/errors.go
+++ b/vendor/gorm.io/gorm/errors.go
@@ -21,6 +21,10 @@ var (
 	ErrPrimaryKeyRequired = errors.New("primary key required")
 	// ErrModelValueRequired model value required
 	ErrModelValueRequired = errors.New("model value required")
+	// ErrModelAccessibleFieldsRequired model accessible fields required
+	ErrModelAccessibleFieldsRequired = errors.New("model accessible fields required")
+	// ErrSubQueryRequired sub query required
+	ErrSubQueryRequired = errors.New("sub query required")
 	// ErrInvalidData unsupported data
 	ErrInvalidData = errors.New("unsupported data")
 	// ErrUnsupportedDriver unsupported driver
diff --git a/vendor/gorm.io/gorm/finisher_api.go b/vendor/gorm.io/gorm/finisher_api.go
index 39d9fca3ec..f16d4f4308 100644
--- a/vendor/gorm.io/gorm/finisher_api.go
+++ b/vendor/gorm.io/gorm/finisher_api.go
@@ -101,14 +101,13 @@ func (db *DB) Save(value interface{}) (tx *DB) {
 			tx.Statement.Selects = append(tx.Statement.Selects, "*")
 		}
 
-		tx = tx.callbacks.Update().Execute(tx)
+		updateTx := tx.callbacks.Update().Execute(tx.Session(&Session{Initialized: true}))
 
-		if tx.Error == nil && tx.RowsAffected == 0 && !tx.DryRun && !selectedUpdate {
-			result := reflect.New(tx.Statement.Schema.ModelType).Interface()
-			if result := tx.Session(&Session{}).Limit(1).Find(result); result.RowsAffected == 0 {
-				return tx.Create(value)
-			}
+		if updateTx.Error == nil && updateTx.RowsAffected == 0 && !updateTx.DryRun && !selectedUpdate {
+			return tx.Create(value)
 		}
+
+		return updateTx
 	}
 
 	return
diff --git a/vendor/gorm.io/gorm/migrator.go b/vendor/gorm.io/gorm/migrator.go
index 882fc4cc50..9c7cc2c495 100644
--- a/vendor/gorm.io/gorm/migrator.go
+++ b/vendor/gorm.io/gorm/migrator.go
@@ -30,9 +30,9 @@ func (db *DB) AutoMigrate(dst ...interface{}) error {
 
 // ViewOption view option
 type ViewOption struct {
-	Replace     bool
-	CheckOption string
-	Query       *DB
+	Replace     bool   // If true, exec `CREATE`. If false, exec `CREATE OR REPLACE`
+	CheckOption string // optional. e.g. `WITH [ CASCADED | LOCAL ] CHECK OPTION`
+	Query       *DB    // required subquery.
 }
 
 // ColumnType column type interface
diff --git a/vendor/gorm.io/gorm/migrator/migrator.go b/vendor/gorm.io/gorm/migrator/migrator.go
index b8aaef2b30..389ce00894 100644
--- a/vendor/gorm.io/gorm/migrator/migrator.go
+++ b/vendor/gorm.io/gorm/migrator/migrator.go
@@ -16,9 +16,7 @@ import (
 	"gorm.io/gorm/schema"
 )
 
-var (
-	regFullDataType = regexp.MustCompile(`\D*(\d+)\D?`)
-)
+var regFullDataType = regexp.MustCompile(`\D*(\d+)\D?`)
 
 // Migrator m struct
 type Migrator struct {
@@ -559,14 +557,44 @@ func (m Migrator) ColumnTypes(value interface{}) ([]gorm.ColumnType, error) {
 	return columnTypes, execErr
 }
 
-// CreateView create view
+// CreateView create view from Query in gorm.ViewOption.
+// Query in gorm.ViewOption is a [subquery]
+//
+//	// CREATE VIEW `user_view` AS SELECT * FROM `users` WHERE age > 20
+//	q := DB.Model(&User{}).Where("age > ?", 20)
+//	DB.Debug().Migrator().CreateView("user_view", gorm.ViewOption{Query: q})
+//
+//	// CREATE OR REPLACE VIEW `users_view` AS SELECT * FROM `users` WITH CHECK OPTION
+//	q := DB.Model(&User{})
+//	DB.Debug().Migrator().CreateView("user_view", gorm.ViewOption{Query: q, Replace: true, CheckOption: "WITH CHECK OPTION"})
+//
+// [subquery]: https://gorm.io/docs/advanced_query.html#SubQuery
 func (m Migrator) CreateView(name string, option gorm.ViewOption) error {
-	return gorm.ErrNotImplemented
+	if option.Query == nil {
+		return gorm.ErrSubQueryRequired
+	}
+
+	sql := new(strings.Builder)
+	sql.WriteString("CREATE ")
+	if option.Replace {
+		sql.WriteString("OR REPLACE ")
+	}
+	sql.WriteString("VIEW ")
+	m.QuoteTo(sql, name)
+	sql.WriteString(" AS ")
+
+	m.DB.Statement.AddVar(sql, option.Query)
+
+	if option.CheckOption != "" {
+		sql.WriteString(" ")
+		sql.WriteString(option.CheckOption)
+	}
+	return m.DB.Exec(m.Explain(sql.String(), m.DB.Statement.Vars...)).Error
 }
 
 // DropView drop view
 func (m Migrator) DropView(name string) error {
-	return gorm.ErrNotImplemented
+	return m.DB.Exec("DROP VIEW IF EXISTS ?", clause.Table{Name: name}).Error
 }
 
 func buildConstraint(constraint *schema.Constraint) (sql string, results []interface{}) {
diff --git a/vendor/gorm.io/gorm/model.go b/vendor/gorm.io/gorm/model.go
index 3334d17cb1..fa705df1cd 100644
--- a/vendor/gorm.io/gorm/model.go
+++ b/vendor/gorm.io/gorm/model.go
@@ -4,9 +4,10 @@ import "time"
 
 // Model a basic GoLang struct which includes the following fields: ID, CreatedAt, UpdatedAt, DeletedAt
 // It may be embedded into your model or you may build your own model without it
-//    type User struct {
-//      gorm.Model
-//    }
+//
+//	type User struct {
+//	  gorm.Model
+//	}
 type Model struct {
 	ID        uint `gorm:"primarykey"`
 	CreatedAt time.Time
diff --git a/vendor/gorm.io/gorm/schema/field.go b/vendor/gorm.io/gorm/schema/field.go
index 1589d984a3..59151878ff 100644
--- a/vendor/gorm.io/gorm/schema/field.go
+++ b/vendor/gorm.io/gorm/schema/field.go
@@ -174,7 +174,7 @@ func (schema *Schema) ParseField(fieldStruct reflect.StructField) *Field {
 		field.DataType = String
 		field.Serializer = v
 	} else {
-		var serializerName = field.TagSettings["JSON"]
+		serializerName := field.TagSettings["JSON"]
 		if serializerName == "" {
 			serializerName = field.TagSettings["SERIALIZER"]
 		}
diff --git a/vendor/gorm.io/gorm/schema/relationship.go b/vendor/gorm.io/gorm/schema/relationship.go
index 9436f28319..b33b94a74e 100644
--- a/vendor/gorm.io/gorm/schema/relationship.go
+++ b/vendor/gorm.io/gorm/schema/relationship.go
@@ -123,16 +123,17 @@ func (schema *Schema) parseRelation(field *Field) *Relationship {
 }
 
 // User has many Toys, its `Polymorphic` is `Owner`, Pet has one Toy, its `Polymorphic` is `Owner`
-//     type User struct {
-//       Toys []Toy `gorm:"polymorphic:Owner;"`
-//     }
-//     type Pet struct {
-//       Toy Toy `gorm:"polymorphic:Owner;"`
-//     }
-//     type Toy struct {
-//       OwnerID   int
-//       OwnerType string
-//     }
+//
+//	type User struct {
+//	  Toys []Toy `gorm:"polymorphic:Owner;"`
+//	}
+//	type Pet struct {
+//	  Toy Toy `gorm:"polymorphic:Owner;"`
+//	}
+//	type Toy struct {
+//	  OwnerID   int
+//	  OwnerType string
+//	}
 func (schema *Schema) buildPolymorphicRelation(relation *Relationship, field *Field, polymorphic string) {
 	relation.Polymorphic = &Polymorphic{
 		Value:           schema.Table,
@@ -427,7 +428,7 @@ func (schema *Schema) guessRelation(relation *Relationship, field *Field, cgl gu
 			foreignFields = append(foreignFields, f)
 		}
 	} else {
-		var primarySchemaName = primarySchema.Name
+		primarySchemaName := primarySchema.Name
 		if primarySchemaName == "" {
 			primarySchemaName = relation.FieldSchema.Name
 		}
diff --git a/vendor/gorm.io/gorm/schema/serializer.go b/vendor/gorm.io/gorm/schema/serializer.go
index 9a6aa4fc0c..397edff034 100644
--- a/vendor/gorm.io/gorm/schema/serializer.go
+++ b/vendor/gorm.io/gorm/schema/serializer.go
@@ -70,8 +70,7 @@ type SerializerValuerInterface interface {
 }
 
 // JSONSerializer json serializer
-type JSONSerializer struct {
-}
+type JSONSerializer struct{}
 
 // Scan implements serializer interface
 func (JSONSerializer) Scan(ctx context.Context, field *Field, dst reflect.Value, dbValue interface{}) (err error) {
@@ -110,8 +109,7 @@ func (JSONSerializer) Value(ctx context.Context, field *Field, dst reflect.Value
 }
 
 // UnixSecondSerializer json serializer
-type UnixSecondSerializer struct {
-}
+type UnixSecondSerializer struct{}
 
 // Scan implements serializer interface
 func (UnixSecondSerializer) Scan(ctx context.Context, field *Field, dst reflect.Value, dbValue interface{}) (err error) {
@@ -141,8 +139,7 @@ func (UnixSecondSerializer) Value(ctx context.Context, field *Field, dst reflect
 }
 
 // GobSerializer gob serializer
-type GobSerializer struct {
-}
+type GobSerializer struct{}
 
 // Scan implements serializer interface
 func (GobSerializer) Scan(ctx context.Context, field *Field, dst reflect.Value, dbValue interface{}) (err error) {
diff --git a/vendor/gorm.io/gorm/schema/utils.go b/vendor/gorm.io/gorm/schema/utils.go
index acf1a739bf..65d012e548 100644
--- a/vendor/gorm.io/gorm/schema/utils.go
+++ b/vendor/gorm.io/gorm/schema/utils.go
@@ -133,7 +133,7 @@ func GetIdentityFieldValuesMap(ctx context.Context, reflectValue reflect.Value,
 		for i := 0; i < reflectValue.Len(); i++ {
 			elem := reflectValue.Index(i)
 			elemKey := elem.Interface()
-			if elem.Kind() != reflect.Ptr {
+			if elem.Kind() != reflect.Ptr && elem.CanAddr() {
 				elemKey = elem.Addr().Interface()
 			}
 
diff --git a/vendor/gorm.io/gorm/statement.go b/vendor/gorm.io/gorm/statement.go
index 0816529382..bc959f0b65 100644
--- a/vendor/gorm.io/gorm/statement.go
+++ b/vendor/gorm.io/gorm/statement.go
@@ -120,6 +120,8 @@ func (stmt *Statement) QuoteTo(writer clause.Writer, field interface{}) {
 				write(v.Raw, stmt.Schema.PrioritizedPrimaryField.DBName)
 			} else if len(stmt.Schema.DBNames) > 0 {
 				write(v.Raw, stmt.Schema.DBNames[0])
+			} else {
+				stmt.DB.AddError(ErrModelAccessibleFieldsRequired) //nolint:typecheck,errcheck
 			}
 		} else {
 			write(v.Raw, v.Name)
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 09ab184edd..2c1cb4864d 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -631,7 +631,7 @@ gorm.io/driver/postgres
 # gorm.io/driver/sqlite v1.4.4
 ## explicit; go 1.14
 gorm.io/driver/sqlite
-# gorm.io/gorm v1.24.5
+# gorm.io/gorm v1.24.6
 ## explicit; go 1.16
 gorm.io/gorm
 gorm.io/gorm/callbacks