Skip to content

Commit 8ff49c5

Browse files
otanotan
committed
fix bug with pretty formatting builtins
1 parent 7e87b69 commit 8ff49c5

File tree

5 files changed

+31
-22
lines changed

5 files changed

+31
-22
lines changed

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/stretchr/testify v1.7.0
2323
github.com/twpayne/go-geom v1.4.1
2424
golang.org/x/text v0.3.7
25-
golang.org/x/tools v0.1.12
25+
golang.org/x/tools v0.2.0
2626
)
2727

2828
require (
@@ -37,8 +37,8 @@ require (
3737
github.com/pmezard/go-difflib v1.0.0 // indirect
3838
github.com/rogpeppe/go-internal v1.8.1 // indirect
3939
github.com/twpayne/go-kml v1.5.2 // indirect
40-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
41-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
40+
golang.org/x/mod v0.6.0 // indirect
41+
golang.org/x/sys v0.1.0 // indirect
4242
google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84 // indirect
4343
google.golang.org/grpc v1.38.0 // indirect
4444
google.golang.org/protobuf v1.26.0 // indirect

‎go.sum

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -339,8 +339,8 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
339339
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
340340
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
341341
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
342-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
343-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
342+
golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
343+
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
344344
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
345345
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
346346
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -362,7 +362,7 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
362362
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
363363
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
364364
golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
365-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
365+
golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
366366
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
367367
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
368368
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -403,8 +403,8 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
403403
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
404404
golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
405405
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
406-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s=
407-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
406+
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
407+
golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
408408
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
409409
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
410410
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -429,8 +429,8 @@ golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapK
429429
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
430430
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
431431
golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
432-
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
433-
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
432+
golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
433+
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
434434
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
435435
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
436436
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎parser_test.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@ import (
44
"testing"
55

66
"github.com/cockroachdb/cockroachdb-parser/pkg/sql/parser"
7+
"github.com/cockroachdb/cockroachdb-parser/pkg/sql/sem/tree"
78
"github.com/stretchr/testify/require"
89
)
910

1011
func TestParser(t *testing.T) {
11-
_, err := parser.Parse("CREATE TABLE t (a TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP)")
12+
p, err := parser.ParseOne("CREATE TABLE t (a TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP)")
1213
require.NoError(t, err)
14+
f := tree.DefaultPrettyCfg()
15+
f.Pretty(p.AST)
1316
}

‎patches/0003-builtin-fix.patch renamed to ‎patches/0003-use-function-name.patch

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
From 54d336fe9bb80f56dd9ac4b5ef8a306b25fd28ec Mon Sep 17 00:00:00 2001
1+
From 486ec4ba7b334a1e549fa90cb00efcacdb685983 Mon Sep 17 00:00:00 2001
22
From: Oliver Tan <[email protected]>
3-
Date: Mon, 15 May 2023 10:51:31 +1000
4-
Subject: [PATCH] temp
3+
Date: Mon, 15 May 2023 13:31:05 +1000
4+
Subject: [PATCH] use-function-name
55

66
---
7-
pkg/sql/sem/tree/function_name.go | 4 ++--
8-
1 file changed, 2 insertions(+), 2 deletions(-)
7+
pkg/sql/sem/tree/function_name.go | 7 +++++--
8+
1 file changed, 5 insertions(+), 2 deletions(-)
99

1010
diff --git a/pkg/sql/sem/tree/function_name.go b/pkg/sql/sem/tree/function_name.go
11-
index 3b0ac48..fd524d3 100644
11+
index 3b0ac48..5e29921 100644
1212
--- a/pkg/sql/sem/tree/function_name.go
1313
+++ b/pkg/sql/sem/tree/function_name.go
1414
@@ -19,7 +19,6 @@ import (
@@ -19,13 +19,16 @@ index 3b0ac48..fd524d3 100644
1919
"github.com/lib/pq/oid"
2020
)
2121

22-
@@ -146,7 +145,8 @@ func (ref *ResolvableFunctionReference) Resolve(
22+
@@ -146,7 +145,11 @@ func (ref *ResolvableFunctionReference) Resolve(
2323
func WrapFunction(n string) ResolvableFunctionReference {
2424
fd, ok := FunDefs[n]
2525
if !ok {
2626
- panic(errors.AssertionFailedf("function %s() not defined", redact.Safe(n)))
27-
+ // Make every builtin parse.
28-
+ return ResolvableFunctionReference{ReferenceByName: &UnresolvedObjectName{NumParts: 1, Parts: [3]string{n, "", ""}}}
27+
+ return ResolvableFunctionReference{
28+
+ FunctionReference: &FunctionDefinition{
29+
+ Name: n,
30+
+ },
31+
+ }
2932
}
3033
return ResolvableFunctionReference{FunctionReference: fd}
3134
}

‎pkg/sql/sem/tree/function_name.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,11 @@ func (ref *ResolvableFunctionReference) Resolve(
145145
func WrapFunction(n string) ResolvableFunctionReference {
146146
fd, ok := FunDefs[n]
147147
if !ok {
148-
// Make every builtin parse.
149-
return ResolvableFunctionReference{ReferenceByName: &UnresolvedObjectName{NumParts: 1, Parts: [3]string{n, "", ""}}}
148+
return ResolvableFunctionReference{
149+
FunctionReference: &FunctionDefinition{
150+
Name: n,
151+
},
152+
}
150153
}
151154
return ResolvableFunctionReference{FunctionReference: fd}
152155
}

0 commit comments

Comments
 (0)