Handle SETTINGS/COMMENT order in CREATE TABLE explain output

When COMMENT comes before SETTINGS in a CREATE TABLE statement, SETTINGS
should be output at the CreateQuery level (outside Storage definition).
When SETTINGS comes before COMMENT, it stays inside Storage definition.

Added SettingsBeforeComment field to track the order in the AST.

Fixes:
- 03234_enable_secure_identifiers stmt11, stmt14

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: kyleconroy

ast/ast.go

@@ -291,7 +291,8 @@ type CreateQuery struct {
 	PrimaryKey          []Expression         `json:"primary_key,omitempty"`
 	SampleBy         Expression           `json:"sample_by,omitempty"`
 	TTL              *TTLClause           `json:"ttl,omitempty"`
-	Settings         []*SettingExpr       `json:"settings,omitempty"`
+	Settings             []*SettingExpr       `json:"settings,omitempty"`
+	SettingsBeforeComment bool                `json:"settings_before_comment,omitempty"` // True if SETTINGS comes before COMMENT
 	AsSelect         Statement            `json:"as_select,omitempty"`
 	AsTableFunction  Expression           `json:"as_table_function,omitempty"` // AS table_function(...) in CREATE TABLE
 	CloneAs          string               `json:"clone_as,omitempty"`          // CLONE AS source_table in CREATE TABLE

internal/explain/statements.go

@@ -215,10 +215,17 @@ func explainCreateQuery(sb *strings.Builder, n *ast.CreateQuery, indent string,
 	if len(n.Columns) > 0 || len(n.Indexes) > 0 || len(n.Projections) > 0 || len(n.Constraints) > 0 {
 		children++
 	}
-	hasStorageChild := n.Engine != nil || len(n.OrderBy) > 0 || len(n.PrimaryKey) > 0 || n.PartitionBy != nil || n.SampleBy != nil || n.TTL != nil || len(n.Settings) > 0 || len(n.ColumnsPrimaryKey) > 0 || hasColumnPrimaryKey
+	// When SETTINGS comes after COMMENT (not before), Settings goes outside Storage definition
+	// SettingsBeforeComment=true means SETTINGS came first, so it stays in Storage
+	settingsInStorage := len(n.Settings) > 0 && (n.Comment == "" || n.SettingsBeforeComment)
+	hasStorageChild := n.Engine != nil || len(n.OrderBy) > 0 || len(n.PrimaryKey) > 0 || n.PartitionBy != nil || n.SampleBy != nil || n.TTL != nil || settingsInStorage || len(n.ColumnsPrimaryKey) > 0 || hasColumnPrimaryKey
 	if hasStorageChild {
 		children++
 	}
+	// When SETTINGS comes after COMMENT, Settings is a separate child of CreateQuery
+	if n.Comment != "" && len(n.Settings) > 0 && !n.SettingsBeforeComment {
+		children++
+	}
 	// For materialized views with TO clause but no storage, count ViewTargets as a child
 	if n.Materialized && n.To != "" && !hasStorageChild {
 		children++ // ViewTargets
@@ -347,7 +354,7 @@ func explainCreateQuery(sb *strings.Builder, n *ast.CreateQuery, indent string,
 			inCreateQueryContext = false
 		}
 	}
-	hasStorage := n.Engine != nil || len(n.OrderBy) > 0 || len(n.PrimaryKey) > 0 || n.PartitionBy != nil || n.SampleBy != nil || n.TTL != nil || len(n.Settings) > 0 || len(n.ColumnsPrimaryKey) > 0 || hasColumnPrimaryKey
+	hasStorage := n.Engine != nil || len(n.OrderBy) > 0 || len(n.PrimaryKey) > 0 || n.PartitionBy != nil || n.SampleBy != nil || n.TTL != nil || settingsInStorage || len(n.ColumnsPrimaryKey) > 0 || hasColumnPrimaryKey
 	if hasStorage {
 		storageChildren := 0
 		if n.Engine != nil {
@@ -369,7 +376,7 @@ func explainCreateQuery(sb *strings.Builder, n *ast.CreateQuery, indent string,
 		if n.TTL != nil {
 			storageChildren++
 		}
-		if len(n.Settings) > 0 {
+		if settingsInStorage {
 			storageChildren++
 		}
 		// For materialized views, wrap storage definition in ViewTargets
@@ -514,7 +521,7 @@ func explainCreateQuery(sb *strings.Builder, n *ast.CreateQuery, indent string,
 				}
 			}
 		}
-		if len(n.Settings) > 0 {
+		if settingsInStorage {
 			fmt.Fprintf(sb, "%s Set\n", storageIndent)
 		}
 	} else if n.Materialized && n.To != "" {
@@ -547,6 +554,10 @@ func explainCreateQuery(sb *strings.Builder, n *ast.CreateQuery, indent string,
 	if n.Comment != "" {
 		fmt.Fprintf(sb, "%s Literal \\'%s\\'\n", indent, escapeStringLiteral(n.Comment))
 	}
+	// Output Settings at CreateQuery level when SETTINGS comes after COMMENT
+	if n.Comment != "" && len(n.Settings) > 0 && !n.SettingsBeforeComment {
+		fmt.Fprintf(sb, "%s Set\n", indent)
+	}
 }
 
 func explainDropQuery(sb *strings.Builder, n *ast.DropQuery, indent string, depth int) {

parser/parser.go

@@ -2687,6 +2687,10 @@ func (p *Parser) parseTableOptions(create *ast.CreateQuery) {
 				}
 			}
 		case p.currentIs(token.SETTINGS):
+			// Track if SETTINGS comes before COMMENT
+			if create.Comment == "" && len(create.Settings) == 0 {
+				create.SettingsBeforeComment = true
+			}
 			p.nextToken()
 			create.Settings = p.parseSettingsList()
 		case p.currentIs(token.COMMENT):
@@ -2695,6 +2699,10 @@ func (p *Parser) parseTableOptions(create *ast.CreateQuery) {
 				create.Comment = p.current.Value
 				p.nextToken()
 			}
+			// If we see COMMENT but Settings wasn't set yet, clear the flag
+			if len(create.Settings) == 0 {
+				create.SettingsBeforeComment = false
+			}
 		default:
 			return
 		}

parser/testdata/03234_enable_secure_identifiers/metadata.json

@@ -1,6 +1 @@
-{
-  "explain_todo": {
-    "stmt11": true,
-    "stmt14": true
-  }
-}
+{}