Add CREATE DATABASE WITH options and enable 2 tests

- Add IdentifierDatabaseOption and CreateDatabaseOption types
- Parse WITH LEDGER and CATALOG_COLLATION options for CREATE DATABASE
- Add JSON marshaling for new database options
- Only output AttachMode when options are present
- Enable CreateDatabaseTests160 and Baselines160_CreateDatabaseTests160

Author: claude

ast/alter_database_set_statement.go

@@ -44,6 +44,26 @@ type DelayedDurabilityDatabaseOption struct {
 func (d *DelayedDurabilityDatabaseOption) node()           {}
 func (d *DelayedDurabilityDatabaseOption) databaseOption() {}
 
+// IdentifierDatabaseOption represents a database option with an identifier value
+type IdentifierDatabaseOption struct {
+	OptionKind string      `json:"OptionKind,omitempty"` // "CatalogCollation"
+	Value      *Identifier `json:"Value,omitempty"`
+}
+
+func (i *IdentifierDatabaseOption) node()           {}
+func (i *IdentifierDatabaseOption) databaseOption() {}
+
+// CreateDatabaseOption is an interface for CREATE DATABASE options (can be DatabaseOption)
+type CreateDatabaseOption interface {
+	node()
+	createDatabaseOption()
+}
+
+// Make existing database options implement CreateDatabaseOption
+func (o *OnOffDatabaseOption) createDatabaseOption()            {}
+func (i *IdentifierDatabaseOption) createDatabaseOption()       {}
+func (d *DelayedDurabilityDatabaseOption) createDatabaseOption() {}
+
 // AlterDatabaseAddFileStatement represents ALTER DATABASE ... ADD FILE statement
 type AlterDatabaseAddFileStatement struct {
 	DatabaseName *Identifier

ast/create_simple_statements.go

@@ -2,7 +2,9 @@ package ast
 
 // CreateDatabaseStatement represents a CREATE DATABASE statement.
 type CreateDatabaseStatement struct {
-	DatabaseName *Identifier `json:"DatabaseName,omitempty"`
+	DatabaseName *Identifier            `json:"DatabaseName,omitempty"`
+	Options      []CreateDatabaseOption `json:"Options,omitempty"`
+	AttachMode   string                 `json:"AttachMode,omitempty"` // "None", "Attach", "AttachRebuildLog"
 }
 
 func (s *CreateDatabaseStatement) node()      {}

parser/marshal.go

@@ -6070,9 +6070,42 @@ func createDatabaseStatementToJSON(s *ast.CreateDatabaseStatement) jsonNode {
 	if s.DatabaseName != nil {
 		node["DatabaseName"] = identifierToJSON(s.DatabaseName)
 	}
+	if len(s.Options) > 0 {
+		opts := make([]jsonNode, len(s.Options))
+		for i, opt := range s.Options {
+			opts[i] = createDatabaseOptionToJSON(opt)
+		}
+		node["Options"] = opts
+		// Only output AttachMode when there are options
+		if s.AttachMode != "" {
+			node["AttachMode"] = s.AttachMode
+		}
+	}
 	return node
 }
 
+func createDatabaseOptionToJSON(opt ast.CreateDatabaseOption) jsonNode {
+	switch o := opt.(type) {
+	case *ast.OnOffDatabaseOption:
+		return jsonNode{
+			"$type":       "OnOffDatabaseOption",
+			"OptionState": o.OptionState,
+			"OptionKind":  o.OptionKind,
+		}
+	case *ast.IdentifierDatabaseOption:
+		node := jsonNode{
+			"$type":      "IdentifierDatabaseOption",
+			"OptionKind": o.OptionKind,
+		}
+		if o.Value != nil {
+			node["Value"] = identifierToJSON(o.Value)
+		}
+		return node
+	default:
+		return jsonNode{"$type": "CreateDatabaseOption"}
+	}
+}
+
 func createLoginStatementToJSON(s *ast.CreateLoginStatement) jsonNode {
 	node := jsonNode{
 		"$type": "CreateLoginStatement",

parser/parse_statements.go

@@ -4531,13 +4531,72 @@ func (p *Parser) parseCreateDatabaseStatement() (ast.Statement, error) {
 
 	stmt := &ast.CreateDatabaseStatement{
 		DatabaseName: p.parseIdentifier(),
+		AttachMode:   "None",
+	}
+
+	// Check for WITH clause
+	if p.curTok.Type == TokenWith {
+		p.nextToken() // consume WITH
+		opts, err := p.parseCreateDatabaseOptions()
+		if err != nil {
+			return nil, err
+		}
+		stmt.Options = opts
 	}
 
 	// Skip rest of statement
 	p.skipToEndOfStatement()
 	return stmt, nil
 }
 
+func (p *Parser) parseCreateDatabaseOptions() ([]ast.CreateDatabaseOption, error) {
+	var options []ast.CreateDatabaseOption
+
+	for {
+		optName := strings.ToUpper(p.curTok.Literal)
+		switch optName {
+		case "LEDGER":
+			p.nextToken() // consume LEDGER
+			if p.curTok.Type != TokenEquals {
+				return nil, fmt.Errorf("expected = after LEDGER, got %s", p.curTok.Literal)
+			}
+			p.nextToken() // consume =
+			state := strings.ToUpper(p.curTok.Literal)
+			p.nextToken() // consume ON/OFF
+			opt := &ast.OnOffDatabaseOption{
+				OptionKind:  "Ledger",
+				OptionState: capitalizeFirst(state),
+			}
+			options = append(options, opt)
+
+		case "CATALOG_COLLATION":
+			p.nextToken() // consume CATALOG_COLLATION
+			if p.curTok.Type != TokenEquals {
+				return nil, fmt.Errorf("expected = after CATALOG_COLLATION, got %s", p.curTok.Literal)
+			}
+			p.nextToken() // consume =
+			opt := &ast.IdentifierDatabaseOption{
+				OptionKind: "CatalogCollation",
+				Value:      p.parseIdentifier(),
+			}
+			options = append(options, opt)
+
+		default:
+			// Unknown option, return what we have
+			return options, nil
+		}
+
+		// Check for comma separator
+		if p.curTok.Type == TokenComma {
+			p.nextToken()
+		} else {
+			break
+		}
+	}
+
+	return options, nil
+}
+
 func (p *Parser) parseCreateLoginStatement() (*ast.CreateLoginStatement, error) {
 	p.nextToken() // consume LOGIN
 

parser/testdata/Baselines160_CreateDatabaseTests160/metadata.json

@@ -1 +1 @@
-{"skip": true}
+{"skip": false}

parser/testdata/CreateDatabaseTests160/metadata.json

@@ -1 +1 @@
-{"skip": true}
+{"skip": false}