Skip to content

Add database-qualified name support in EXPLAIN AST output #103

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 30, 2025
Merged

Add database-qualified name support in EXPLAIN AST output #103

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
42 changes: 38 additions & 4 deletions internal/explain/statements.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ func explainInsertQuery(sb *strings.Builder, n *ast.InsertQuery, indent string,
children++
} else if n.Table != "" {
children++ // Table identifier
if n.Database != "" {
children++ // Database identifier (separate from table)
}
}
if len(n.Columns) > 0 {
children++ // Column list
Expand All @@ -45,11 +48,13 @@ func explainInsertQuery(sb *strings.Builder, n *ast.InsertQuery, indent string,
if n.Function != nil {
Node(sb, n.Function, depth+1)
} else if n.Table != "" {
name := n.Table
if n.Database != "" {
name = n.Database + "." + n.Table
// Database-qualified: output separate identifiers
fmt.Fprintf(sb, "%s Identifier %s\n", indent, n.Database)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, n.Table)
} else {
fmt.Fprintf(sb, "%s Identifier %s\n", indent, n.Table)
}
fmt.Fprintf(sb, "%s Identifier %s\n", indent, name)
}

// Column list
Expand Down Expand Up @@ -125,8 +130,13 @@ func explainCreateQuery(sb *strings.Builder, n *ast.CreateQuery, indent string,
if n.CreateDatabase {
name = n.Database
}
// Check for database-qualified table/view name
hasDatabase := n.Database != "" && !n.CreateDatabase && (n.Table != "" || n.View != "")
// Count children: name + columns + engine/storage
children := 1 // name identifier
if hasDatabase {
children++ // additional identifier for database
}
if len(n.Columns) > 0 || len(n.Indexes) > 0 || len(n.Constraints) > 0 {
children++
}
Expand All @@ -142,10 +152,16 @@ func explainCreateQuery(sb *strings.Builder, n *ast.CreateQuery, indent string,
// ClickHouse adds an extra space before (children N) for CREATE DATABASE
if n.CreateDatabase {
fmt.Fprintf(sb, "%sCreateQuery %s (children %d)\n", indent, name, children)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, name)
} else if hasDatabase {
// Database-qualified: CreateQuery db table (children N)
fmt.Fprintf(sb, "%sCreateQuery %s %s (children %d)\n", indent, n.Database, name, children)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, n.Database)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, name)
} else {
fmt.Fprintf(sb, "%sCreateQuery %s (children %d)\n", indent, name, children)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, name)
}
fmt.Fprintf(sb, "%s Identifier %s\n", indent, name)
if len(n.Columns) > 0 || len(n.Indexes) > 0 || len(n.Constraints) > 0 {
childrenCount := 0
if len(n.Columns) > 0 {
Expand Down Expand Up @@ -690,6 +706,15 @@ func explainParameter(sb *strings.Builder, n *ast.Parameter, indent string) {
}

func explainDetachQuery(sb *strings.Builder, n *ast.DetachQuery, indent string) {
// Check for database-qualified table name
if n.Database != "" && n.Table != "" {
// Database-qualified: DetachQuery db table (children 2)
fmt.Fprintf(sb, "%sDetachQuery %s %s (children 2)\n", indent, n.Database, n.Table)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, n.Database)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, n.Table)
return
}
// Single name (table only or database only for DETACH DATABASE)
name := n.Table
if name == "" {
name = n.Database
Expand All @@ -703,6 +728,15 @@ func explainDetachQuery(sb *strings.Builder, n *ast.DetachQuery, indent string)
}

func explainAttachQuery(sb *strings.Builder, n *ast.AttachQuery, indent string) {
// Check for database-qualified table name
if n.Database != "" && n.Table != "" {
// Database-qualified: AttachQuery db table (children 2)
fmt.Fprintf(sb, "%sAttachQuery %s %s (children 2)\n", indent, n.Database, n.Table)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, n.Database)
fmt.Fprintf(sb, "%s Identifier %s\n", indent, n.Table)
return
}
// Single name (table only or database only for ATTACH DATABASE)
name := n.Table
if name == "" {
name = n.Database
Expand Down
48 changes: 1 addition & 47 deletions parser/testdata/01601_detach_permanently/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,69 +1,23 @@
{
"explain_todo": {
"stmt100": true,
"stmt102": true,
"stmt104": true,
"stmt105": true,
"stmt108": true,
"stmt11": true,
"stmt112": true,
"stmt114": true,
"stmt115": true,
"stmt117": true,
"stmt118": true,
"stmt12": true,
"stmt120": true,
"stmt121": true,
"stmt122": true,
"stmt125": true,
"stmt126": true,
"stmt127": true,
"stmt130": true,
"stmt132": true,
"stmt134": true,
"stmt137": true,
"stmt15": true,
"stmt18": true,
"stmt20": true,
"stmt22": true,
"stmt24": true,
"stmt26": true,
"stmt28": true,
"stmt29": true,
"stmt30": true,
"stmt34": true,
"stmt35": true,
"stmt36": true,
"stmt39": true,
"stmt41": true,
"stmt43": true,
"stmt5": true,
"stmt51": true,
"stmt52": true,
"stmt53": true,
"stmt55": true,
"stmt57": true,
"stmt58": true,
"stmt6": true,
"stmt61": true,
"stmt65": true,
"stmt67": true,
"stmt68": true,
"stmt7": true,
"stmt70": true,
"stmt71": true,
"stmt73": true,
"stmt74": true,
"stmt75": true,
"stmt78": true,
"stmt79": true,
"stmt80": true,
"stmt83": true,
"stmt85": true,
"stmt87": true,
"stmt9": true,
"stmt90": true,
"stmt98": true,
"stmt99": true
"stmt80": true
}
}