This repository was archived by the owner on Apr 24, 2025. It is now read-only.
forked from xwb1989/sqlparser
-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathsqlparser.patch
316 lines (284 loc) · 12.4 KB
/
sqlparser.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
Only in /Users/bramp/go/src/github.com/xwb1989/sqlparser//: .git
Only in /Users/bramp/go/src/github.com/xwb1989/sqlparser//: .gitignore
Only in /Users/bramp/go/src/github.com/xwb1989/sqlparser//: .travis.yml
Only in /Users/bramp/go/src/github.com/xwb1989/sqlparser//: CONTRIBUTORS.md
Only in /Users/bramp/go/src/github.com/xwb1989/sqlparser//: LICENSE.md
Only in /Users/bramp/go/src/github.com/xwb1989/sqlparser//: README.md
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/analyzer.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//analyzer.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/analyzer.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//analyzer.go 2018-06-06 07:45:09.000000000 -0700
@@ -19,15 +19,13 @@
// analyzer.go contains utility analysis functions.
import (
+ "errors"
"fmt"
"strconv"
"strings"
"unicode"
- "vitess.io/vitess/go/sqltypes"
- "vitess.io/vitess/go/vt/vterrors"
-
- vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
+ "github.com/xwb1989/sqlparser/dependency/sqltypes"
)
// These constants are used to identify the SQL statement type.
@@ -219,7 +217,7 @@
case IntVal:
n, err := sqltypes.NewIntegral(string(node.Val))
if err != nil {
- return sqltypes.PlanValue{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%v", err)
+ return sqltypes.PlanValue{}, fmt.Errorf("%v", err)
}
return sqltypes.PlanValue{Value: n}, nil
case StrVal:
@@ -227,7 +225,7 @@
case HexVal:
v, err := node.HexDecode()
if err != nil {
- return sqltypes.PlanValue{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "%v", err)
+ return sqltypes.PlanValue{}, fmt.Errorf("%v", err)
}
return sqltypes.PlanValue{Value: sqltypes.MakeTrusted(sqltypes.VarBinary, v)}, nil
}
@@ -243,7 +241,7 @@
return sqltypes.PlanValue{}, err
}
if innerpv.ListKey != "" || innerpv.Values != nil {
- return sqltypes.PlanValue{}, vterrors.New(vtrpcpb.Code_UNIMPLEMENTED, "unsupported: nested lists")
+ return sqltypes.PlanValue{}, errors.New("unsupported: nested lists")
}
pv.Values = append(pv.Values, innerpv)
}
@@ -251,7 +249,7 @@
case *NullVal:
return sqltypes.PlanValue{}, nil
}
- return sqltypes.PlanValue{}, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "expression is too complex '%v'", String(node))
+ return sqltypes.PlanValue{}, fmt.Errorf("expression is too complex '%v'", String(node))
}
// StringIn is a convenience function that returns
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/analyzer_test.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//analyzer_test.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/analyzer_test.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//analyzer_test.go 2018-06-06 07:45:09.000000000 -0700
@@ -21,7 +21,7 @@
"strings"
"testing"
- "vitess.io/vitess/go/sqltypes"
+ "github.com/xwb1989/sqlparser/dependency/sqltypes"
)
func TestPreview(t *testing.T) {
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/ast.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//ast.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/ast.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//ast.go 2018-06-06 07:45:09.000000000 -0700
@@ -22,14 +22,11 @@
"encoding/json"
"fmt"
"io"
+ "log"
"strings"
- "vitess.io/vitess/go/sqltypes"
- "vitess.io/vitess/go/vt/log"
- "vitess.io/vitess/go/vt/vterrors"
-
- querypb "vitess.io/vitess/go/vt/proto/query"
- vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
+ "github.com/xwb1989/sqlparser/dependency/querypb"
+ "github.com/xwb1989/sqlparser/dependency/sqltypes"
)
// Instructions for creating new types: If a type
@@ -52,11 +49,11 @@
tokenizer := NewStringTokenizer(sql)
if yyParse(tokenizer) != 0 {
if tokenizer.partialDDL != nil {
- log.Warningf("ignoring error parsing DDL '%s': %v", sql, tokenizer.LastError)
+ log.Printf("ignoring error parsing DDL '%s': %v", sql, tokenizer.LastError)
tokenizer.ParseTree = tokenizer.partialDDL
return tokenizer.ParseTree, nil
}
- return nil, vterrors.New(vtrpcpb.Code_INVALID_ARGUMENT, tokenizer.LastError.Error())
+ return nil, tokenizer.LastError
}
return tokenizer.ParseTree, nil
}
@@ -2249,7 +2246,7 @@
return NewStrVal(value.ToBytes()), nil
default:
// We cannot support sqltypes.Expression, or any other invalid type.
- return nil, vterrors.Errorf(vtrpcpb.Code_INTERNAL, "cannot convert value %v to AST", value)
+ return nil, fmt.Errorf("cannot convert value %v to AST", value)
}
}
@@ -3394,6 +3391,20 @@
return nil
}
+// Backtick produces a backticked literal given an input string.
+func Backtick(in string) string {
+ var buf bytes.Buffer
+ buf.WriteByte('`')
+ for _, c := range in {
+ buf.WriteRune(c)
+ if c == '`' {
+ buf.WriteByte('`')
+ }
+ }
+ buf.WriteByte('`')
+ return buf.String()
+}
+
func formatID(buf *TrackedBuffer, original, lowered string) {
isDbSystemVariable := false
if len(original) > 1 && original[:2] == "@@" {
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/ast_test.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//ast_test.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/ast_test.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//ast_test.go 2018-06-05 07:41:09.000000000 -0700
@@ -24,7 +24,7 @@
"testing"
"unsafe"
- "vitess.io/vitess/go/sqltypes"
+ "github.com/xwb1989/sqlparser/dependency/sqltypes"
)
func TestAppend(t *testing.T) {
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/comments.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//comments.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/comments.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//comments.go 2018-06-06 07:45:09.000000000 -0700
@@ -145,7 +145,7 @@
// Single line comment
index := strings.Index(sql, "\n")
if index == -1 {
- return ""
+ return sql
}
sql = sql[index+1:]
}
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/comments_test.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//comments_test.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/comments_test.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//comments_test.go 2018-06-06 07:45:08.000000000 -0700
@@ -187,7 +187,7 @@
outSQL: "bar",
}, {
input: "-- /* foo */ bar",
- outSQL: "",
+ outSQL: "-- /* foo */ bar",
}, {
input: "foo -- bar */",
outSQL: "foo -- bar */",
@@ -201,7 +201,7 @@
outSQL: "a",
}, {
input: `-- foo bar`,
- outSQL: "",
+ outSQL: "-- foo bar",
}}
for _, testCase := range testCases {
gotSQL := StripLeadingComments(testCase.input)
Only in /Users/bramp/go/src/github.com/xwb1989/sqlparser//: dependency
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/encodable.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//encodable.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/encodable.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//encodable.go 2017-10-18 18:06:33.000000000 -0700
@@ -19,7 +19,7 @@
import (
"bytes"
- "vitess.io/vitess/go/sqltypes"
+ "github.com/xwb1989/sqlparser/dependency/sqltypes"
)
// This file contains types that are 'Encodable'.
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/encodable_test.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//encodable_test.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/encodable_test.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//encodable_test.go 2017-10-18 18:06:33.000000000 -0700
@@ -20,7 +20,7 @@
"bytes"
"testing"
- "vitess.io/vitess/go/sqltypes"
+ "github.com/xwb1989/sqlparser/dependency/sqltypes"
)
func TestEncodable(t *testing.T) {
Only in /Users/bramp/go/src/github.com/xwb1989/sqlparser//: github_test.go
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/normalizer.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//normalizer.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/normalizer.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//normalizer.go 2017-10-18 18:06:33.000000000 -0700
@@ -19,9 +19,9 @@
import (
"fmt"
- "vitess.io/vitess/go/sqltypes"
+ "github.com/xwb1989/sqlparser/dependency/sqltypes"
- querypb "vitess.io/vitess/go/vt/proto/query"
+ "github.com/xwb1989/sqlparser/dependency/querypb"
)
// Normalize changes the statement to use bind values, and
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/normalizer_test.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//normalizer_test.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/normalizer_test.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//normalizer_test.go 2017-11-27 22:10:51.000000000 -0800
@@ -21,8 +21,8 @@
"reflect"
"testing"
- "vitess.io/vitess/go/sqltypes"
- querypb "vitess.io/vitess/go/vt/proto/query"
+ "github.com/xwb1989/sqlparser/dependency/querypb"
+ "github.com/xwb1989/sqlparser/dependency/sqltypes"
)
func TestNormalize(t *testing.T) {
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/parsed_query.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//parsed_query.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/parsed_query.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//parsed_query.go 2017-10-22 13:30:37.000000000 -0700
@@ -18,12 +18,10 @@
import (
"bytes"
- "encoding/json"
"fmt"
- "vitess.io/vitess/go/sqltypes"
-
- querypb "vitess.io/vitess/go/vt/proto/query"
+ "github.com/xwb1989/sqlparser/dependency/querypb"
+ "github.com/xwb1989/sqlparser/dependency/sqltypes"
)
// ParsedQuery represents a parsed query where
@@ -71,12 +69,6 @@
return buf.Bytes(), nil
}
-// MarshalJSON is a custom JSON marshaler for ParsedQuery.
-// Note that any queries longer that 512 bytes will be truncated.
-func (pq *ParsedQuery) MarshalJSON() ([]byte, error) {
- return json.Marshal(TruncateForUI(pq.Query))
-}
-
// EncodeValue encodes one bind variable value into the query.
func EncodeValue(buf *bytes.Buffer, value *querypb.BindVariable) {
if value.Type != querypb.Type_TUPLE {
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/parsed_query_test.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//parsed_query_test.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/parsed_query_test.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//parsed_query_test.go 2017-10-18 18:06:33.000000000 -0700
@@ -20,9 +20,9 @@
"reflect"
"testing"
- "vitess.io/vitess/go/sqltypes"
+ "github.com/xwb1989/sqlparser/dependency/sqltypes"
- querypb "vitess.io/vitess/go/vt/proto/query"
+ "github.com/xwb1989/sqlparser/dependency/querypb"
)
func TestNewParsedQuery(t *testing.T) {
Only in /Users/bramp/go/src/github.com/xwb1989/sqlparser//: patches
Only in /Users/bramp/go/src/github.com/xwb1989/sqlparser//: quick
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/redact_query.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//redact_query.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/redact_query.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//redact_query.go 2018-06-06 07:42:56.000000000 -0700
@@ -1,6 +1,6 @@
package sqlparser
-import querypb "vitess.io/vitess/go/vt/proto/query"
+import querypb "github.com/xwb1989/sqlparser/dependency/querypb"
// RedactSQLQuery returns a sql string with the params stripped out for display
func RedactSQLQuery(sql string) (string, error) {
Only in /Users/bramp/go/src/github.com/xwb1989/sqlparser//: tests
diff -u /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/token.go /Users/bramp/go/src/github.com/xwb1989/sqlparser//token.go
--- /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/token.go 2018-06-05 08:45:47.000000000 -0700
+++ /Users/bramp/go/src/github.com/xwb1989/sqlparser//token.go 2018-06-06 07:45:09.000000000 -0700
@@ -22,8 +22,8 @@
"fmt"
"io"
- "vitess.io/vitess/go/bytes2"
- "vitess.io/vitess/go/sqltypes"
+ "github.com/xwb1989/sqlparser/dependency/bytes2"
+ "github.com/xwb1989/sqlparser/dependency/sqltypes"
)
const (
Only in /Users/bramp/go/src/vitess.io/vitess/go//vt/sqlparser/: truncate_query.go
Only in /Users/bramp/go/src/github.com/xwb1989/sqlparser//: y.output