Skip to content

Fix EXPLAIN AST formatting for ShowCreateTableQuery, DetachQuery, and AttachQuery #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kyleconroy merged 1 commit into from
Dec 28, 2025
Merged

Fix EXPLAIN AST formatting for ShowCreateTableQuery, DetachQuery, and AttachQuery #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/explain/explain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func Node(sb *strings.Builder, node interface{}, depth int) {
case *ast.SetQuery:
explainSetQuery(sb, indent)
case *ast.SystemQuery:
explainSystemQuery(sb, indent)
explainSystemQuery(sb, n, indent)
case *ast.ExplainQuery:
explainExplainQuery(sb, n, indent, depth)
case *ast.ShowQuery:
Expand Down
28 changes: 23 additions & 5 deletions internal/explain/statements.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ func explainSetQuery(sb *strings.Builder, indent string) {
fmt.Fprintf(sb, "%sSet\n", indent)
}

func explainSystemQuery(sb *strings.Builder, indent string) {
func explainSystemQuery(sb *strings.Builder, n *ast.SystemQuery, indent string) {
fmt.Fprintf(sb, "%sSYSTEM query\n", indent)
}

Expand Down Expand Up @@ -442,10 +442,10 @@ func explainShowQuery(sb *strings.Builder, n *ast.ShowQuery, indent string) {
fmt.Fprintf(sb, "%s Identifier %s\n", indent, n.Database)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, n.From)
} else if n.From != "" {
fmt.Fprintf(sb, "%sShowCreateTableQuery %s (children 1)\n", indent, name)
fmt.Fprintf(sb, "%sShowCreateTableQuery %s (children 1)\n", indent, name)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, name)
} else if n.Database != "" {
fmt.Fprintf(sb, "%sShowCreateTableQuery %s (children 1)\n", indent, n.Database)
fmt.Fprintf(sb, "%sShowCreateTableQuery %s (children 1)\n", indent, n.Database)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, n.Database)
} else {
fmt.Fprintf(sb, "%sShow%s\n", indent, showType)
Expand Down Expand Up @@ -544,11 +544,29 @@ func explainParameter(sb *strings.Builder, n *ast.Parameter, indent string) {
}

func explainDetachQuery(sb *strings.Builder, n *ast.DetachQuery, indent string) {
fmt.Fprintf(sb, "%sDetachQuery\n", indent)
name := n.Table
if name == "" {
name = n.Database
}
if name != "" {
fmt.Fprintf(sb, "%sDetachQuery %s (children 1)\n", indent, name)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, name)
} else {
fmt.Fprintf(sb, "%sDetachQuery\n", indent)
}
}

func explainAttachQuery(sb *strings.Builder, n *ast.AttachQuery, indent string) {
fmt.Fprintf(sb, "%sAttachQuery\n", indent)
name := n.Table
if name == "" {
name = n.Database
}
if name != "" {
fmt.Fprintf(sb, "%sAttachQuery %s (children 1)\n", indent, name)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, name)
} else {
fmt.Fprintf(sb, "%sAttachQuery\n", indent)
}
}

func explainAlterQuery(sb *strings.Builder, n *ast.AlterQuery, indent string, depth int) {
Expand Down
12 changes: 1 addition & 11 deletions parser/testdata/00061_merge_tree_alter/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
{
"explain_todo": {
"stmt11": true,
"stmt16": true,
"stmt21": true,
"stmt25": true,
"stmt29": true,
"stmt33": true,
"stmt35": true,
"stmt37": true,
"stmt39": true,
"stmt41": true,
"stmt43": true,
"stmt47": true,
"stmt6": true
"stmt41": true
}
}
26 changes: 1 addition & 25 deletions parser/testdata/00062_replicated_merge_tree_alter_zookeeper_long/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,7 @@
{
"explain_todo": {
"stmt11": true,
"stmt16": true,
"stmt18": true,
"stmt23": true,
"stmt25": true,
"stmt30": true,
"stmt32": true,
"stmt37": true,
"stmt39": true,
"stmt43": true,
"stmt45": true,
"stmt49": true,
"stmt51": true,
"stmt53": true,
"stmt55": true,
"stmt57": true,
"stmt59": true,
"stmt61": true,
"stmt63": true,
"stmt65": true,
"stmt67": true,
"stmt69": true,
"stmt73": true,
"stmt75": true,
"stmt79": true,
"stmt81": true,
"stmt9": true
"stmt65": true
}
}
7 changes: 1 addition & 6 deletions parser/testdata/00065_loyalty_with_storage_join/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
{
"explain_todo": {
"stmt5": true,
"stmt6": true
}
}
{}
2 changes: 0 additions & 2 deletions parser/testdata/00116_storage_set/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"explain_todo": {
"stmt15": true,
"stmt16": true,
"stmt18": true,
"stmt9": true
}
Expand Down
2 changes: 1 addition & 1 deletion parser/testdata/00423_storage_log_single_thread/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"explain_todo":{"stmt11":true,"stmt12":true,"stmt15":true,"stmt16":true,"stmt5":true,"stmt6":true}}
{}
3 changes: 1 addition & 2 deletions parser/testdata/00508_materialized_view_to/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"explain_todo": {
"stmt3": true,
"stmt6": true
"stmt3": true
}
}
2 changes: 0 additions & 2 deletions parser/testdata/00515_enhanced_time_zones/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"explain_todo": {
"stmt44": true,
"stmt45": true,
"stmt47": true,
"stmt49": true
}
}
2 changes: 1 addition & 1 deletion parser/testdata/00599_create_view_with_subquery/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"explain_todo":{"stmt5":true,"stmt6":true,"stmt7":true}}
{}
2 changes: 1 addition & 1 deletion parser/testdata/00619_union_highlite/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"explain_todo":{"stmt4":true,"stmt5":true}}
{}
6 changes: 1 addition & 5 deletions parser/testdata/00625_arrays_in_nested/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{
"explain_todo": {
"stmt10": true,
"stmt12": true,
"stmt13": true,
"stmt5": true,
"stmt6": true
"stmt10": true
}
}
2 changes: 0 additions & 2 deletions parser/testdata/00626_replace_partition_from_table/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
"stmt44": true,
"stmt46": true,
"stmt50": true,
"stmt55": true,
"stmt56": true,
"stmt59": true,
"stmt60": true,
"stmt61": true,
Expand Down
6 changes: 0 additions & 6 deletions parser/testdata/00725_comment_columns_long/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
{
"explain_todo": {
"stmt11": true,
"stmt13": true,
"stmt14": true,
"stmt17": true,
"stmt18": true,
"stmt19": true,
"stmt20": true,
"stmt21": true,
"stmt3": true,
"stmt4": true,
"stmt7": true,
"stmt8": true,
"stmt9": true
}
}
2 changes: 1 addition & 1 deletion parser/testdata/00725_ipv4_ipv6_domains/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"explain_todo":{"stmt13":true,"stmt3":true}}
{}
1 change: 0 additions & 1 deletion parser/testdata/00754_alter_modify_order_by/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"stmt16": true,
"stmt17": true,
"stmt18": true,
"stmt26": true,
"stmt5": true
}
}
4 changes: 0 additions & 4 deletions parser/testdata/00754_alter_modify_order_by_replicated_zookeeper_long/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@
"stmt16": true,
"stmt18": true,
"stmt22": true,
"stmt26": true,
"stmt27": true,
"stmt28": true,
"stmt29": true,
"stmt30": true,
"stmt32": true,
"stmt6": true
}
}
2 changes: 0 additions & 2 deletions parser/testdata/00804_test_alter_compression_codecs/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
"stmt36": true,
"stmt41": true,
"stmt43": true,
"stmt44": true,
"stmt45": true,
"stmt7": true,
"stmt8": true
}
Expand Down
6 changes: 1 addition & 5 deletions parser/testdata/00804_test_custom_compression_codecs/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"explain_todo": {
"stmt11": true,
"stmt12": true,
"stmt22": true,
"stmt23": true,
"stmt24": true,
Expand All @@ -13,9 +11,7 @@
"stmt4": true,
"stmt49": true,
"stmt50": true,
"stmt51": true,
"stmt58": true,
"stmt69": true,
"stmt70": true
"stmt69": true
}
}
10 changes: 1 addition & 9 deletions parser/testdata/00804_test_custom_compression_codes_log_storages/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
{
"explain_todo": {
"stmt11": true,
"stmt12": true,
"stmt16": true,
"stmt17": true,
"stmt28": true,
"stmt29": true,
"stmt35": true,
"stmt36": true,
"stmt4": true,
"stmt40": true,
"stmt41": true,
"stmt5": true
"stmt40": true
}
}
5 changes: 1 addition & 4 deletions parser/testdata/00804_test_deflate_qpl_codec_compression/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"explain_todo": {
"stmt12": true,
"stmt13": true,
"stmt4": true,
"stmt5": true
"stmt4": true
}
}
5 changes: 1 addition & 4 deletions parser/testdata/00804_test_zstd_qat_codec_compression/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
{
"explain_todo": {
"stmt14": true,
"stmt15": true,
"stmt4": true,
"stmt5": true,
"stmt6": true,
"stmt7": true
"stmt6": true
}
}
7 changes: 1 addition & 6 deletions parser/testdata/00836_indices_alter/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
{
"explain_todo": {
"stmt17": true,
"stmt21": true,
"stmt22": true,
"stmt23": true,
"stmt30": true,
"stmt5": true,
"stmt6": true,
"stmt7": true,
"stmt8": true
"stmt7": true
}
}
12 changes: 0 additions & 12 deletions parser/testdata/00836_indices_alter_replicated_zookeeper_long/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,11 @@
"stmt10": true,
"stmt11": true,
"stmt12": true,
"stmt13": true,
"stmt14": true,
"stmt22": true,
"stmt23": true,
"stmt27": true,
"stmt28": true,
"stmt33": true,
"stmt34": true,
"stmt35": true,
"stmt36": true,
"stmt37": true,
"stmt42": true,
"stmt43": true,
"stmt46": true,
"stmt47": true,
"stmt51": true,
"stmt52": true,
"stmt9": true
}
}
2 changes: 1 addition & 1 deletion parser/testdata/00899_long_attach_memory_limit/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"explain_todo":{"stmt5":true,"stmt7":true}}
{}
3 changes: 0 additions & 3 deletions parser/testdata/00910_zookeeper_custom_compression_codecs_replicated_long/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@
"explain_todo": {
"stmt10": true,
"stmt15": true,
"stmt16": true,
"stmt17": true,
"stmt25": true,
"stmt26": true,
"stmt28": true,
"stmt32": true,
"stmt40": true,
"stmt42": true,
"stmt48": true,
"stmt49": true,
"stmt5": true,
"stmt56": true,
"stmt6": true
Expand Down
4 changes: 1 addition & 3 deletions parser/testdata/00916_create_or_replace_view/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
{
"explain_todo": {
"stmt2": true,
"stmt3": true,
"stmt5": true
"stmt2": true
}
}
20 changes: 0 additions & 20 deletions parser/testdata/00926_adaptive_index_granularity_merge_tree/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,43 +2,23 @@
"explain_todo": {
"stmt10": true,
"stmt101": true,
"stmt102": true,
"stmt103": true,
"stmt106": true,
"stmt107": true,
"stmt109": true,
"stmt116": true,
"stmt118": true,
"stmt119": true,
"stmt122": true,
"stmt129": true,
"stmt132": true,
"stmt133": true,
"stmt135": true,
"stmt138": true,
"stmt140": true,
"stmt141": true,
"stmt145": true,
"stmt17": true,
"stmt21": true,
"stmt28": true,
"stmt29": true,
"stmt30": true,
"stmt33": true,
"stmt34": true,
"stmt36": true,
"stmt43": true,
"stmt45": true,
"stmt46": true,
"stmt49": true,
"stmt56": true,
"stmt59": true,
"stmt6": true,
"stmt60": true,
"stmt62": true,
"stmt65": true,
"stmt67": true,
"stmt68": true,
"stmt72": true,
"stmt79": true,
"stmt83": true,
Expand Down
Loading