增加websocket支持

vendor/gorm.io/gorm/clause/limit.go

@@ -1,5 +1,7 @@
 package clause
 
+import "strconv"
+
 // Limit limit clause
 type Limit struct {
 	Limit  *int
@@ -15,14 +17,14 @@ func (limit Limit) Name() string {
 func (limit Limit) Build(builder Builder) {
 	if limit.Limit != nil && *limit.Limit >= 0 {
 		builder.WriteString("LIMIT ")
-		builder.AddVar(builder, *limit.Limit)
+		builder.WriteString(strconv.Itoa(*limit.Limit))
 	}
 	if limit.Offset > 0 {
 		if limit.Limit != nil && *limit.Limit >= 0 {
 			builder.WriteByte(' ')
 		}
 		builder.WriteString("OFFSET ")
-		builder.AddVar(builder, limit.Offset)
+		builder.WriteString(strconv.Itoa(limit.Offset))
 	}
 }
 

vendor/gorm.io/gorm/clause/locking.go

@@ -1,12 +1,5 @@
 package clause
 
-const (
-	LockingStrengthUpdate    = "UPDATE"
-	LockingStrengthShare     = "SHARE"
-	LockingOptionsSkipLocked = "SKIP LOCKED"
-	LockingOptionsNoWait     = "NOWAIT"
-)
-
 type Locking struct {
 	Strength string
 	Table    Table

vendor/gorm.io/gorm/clause/where.go

@@ -21,12 +21,6 @@ func (where Where) Name() string {
 
 // Build build where clause
 func (where Where) Build(builder Builder) {
-	if len(where.Exprs) == 1 {
-		if andCondition, ok := where.Exprs[0].(AndConditions); ok {
-			where.Exprs = andCondition.Exprs
-		}
-	}
-
 	// Switch position if the first query expression is a single Or condition
 	for idx, expr := range where.Exprs {
 		if v, ok := expr.(OrConditions); !ok || len(v.Exprs) > 1 {
@@ -153,11 +147,6 @@ func Not(exprs ...Expression) Expression {
 	if len(exprs) == 0 {
 		return nil
 	}
-	if len(exprs) == 1 {
-		if andCondition, ok := exprs[0].(AndConditions); ok {
-			exprs = andCondition.Exprs
-		}
-	}
 	return NotConditions{Exprs: exprs}
 }
 
@@ -166,63 +155,19 @@ type NotConditions struct {
 }
 
 func (not NotConditions) Build(builder Builder) {
-	anyNegationBuilder := false
-	for _, c := range not.Exprs {
-		if _, ok := c.(NegationExpressionBuilder); ok {
-			anyNegationBuilder = true
-			break
-		}
+	if len(not.Exprs) > 1 {
+		builder.WriteByte('(')
 	}
 
-	if anyNegationBuilder {
-		if len(not.Exprs) > 1 {
-			builder.WriteByte('(')
+	for idx, c := range not.Exprs {
+		if idx > 0 {
+			builder.WriteString(AndWithSpace)
 		}
 
-		for idx, c := range not.Exprs {
-			if idx > 0 {
-				builder.WriteString(AndWithSpace)
-			}
-
-			if negationBuilder, ok := c.(NegationExpressionBuilder); ok {
-				negationBuilder.NegationBuild(builder)
-			} else {
-				builder.WriteString("NOT ")
-				e, wrapInParentheses := c.(Expr)
-				if wrapInParentheses {
-					sql := strings.ToUpper(e.SQL)
-					if wrapInParentheses = strings.Contains(sql, AndWithSpace) || strings.Contains(sql, OrWithSpace); wrapInParentheses {
-						builder.WriteByte('(')
-					}
-				}
-
-				c.Build(builder)
-
-				if wrapInParentheses {
-					builder.WriteByte(')')
-				}
-			}
-		}
-
-		if len(not.Exprs) > 1 {
-			builder.WriteByte(')')
-		}
-	} else {
-		builder.WriteString("NOT ")
-		if len(not.Exprs) > 1 {
-			builder.WriteByte('(')
-		}
-
-		for idx, c := range not.Exprs {
-			if idx > 0 {
-				switch c.(type) {
-				case OrConditions:
-					builder.WriteString(OrWithSpace)
-				default:
-					builder.WriteString(AndWithSpace)
-				}
-			}
-
+		if negationBuilder, ok := c.(NegationExpressionBuilder); ok {
+			negationBuilder.NegationBuild(builder)
+		} else {
+			builder.WriteString("NOT ")
 			e, wrapInParentheses := c.(Expr)
 			if wrapInParentheses {
 				sql := strings.ToUpper(e.SQL)
@@ -237,9 +182,9 @@ func (not NotConditions) Build(builder Builder) {
 				builder.WriteByte(')')
 			}
 		}
+	}
 
-		if len(not.Exprs) > 1 {
-			builder.WriteByte(')')
-		}
+	if len(not.Exprs) > 1 {
+		builder.WriteByte(')')
 	}
 }