define err with the same code style (#3199)
This commit is contained in:
parent
69d8111893
commit
f4cfa9411b
@ -170,7 +170,7 @@ func (association *Association) Replace(values ...interface{}) error {
|
|||||||
if column, values := schema.ToQueryValues(rel.JoinTable.Table, joinPrimaryKeys, pvs); len(values) > 0 {
|
if column, values := schema.ToQueryValues(rel.JoinTable.Table, joinPrimaryKeys, pvs); len(values) > 0 {
|
||||||
tx.Where(clause.IN{Column: column, Values: values})
|
tx.Where(clause.IN{Column: column, Values: values})
|
||||||
} else {
|
} else {
|
||||||
return ErrorPrimaryKeyRequired
|
return ErrPrimaryKeyRequired
|
||||||
}
|
}
|
||||||
|
|
||||||
_, rvs := schema.GetIdentityFieldValuesMapFromValues(values, relPrimaryFields)
|
_, rvs := schema.GetIdentityFieldValuesMapFromValues(values, relPrimaryFields)
|
||||||
|
@ -15,10 +15,10 @@ var (
|
|||||||
ErrMissingWhereClause = errors.New("WHERE conditions required")
|
ErrMissingWhereClause = errors.New("WHERE conditions required")
|
||||||
// ErrUnsupportedRelation unsupported relations
|
// ErrUnsupportedRelation unsupported relations
|
||||||
ErrUnsupportedRelation = errors.New("unsupported relations")
|
ErrUnsupportedRelation = errors.New("unsupported relations")
|
||||||
// ErrorPrimaryKeyRequired primary keys required
|
// ErrPrimaryKeyRequired primary keys required
|
||||||
ErrorPrimaryKeyRequired = errors.New("primary key required")
|
ErrPrimaryKeyRequired = errors.New("primary key required")
|
||||||
// ErrorModelValueRequired model value required
|
// ErrModelValueRequired model value required
|
||||||
ErrorModelValueRequired = errors.New("model value required")
|
ErrModelValueRequired = errors.New("model value required")
|
||||||
// ErrUnsupportedDriver unsupported driver
|
// ErrUnsupportedDriver unsupported driver
|
||||||
ErrUnsupportedDriver = errors.New("unsupported driver")
|
ErrUnsupportedDriver = errors.New("unsupported driver")
|
||||||
// ErrRegistered registered
|
// ErrRegistered registered
|
||||||
|
@ -325,7 +325,7 @@ func (db *DB) Pluck(column string, dest interface{}) (tx *DB) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if tx.Statement.Table == "" {
|
} else if tx.Statement.Table == "" {
|
||||||
tx.AddError(ErrorModelValueRequired)
|
tx.AddError(ErrModelValueRequired)
|
||||||
}
|
}
|
||||||
|
|
||||||
fields := strings.FieldsFunc(column, utils.IsChar)
|
fields := strings.FieldsFunc(column, utils.IsChar)
|
||||||
|
@ -96,7 +96,7 @@ func (stmt *Statement) QuoteTo(writer clause.Writer, field interface{}) {
|
|||||||
|
|
||||||
if v.Name == clause.PrimaryKey {
|
if v.Name == clause.PrimaryKey {
|
||||||
if stmt.Schema == nil {
|
if stmt.Schema == nil {
|
||||||
stmt.DB.AddError(ErrorModelValueRequired)
|
stmt.DB.AddError(ErrModelValueRequired)
|
||||||
} else if stmt.Schema.PrioritizedPrimaryField != nil {
|
} else if stmt.Schema.PrioritizedPrimaryField != nil {
|
||||||
stmt.DB.Dialector.QuoteTo(writer, stmt.Schema.PrioritizedPrimaryField.DBName)
|
stmt.DB.Dialector.QuoteTo(writer, stmt.Schema.PrioritizedPrimaryField.DBName)
|
||||||
} else if len(stmt.Schema.DBNames) > 0 {
|
} else if len(stmt.Schema.DBNames) > 0 {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user