Skip to content

Commit 838f6b4

Browse files
committed
Include type in QueryParameter EXPLAIN output
Format QueryParameter with type as Name:Type to match ClickHouse output. For example: QueryParameter filter:FixedString(2) Fixes many parameterized view tests.
1 parent 6751071 commit 838f6b4

File tree

19 files changed

+22
-82
lines changed

19 files changed

+22
-82
lines changed

internal/explain/statements.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,11 @@ func explainNameTypePair(sb *strings.Builder, n *ast.NameTypePair, indent string
10571057

10581058
func explainParameter(sb *strings.Builder, n *ast.Parameter, indent string) {
10591059
if n.Name != "" {
1060-
fmt.Fprintf(sb, "%sQueryParameter %s\n", indent, n.Name)
1060+
if n.Type != nil {
1061+
fmt.Fprintf(sb, "%sQueryParameter %s:%s\n", indent, n.Name, FormatDataType(n.Type))
1062+
} else {
1063+
fmt.Fprintf(sb, "%sQueryParameter %s\n", indent, n.Name)
1064+
}
10611065
} else {
10621066
fmt.Fprintf(sb, "%sQueryParameter\n", indent)
10631067
}
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1 @@
1-
{
2-
"explain_todo": {
3-
"stmt24": true,
4-
"stmt57": true,
5-
"stmt90": true
6-
}
7-
}
1+
{}
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
{
2-
"explain_todo": {
3-
"stmt12": true
4-
}
5-
}
1+
{}
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
{
2-
"explain_todo": {
3-
"stmt13": true
4-
}
5-
}
1+
{}
Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1 @@
1-
{
2-
"explain_todo": {
3-
"stmt113": true,
4-
"stmt144": true,
5-
"stmt200": true,
6-
"stmt21": true,
7-
"stmt232": true,
8-
"stmt263": true,
9-
"stmt52": true,
10-
"stmt83": true
11-
}
12-
}
1+
{}
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
{
2-
"explain_todo": {
3-
"stmt14": true
4-
}
5-
}
1+
{}
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
{
2-
"explain_todo": {
3-
"stmt3": true
4-
}
5-
}
1+
{}
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
{
2-
"explain_todo": {
3-
"stmt2": true
4-
}
5-
}
1+
{}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"explain_todo":{"stmt5":true}}
1+
{}
Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1 @@
1-
{
2-
"explain_todo": {
3-
"stmt27": true,
4-
"stmt43": true,
5-
"stmt53": true,
6-
"stmt65": true,
7-
"stmt9": true
8-
}
9-
}
1+
{}

0 commit comments

Comments
 (0)