Fix parser tests after ClickHouse 25.8 explain file updates

internal/explain/expressions.go

@@ -586,12 +586,18 @@ func explainWithElement(sb *strings.Builder, n *ast.WithElement, indent string,
 			Node(sb, e.Right, depth+2)
 		}
 	case *ast.Subquery:
-		if n.Name != "" {
-			fmt.Fprintf(sb, "%sSubquery (alias %s) (children %d)\n", indent, n.Name, 1)
+		// Check if this is "(subquery) AS alias" syntax vs "name AS (subquery)" syntax
+		if e.Alias != "" {
+			// "(subquery) AS alias" syntax: output Subquery with alias directly
+			fmt.Fprintf(sb, "%sSubquery (alias %s) (children 1)\n", indent, e.Alias)
+			Node(sb, e.Query, depth+1)
 		} else {
-			fmt.Fprintf(sb, "%sSubquery (children %d)\n", indent, 1)
+			// "name AS (subquery)" syntax: output WithElement wrapping the Subquery
+			// The alias/name is not shown in the EXPLAIN AST output
+			fmt.Fprintf(sb, "%sWithElement (children 1)\n", indent)
+			fmt.Fprintf(sb, "%s Subquery (children 1)\n", indent)
+			Node(sb, e.Query, depth+2)
 		}
-		Node(sb, e.Query, depth+1)
 	case *ast.CastExpr:
 		explainCastExprWithAlias(sb, e, n.Name, indent, depth)
 	default:

parser/parser.go

@@ -654,22 +654,25 @@ func (p *Parser) parseWithClause() []ast.Expression {
 			}
 		} else if p.currentIs(token.LPAREN) {
 			// Subquery: (SELECT ...) AS name
+			// In this syntax, the alias goes on the Subquery, not on WithElement
 			p.nextToken()
 			subquery := p.parseSelectWithUnion()
 			if !p.expect(token.RPAREN) {
 				return nil
 			}
-			elem.Query = &ast.Subquery{Query: subquery}
+			sq := &ast.Subquery{Query: subquery}
 
 			if !p.expect(token.AS) {
 				return nil
 			}
 
 			// Alias can be IDENT or certain keywords (VALUES, KEY, etc.)
+			// Set alias on the Subquery for "(subquery) AS name" syntax
 			if p.currentIs(token.IDENT) || p.current.Token.IsKeyword() {
-				elem.Name = p.current.Value
+				sq.Alias = p.current.Value
 				p.nextToken()
 			}
+			elem.Query = sq
 		} else {
 			// Scalar WITH: expr AS name (ClickHouse style)
 			// Examples: WITH 1 AS x, WITH 'hello' AS s, WITH func() AS f

parser/testdata/00176_distinct_limit_by_limit_bug_43377/metadata.json

@@ -1 +1,5 @@
-{}
+{
+  "explain_todo": {
+    "stmt1": true
+  }
+}

parser/testdata/00306_insert_values_and_expressions/metadata.json

@@ -1 +1,5 @@
-{}
+{
+  "explain_todo": {
+    "stmt7": true
+  }
+}

parser/testdata/00361_shared_array_offsets_and_squash_blocks/metadata.json

@@ -1 +1,5 @@
-{}
+{
+  "explain_todo": {
+    "stmt5": true
+  }
+}

parser/testdata/00392_enum_nested_alter/metadata.json

@@ -4,9 +4,14 @@
     "stmt13": true,
     "stmt15": true,
     "stmt17": true,
+    "stmt21": true,
     "stmt23": true,
+    "stmt24": true,
+    "stmt29": true,
     "stmt31": true,
+    "stmt4": true,
     "stmt6": true,
+    "stmt7": true,
     "stmt9": true
   }
 }

parser/testdata/00531_aggregate_over_nullable/metadata.json

@@ -1 +1,7 @@
-{}
+{
+  "explain_todo": {
+    "stmt4": true,
+    "stmt5": true,
+    "stmt6": true
+  }
+}

parser/testdata/00577_replacing_merge_tree_vertical_merge/metadata.json

@@ -1,5 +1,8 @@
 {
   "explain_todo": {
+    "stmt12": true,
+    "stmt13": true,
+    "stmt14": true,
     "stmt15": true,
     "stmt16": true,
     "stmt7": true

parser/testdata/00592_union_all_different_aliases/metadata.json

@@ -1 +1,5 @@
-{}
+{
+  "explain_todo": {
+    "stmt1": true
+  }
+}

parser/testdata/00605_intersections_aggregate_functions/metadata.json

@@ -1 +1,5 @@
-{}
+{
+  "explain_todo": {
+    "stmt3": true
+  }
+}

parser/testdata/00615_nullable_alter_optimize/metadata.json

@@ -1 +1,6 @@
-{}
+{
+  "explain_todo": {
+    "stmt4": true,
+    "stmt7": true
+  }
+}

parser/testdata/00671_max_intersections/metadata.json

@@ -1 +1,6 @@
-{}
+{
+  "explain_todo": {
+    "stmt5": true,
+    "stmt6": true
+  }
+}

parser/testdata/00700_decimal_complex_types/metadata.json

@@ -1 +1,5 @@
-{}
+{
+  "explain_todo": {
+    "stmt3": true
+  }
+}

parser/testdata/00927_asof_joins/metadata.json

@@ -1 +1,8 @@
-{}
+{
+  "explain_todo": {
+    "stmt4": true,
+    "stmt5": true,
+    "stmt7": true,
+    "stmt8": true
+  }
+}

parser/testdata/00950_test_double_delta_codec/metadata.json

@@ -2,6 +2,7 @@
   "explain_todo": {
     "stmt2": true,
     "stmt28": true,
+    "stmt3": true,
     "stmt4": true,
     "stmt5": true,
     "stmt6": true

parser/testdata/00950_test_double_delta_codec_types/metadata.json

@@ -3,6 +3,7 @@
     "stmt10": true,
     "stmt14": true,
     "stmt15": true,
+    "stmt17": true,
     "stmt2": true,
     "stmt3": true,
     "stmt4": true,

parser/testdata/00983_summing_merge_tree_not_an_identifier/metadata.json

@@ -1 +1,5 @@
-{}
+{
+  "explain_todo": {
+    "stmt1": true
+  }
+}

parser/testdata/01018_ddl_dictionaries_create/metadata.json

@@ -22,6 +22,7 @@
     "stmt51": true,
     "stmt52": true,
     "stmt53": true,
-    "stmt6": true
+    "stmt6": true,
+    "stmt7": true
   }
 }

parser/testdata/01054_cache_dictionary_overflow_cell/metadata.json

@@ -1,6 +1,26 @@
 {
   "explain_todo": {
+    "stmt10": true,
+    "stmt11": true,
+    "stmt12": true,
+    "stmt13": true,
+    "stmt14": true,
+    "stmt15": true,
+    "stmt16": true,
+    "stmt17": true,
+    "stmt18": true,
+    "stmt19": true,
+    "stmt20": true,
+    "stmt21": true,
+    "stmt22": true,
+    "stmt23": true,
     "stmt25": true,
-    "stmt3": true
+    "stmt3": true,
+    "stmt4": true,
+    "stmt5": true,
+    "stmt6": true,
+    "stmt7": true,
+    "stmt8": true,
+    "stmt9": true
   }
 }

parser/testdata/01069_database_memory/metadata.json

@@ -1,6 +1,8 @@
 {
   "explain_todo": {
     "stmt4": true,
-    "stmt5": true
+    "stmt5": true,
+    "stmt6": true,
+    "stmt7": true
   }
 }

parser/testdata/01104_distributed_numbers_test/metadata.json

@@ -1 +1,5 @@
-{}
+{
+  "explain_todo": {
+    "stmt1": true
+  }
+}

parser/testdata/01110_dictionary_layout_without_arguments/metadata.json

@@ -1,6 +1,7 @@
 {
   "explain_todo": {
     "stmt3": true,
+    "stmt4": true,
     "stmt5": true,
     "stmt7": true,
     "stmt8": true,

parser/testdata/01115_prewhere_array_join/metadata.json

@@ -1 +1,5 @@
-{}
+{
+  "explain_todo": {
+    "stmt8": true
+  }
+}

parser/testdata/01155_rename_move_materialized_view/metadata.json

@@ -6,6 +6,7 @@
     "stmt17": true,
     "stmt20": true,
     "stmt34": true,
+    "stmt41": true,
     "stmt44": true,
     "stmt47": true,
     "stmt52": true,

parser/testdata/01191_rename_dictionary/metadata.json

@@ -11,6 +11,7 @@
     "stmt3": true,
     "stmt4": true,
     "stmt5": true,
+    "stmt6": true,
     "stmt9": true
   }
 }

parser/testdata/01251_dict_is_in_infinite_loop/metadata.json

@@ -3,6 +3,7 @@
     "stmt22": true,
     "stmt37": true,
     "stmt4": true,
+    "stmt5": true,
     "stmt7": true
   }
 }

parser/testdata/01257_dictionary_mismatch_types/metadata.json

@@ -1,7 +1,9 @@
 {
   "explain_todo": {
+    "stmt11": true,
     "stmt12": true,
     "stmt4": true,
+    "stmt5": true,
     "stmt6": true,
     "stmt9": true
   }

parser/testdata/01268_dictionary_direct_layout/metadata.json

@@ -1,10 +1,21 @@
 {
   "explain_todo": {
+    "stmt10": true,
+    "stmt11": true,
+    "stmt12": true,
+    "stmt13": true,
     "stmt14": true,
+    "stmt15": true,
+    "stmt16": true,
+    "stmt17": true,
+    "stmt18": true,
+    "stmt19": true,
     "stmt25": true,
     "stmt26": true,
     "stmt27": true,
     "stmt6": true,
-    "stmt8": true
+    "stmt7": true,
+    "stmt8": true,
+    "stmt9": true
   }
 }

parser/testdata/01292_create_user/metadata.json

@@ -81,6 +81,7 @@
     "stmt21": true,
     "stmt219": true,
     "stmt22": true,
+    "stmt221": true,
     "stmt226": true,
     "stmt23": true,
     "stmt234": true,

parser/testdata/01293_create_role/metadata.json

@@ -1,5 +1,6 @@
 {
   "explain_todo": {
+    "stmt1": true,
     "stmt11": true,
     "stmt12": true,
     "stmt13": true,

parser/testdata/01294_create_settings_profile/metadata.json

@@ -1,5 +1,6 @@
 {
   "explain_todo": {
+    "stmt1": true,
     "stmt10": true,
     "stmt100": true,
     "stmt101": true,

parser/testdata/01295_create_row_policy/metadata.json

@@ -1,5 +1,6 @@
 {
   "explain_todo": {
+    "stmt1": true,
     "stmt11": true,
     "stmt12": true,
     "stmt13": true,

parser/testdata/01296_create_row_policy_in_current_database/metadata.json

@@ -1,5 +1,6 @@
 {
   "explain_todo": {
+    "stmt1": true,
     "stmt10": true,
     "stmt11": true,
     "stmt12": true,

parser/testdata/01323_add_scalars_in_time/metadata.json

@@ -1 +1,5 @@
-{}
+{
+  "explain_todo": {
+    "stmt9": true
+  }
+}

parser/testdata/01346_array_join_mrxotey/metadata.json

@@ -1 +1,5 @@
-{}
+{
+  "explain_todo": {
+    "stmt3": true
+  }
+}

parser/testdata/01358_constexpr_constraint/metadata.json

@@ -1,5 +1,6 @@
 {
   "explain_todo": {
+    "stmt1": true,
     "stmt4": true
   }
 }

parser/testdata/01376_GROUP_BY_injective_elimination_dictGet/metadata.json

@@ -2,6 +2,7 @@
   "explain_todo": {
     "stmt11": true,
     "stmt6": true,
+    "stmt7": true,
     "stmt8": true
   }
 }

parser/testdata/01383_remote_ambiguous_column_shard/metadata.json

@@ -1 +1,8 @@
-{"explain_todo":{"stmt3":true,"stmt4":true}}
+{
+  "explain_todo": {
+    "stmt3": true,
+    "stmt4": true,
+    "stmt5": true,
+    "stmt6": true
+  }
+}

parser/testdata/01418_custom_settings/metadata.json

@@ -1,5 +1,6 @@
 {
   "explain_todo": {
+    "stmt1": true,
     "stmt41": true,
     "stmt42": true,
     "stmt43": true,

parser/testdata/01457_create_as_table_function_structure/metadata.json

@@ -3,6 +3,8 @@
     "stmt11": true,
     "stmt14": true,
     "stmt15": true,
+    "stmt18": true,
+    "stmt21": true,
     "stmt5": true,
     "stmt7": true,
     "stmt9": true

parser/testdata/01499_json_named_tuples/metadata.json

@@ -1,5 +1,6 @@
 {
   "explain_todo": {
+    "stmt1": true,
     "stmt2": true
   }
 }