This reverts commit f14c79f170.
Этот коммит содержится в:
Jesse Hallam
2020-04-17 14:26:29 -03:00
коммит произвёл GitHub
родитель be7ee97dd3
Коммит 29fae242e1
628 изменённых файлов: 143991 добавлений и 89603 удалений

29
vendor/github.com/Masterminds/squirrel/delete.go сгенерированный поставляемый
Просмотреть файл

@@ -12,13 +12,13 @@ import (
type deleteData struct {
PlaceholderFormat PlaceholderFormat
RunWith BaseRunner
Prefixes []Sqlizer
Prefixes exprs
From string
WhereParts []Sqlizer
OrderBys []string
Limit string
Offset string
Suffixes []Sqlizer
Suffixes exprs
}
func (d *deleteData) Exec() (sql.Result, error) {
@@ -37,11 +37,7 @@ func (d *deleteData) ToSql() (sqlStr string, args []interface{}, err error) {
sql := &bytes.Buffer{}
if len(d.Prefixes) > 0 {
args, err = appendToSql(d.Prefixes, sql, " ", args)
if err != nil {
return
}
args, _ = d.Prefixes.AppendToSql(sql, " ", args)
sql.WriteString(" ")
}
@@ -73,10 +69,7 @@ func (d *deleteData) ToSql() (sqlStr string, args []interface{}, err error) {
if len(d.Suffixes) > 0 {
sql.WriteString(" ")
args, err = appendToSql(d.Suffixes, sql, " ", args)
if err != nil {
return
}
args, _ = d.Suffixes.AppendToSql(sql, " ", args)
}
sqlStr, err = d.PlaceholderFormat.ReplacePlaceholders(sql.String())
@@ -123,12 +116,7 @@ func (b DeleteBuilder) ToSql() (string, []interface{}, error) {
// Prefix adds an expression to the beginning of the query
func (b DeleteBuilder) Prefix(sql string, args ...interface{}) DeleteBuilder {
return b.PrefixExpr(Expr(sql, args...))
}
// PrefixExpr adds an expression to the very beginning of the query
func (b DeleteBuilder) PrefixExpr(expr Sqlizer) DeleteBuilder {
return builder.Append(b, "Prefixes", expr).(DeleteBuilder)
return builder.Append(b, "Prefixes", Expr(sql, args...)).(DeleteBuilder)
}
// From sets the table to be deleted from.
@@ -160,12 +148,7 @@ func (b DeleteBuilder) Offset(offset uint64) DeleteBuilder {
// Suffix adds an expression to the end of the query
func (b DeleteBuilder) Suffix(sql string, args ...interface{}) DeleteBuilder {
return b.SuffixExpr(Expr(sql, args...))
}
// SuffixExpr adds an expression to the end of the query
func (b DeleteBuilder) SuffixExpr(expr Sqlizer) DeleteBuilder {
return builder.Append(b, "Suffixes", expr).(DeleteBuilder)
return builder.Append(b, "Suffixes", Expr(sql, args...)).(DeleteBuilder)
}
func (b DeleteBuilder) Query() (*sql.Rows, error) {