增加websocket支持

vendor/github.com/jackc/pgx/v5/named_args.go

@@ -2,7 +2,6 @@ package pgx
 
 import (
 	"context"
-	"fmt"
 	"strconv"
 	"strings"
 	"unicode/utf8"
@@ -15,41 +14,10 @@ import (
 //
 //	conn.Query(ctx, "select * from widgets where foo = @foo and bar = @bar", pgx.NamedArgs{"foo": 1, "bar": 2})
 //	conn.Query(ctx, "select * from widgets where foo = $1 and bar = $2", 1, 2)
-//
-// Named placeholders are case sensitive and must start with a letter or underscore. Subsequent characters can be
-// letters, numbers, or underscores.
 type NamedArgs map[string]any
 
 // RewriteQuery implements the QueryRewriter interface.
 func (na NamedArgs) RewriteQuery(ctx context.Context, conn *Conn, sql string, args []any) (newSQL string, newArgs []any, err error) {
-	return rewriteQuery(na, sql, false)
-}
-
-// StrictNamedArgs can be used in the same way as NamedArgs, but provided arguments are also checked to include all
-// named arguments that the sql query uses, and no extra arguments.
-type StrictNamedArgs map[string]any
-
-// RewriteQuery implements the QueryRewriter interface.
-func (sna StrictNamedArgs) RewriteQuery(ctx context.Context, conn *Conn, sql string, args []any) (newSQL string, newArgs []any, err error) {
-	return rewriteQuery(sna, sql, true)
-}
-
-type namedArg string
-
-type sqlLexer struct {
-	src     string
-	start   int
-	pos     int
-	nested  int // multiline comment nesting level.
-	stateFn stateFn
-	parts   []any
-
-	nameToOrdinal map[namedArg]int
-}
-
-type stateFn func(*sqlLexer) stateFn
-
-func rewriteQuery(na map[string]any, sql string, isStrict bool) (newSQL string, newArgs []any, err error) {
 	l := &sqlLexer{
 		src:           sql,
 		stateFn:       rawState,
@@ -73,24 +41,27 @@ func rewriteQuery(na map[string]any, sql string, isStrict bool) (newSQL string,
 
 	newArgs = make([]any, len(l.nameToOrdinal))
 	for name, ordinal := range l.nameToOrdinal {
-		var found bool
-		newArgs[ordinal-1], found = na[string(name)]
-		if isStrict && !found {
-			return "", nil, fmt.Errorf("argument %s found in sql query but not present in StrictNamedArgs", name)
-		}
-	}
-
-	if isStrict {
-		for name := range na {
-			if _, found := l.nameToOrdinal[namedArg(name)]; !found {
-				return "", nil, fmt.Errorf("argument %s of StrictNamedArgs not found in sql query", name)
-			}
-		}
+		newArgs[ordinal-1] = na[string(name)]
 	}
 
 	return sb.String(), newArgs, nil
 }
 
+type namedArg string
+
+type sqlLexer struct {
+	src     string
+	start   int
+	pos     int
+	nested  int // multiline comment nesting level.
+	stateFn stateFn
+	parts   []any
+
+	nameToOrdinal map[namedArg]int
+}
+
+type stateFn func(*sqlLexer) stateFn
+
 func rawState(l *sqlLexer) stateFn {
 	for {
 		r, width := utf8.DecodeRuneInString(l.src[l.pos:])
@@ -109,7 +80,7 @@ func rawState(l *sqlLexer) stateFn {
 			return doubleQuoteState
 		case '@':
 			nextRune, _ := utf8.DecodeRuneInString(l.src[l.pos:])
-			if isLetter(nextRune) || nextRune == '_' {
+			if isLetter(nextRune) {
 				if l.pos-l.start > 0 {
 					l.parts = append(l.parts, l.src[l.start:l.pos-width])
 				}