Add semicolon skipping in trigger/try-catch statement bodies

ast/alter_database_set_statement.go

@@ -87,7 +87,11 @@ func (l *LiteralDatabaseOption) createDatabaseOption() {}
 
 // AlterDatabaseAddFileStatement represents ALTER DATABASE ... ADD FILE statement
 type AlterDatabaseAddFileStatement struct {
-	DatabaseName *Identifier
+	DatabaseName     *Identifier
+	FileDeclarations []*FileDeclaration
+	FileGroup        *Identifier
+	IsLog            bool
+	UseCurrent       bool
 }
 
 func (a *AlterDatabaseAddFileStatement) node()      {}

ast/alter_function_statement.go

@@ -5,7 +5,7 @@ type AlterFunctionStatement struct {
 	Name          *SchemaObjectName
 	Parameters    []*ProcedureParameter
 	ReturnType    FunctionReturnType
-	Options       []*FunctionOption
+	Options       []FunctionOptionBase
 	StatementList *StatementList
 }
 
@@ -17,7 +17,7 @@ type CreateFunctionStatement struct {
 	Name          *SchemaObjectName
 	Parameters    []*ProcedureParameter
 	ReturnType    FunctionReturnType
-	Options       []*FunctionOption
+	Options       []FunctionOptionBase
 	StatementList *StatementList
 }
 
@@ -50,8 +50,37 @@ type SelectFunctionReturnType struct {
 
 func (r *SelectFunctionReturnType) functionReturnTypeNode() {}
 
-// FunctionOption represents a function option
+// FunctionOptionBase is an interface for function options
+type FunctionOptionBase interface {
+	Node
+	functionOption()
+}
+
+// FunctionOption represents a function option (like ENCRYPTION, SCHEMABINDING)
 type FunctionOption struct {
-	OptionKind  string
-	OptionState string
+	OptionKind string
 }
+
+func (o *FunctionOption) node()           {}
+func (o *FunctionOption) functionOption() {}
+
+// InlineFunctionOption represents an INLINE function option
+type InlineFunctionOption struct {
+	OptionKind  string // "Inline"
+	OptionState string // "On", "Off"
+}
+
+func (o *InlineFunctionOption) node()           {}
+func (o *InlineFunctionOption) functionOption() {}
+
+// CreateOrAlterFunctionStatement represents a CREATE OR ALTER FUNCTION statement
+type CreateOrAlterFunctionStatement struct {
+	Name          *SchemaObjectName
+	Parameters    []*ProcedureParameter
+	ReturnType    FunctionReturnType
+	Options       []FunctionOptionBase
+	StatementList *StatementList
+}
+
+func (s *CreateOrAlterFunctionStatement) statement() {}
+func (s *CreateOrAlterFunctionStatement) node()      {}

ast/alter_simple_statements.go

@@ -2,7 +2,8 @@ package ast
 
 // AlterRouteStatement represents an ALTER ROUTE statement.
 type AlterRouteStatement struct {
-	Name *Identifier `json:"Name,omitempty"`
+	Name         *Identifier    `json:"Name,omitempty"`
+	RouteOptions []*RouteOption `json:"RouteOptions,omitempty"`
 }
 
 func (s *AlterRouteStatement) node()      {}
@@ -18,15 +19,65 @@ func (s *AlterAssemblyStatement) statement() {}
 
 // AlterEndpointStatement represents an ALTER ENDPOINT statement.
 type AlterEndpointStatement struct {
-	Name *Identifier `json:"Name,omitempty"`
+	Name            *Identifier             `json:"Name,omitempty"`
+	State           string                  `json:"State,omitempty"`           // Started, Disabled, NotSpecified
+	Affinity        *EndpointAffinity       `json:"Affinity,omitempty"`
+	Protocol        string                  `json:"Protocol,omitempty"`        // None, Tcp, Http
+	ProtocolOptions []EndpointProtocolOption `json:"ProtocolOptions,omitempty"`
+	EndpointType    string                  `json:"EndpointType,omitempty"`    // NotSpecified, Soap, ServiceBroker, etc.
+	PayloadOptions  []PayloadOption         `json:"PayloadOptions,omitempty"`
 }
 
 func (s *AlterEndpointStatement) node()      {}
 func (s *AlterEndpointStatement) statement() {}
 
+// EndpointAffinity represents the affinity setting for an endpoint.
+type EndpointAffinity struct {
+	Kind  string           `json:"Kind,omitempty"` // None, Admin, Integer
+	Value *IntegerLiteral  `json:"Value,omitempty"`
+}
+
+func (e *EndpointAffinity) node() {}
+
+// EndpointProtocolOption is an interface for endpoint protocol options.
+type EndpointProtocolOption interface {
+	Node
+	endpointProtocolOption()
+}
+
+// LiteralEndpointProtocolOption represents a literal endpoint protocol option.
+type LiteralEndpointProtocolOption struct {
+	Value ScalarExpression `json:"Value,omitempty"`
+	Kind  string           `json:"Kind,omitempty"` // TcpListenerPort, HttpListenerPort, etc.
+}
+
+func (l *LiteralEndpointProtocolOption) node()                   {}
+func (l *LiteralEndpointProtocolOption) endpointProtocolOption() {}
+
+// PayloadOption is an interface for endpoint payload options.
+type PayloadOption interface {
+	Node
+	payloadOption()
+}
+
+// SoapMethod represents a SOAP web method option.
+type SoapMethod struct {
+	Alias  *StringLiteral `json:"Alias,omitempty"`
+	Action string         `json:"Action,omitempty"` // Add, Alter, Drop
+	Name   *StringLiteral `json:"Name,omitempty"`
+	Format string         `json:"Format,omitempty"` // NotSpecified, AllResults, RowsetsOnly, None
+	Schema string         `json:"Schema,omitempty"` // NotSpecified, Default, None, Standard
+	Kind   string         `json:"Kind,omitempty"`   // None, WebMethod
+}
+
+func (s *SoapMethod) node()          {}
+func (s *SoapMethod) payloadOption() {}
+
 // AlterServiceStatement represents an ALTER SERVICE statement.
 type AlterServiceStatement struct {
-	Name *Identifier `json:"Name,omitempty"`
+	Name             *Identifier        `json:"Name,omitempty"`
+	QueueName        *SchemaObjectName  `json:"QueueName,omitempty"`
+	ServiceContracts []*ServiceContract `json:"ServiceContracts,omitempty"`
 }
 
 func (s *AlterServiceStatement) node()      {}

ast/alter_trigger_statement.go

@@ -43,10 +43,12 @@ func (o *TriggerOption) triggerOption() {}
 
 // ExecuteAsClause represents an EXECUTE AS clause
 type ExecuteAsClause struct {
-	ExecuteAsOption string // Caller, Self, Owner, or specific user
-	Principal       ScalarExpression
+	ExecuteAsOption string           // Caller, Self, Owner, String
+	Literal         *StringLiteral   // Used when ExecuteAsOption is "String"
 }
 
+func (e *ExecuteAsClause) node() {}
+
 // ExecuteAsTriggerOption represents an EXECUTE AS trigger option
 type ExecuteAsTriggerOption struct {
 	OptionKind      string // "ExecuteAsClause"

ast/alter_user_statement.go

@@ -2,8 +2,8 @@ package ast
 
 // AlterUserStatement represents an ALTER USER statement.
 type AlterUserStatement struct {
-	Name    *Identifier  `json:"Name,omitempty"`
-	Options []UserOption `json:"Options,omitempty"`
+	Name        *Identifier  `json:"Name,omitempty"`
+	UserOptions []UserOption `json:"UserOptions,omitempty"`
 }
 
 func (s *AlterUserStatement) node()      {}

ast/column_master_key_statement.go

@@ -0,0 +1,51 @@
+package ast
+
+// CreateColumnMasterKeyStatement represents a CREATE COLUMN MASTER KEY statement.
+type CreateColumnMasterKeyStatement struct {
+	Name       *Identifier
+	Parameters []ColumnMasterKeyParameter
+}
+
+func (c *CreateColumnMasterKeyStatement) node()      {}
+func (c *CreateColumnMasterKeyStatement) statement() {}
+
+// ColumnMasterKeyParameter is an interface for column master key parameters.
+type ColumnMasterKeyParameter interface {
+	Node
+	columnMasterKeyParameter()
+}
+
+// ColumnMasterKeyStoreProviderNameParameter represents KEY_STORE_PROVIDER_NAME parameter.
+type ColumnMasterKeyStoreProviderNameParameter struct {
+	Name          ScalarExpression
+	ParameterKind string
+}
+
+func (c *ColumnMasterKeyStoreProviderNameParameter) node()                     {}
+func (c *ColumnMasterKeyStoreProviderNameParameter) columnMasterKeyParameter() {}
+
+// ColumnMasterKeyPathParameter represents KEY_PATH parameter.
+type ColumnMasterKeyPathParameter struct {
+	Path          ScalarExpression
+	ParameterKind string
+}
+
+func (c *ColumnMasterKeyPathParameter) node()                     {}
+func (c *ColumnMasterKeyPathParameter) columnMasterKeyParameter() {}
+
+// ColumnMasterKeyEnclaveComputationsParameter represents ENCLAVE_COMPUTATIONS parameter.
+type ColumnMasterKeyEnclaveComputationsParameter struct {
+	Signature     ScalarExpression
+	ParameterKind string
+}
+
+func (c *ColumnMasterKeyEnclaveComputationsParameter) node()                     {}
+func (c *ColumnMasterKeyEnclaveComputationsParameter) columnMasterKeyParameter() {}
+
+// DropColumnMasterKeyStatement represents a DROP COLUMN MASTER KEY statement.
+type DropColumnMasterKeyStatement struct {
+	Name *Identifier
+}
+
+func (d *DropColumnMasterKeyStatement) node()      {}
+func (d *DropColumnMasterKeyStatement) statement() {}

ast/create_procedure_statement.go

@@ -6,6 +6,8 @@ type CreateProcedureStatement struct {
 	Parameters         []*ProcedureParameter
 	StatementList      *StatementList
 	IsForReplication   bool
+	Options            []ProcedureOptionBase
+	MethodSpecifier    *MethodSpecifier
 }
 
 func (c *CreateProcedureStatement) node()      {}
@@ -22,3 +24,26 @@ type ProcedureParameter struct {
 }
 
 func (p *ProcedureParameter) node() {}
+
+// ProcedureOptionBase is the interface for procedure options.
+type ProcedureOptionBase interface {
+	Node
+	procedureOption()
+}
+
+// ProcedureOption represents a simple procedure option like RECOMPILE or ENCRYPTION.
+type ProcedureOption struct {
+	OptionKind string // Recompile, Encryption
+}
+
+func (p *ProcedureOption) node()            {}
+func (p *ProcedureOption) procedureOption() {}
+
+// ExecuteAsProcedureOption represents an EXECUTE AS option for a procedure.
+type ExecuteAsProcedureOption struct {
+	ExecuteAs  *ExecuteAsClause
+	OptionKind string // ExecuteAs
+}
+
+func (e *ExecuteAsProcedureOption) node()            {}
+func (e *ExecuteAsProcedureOption) procedureOption() {}

ast/create_simple_statements.go

@@ -2,12 +2,25 @@ package ast
 
 // CreateDatabaseStatement represents a CREATE DATABASE statement.
 type CreateDatabaseStatement struct {
-	DatabaseName *Identifier            `json:"DatabaseName,omitempty"`
-	Options      []CreateDatabaseOption `json:"Options,omitempty"`
-	AttachMode   string                 `json:"AttachMode,omitempty"` // "None", "Attach", "AttachRebuildLog"
-	CopyOf       *MultiPartIdentifier   `json:"CopyOf,omitempty"`     // For AS COPY OF syntax
+	DatabaseName *Identifier                `json:"DatabaseName,omitempty"`
+	Options      []CreateDatabaseOption     `json:"Options,omitempty"`
+	AttachMode   string                     `json:"AttachMode,omitempty"` // "None", "Attach", "AttachRebuildLog"
+	CopyOf       *MultiPartIdentifier       `json:"CopyOf,omitempty"`     // For AS COPY OF syntax
+	FileGroups   []*FileGroupDefinition     `json:"FileGroups,omitempty"`
+	LogOn        []*FileDeclaration         `json:"LogOn,omitempty"`
+	Collation    *Identifier                `json:"Collation,omitempty"`
+	Containment  *ContainmentDatabaseOption `json:"Containment,omitempty"`
 }
 
+// ContainmentDatabaseOption represents CONTAINMENT = NONE/PARTIAL
+type ContainmentDatabaseOption struct {
+	Value      string // "None" or "Partial"
+	OptionKind string // Always "Containment"
+}
+
+func (c *ContainmentDatabaseOption) node()                 {}
+func (c *ContainmentDatabaseOption) createDatabaseOption() {}
+
 func (s *CreateDatabaseStatement) node()      {}
 func (s *CreateDatabaseStatement) statement() {}
 
@@ -19,9 +32,20 @@ type CreateLoginStatement struct {
 func (s *CreateLoginStatement) node()      {}
 func (s *CreateLoginStatement) statement() {}
 
+// ServiceContract represents a contract in CREATE/ALTER SERVICE.
+type ServiceContract struct {
+	Name   *Identifier `json:"Name,omitempty"`
+	Action string      `json:"Action,omitempty"` // "Add", "Drop", "None"
+}
+
+func (s *ServiceContract) node() {}
+
 // CreateServiceStatement represents a CREATE SERVICE statement.
 type CreateServiceStatement struct {
-	Name *Identifier `json:"Name,omitempty"`
+	Owner            *Identifier        `json:"Owner,omitempty"`
+	Name             *Identifier        `json:"Name,omitempty"`
+	QueueName        *SchemaObjectName  `json:"QueueName,omitempty"`
+	ServiceContracts []*ServiceContract `json:"ServiceContracts,omitempty"`
 }
 
 func (s *CreateServiceStatement) node()      {}
@@ -61,12 +85,22 @@ func (s *CreateQueueStatement) statement() {}
 
 // CreateRouteStatement represents a CREATE ROUTE statement.
 type CreateRouteStatement struct {
-	Name *Identifier `json:"Name,omitempty"`
+	Name         *Identifier    `json:"Name,omitempty"`
+	Owner        *Identifier    `json:"Owner,omitempty"`
+	RouteOptions []*RouteOption `json:"RouteOptions,omitempty"`
 }
 
 func (s *CreateRouteStatement) node()      {}
 func (s *CreateRouteStatement) statement() {}
 
+// RouteOption represents an option in CREATE/ALTER ROUTE statement.
+type RouteOption struct {
+	OptionKind string           `json:"OptionKind,omitempty"`
+	Literal    ScalarExpression `json:"Literal,omitempty"`
+}
+
+func (r *RouteOption) node() {}
+
 // CreateEndpointStatement represents a CREATE ENDPOINT statement.
 type CreateEndpointStatement struct {
 	Name *Identifier `json:"Name,omitempty"`
@@ -150,14 +184,36 @@ type CreationDispositionKeyOption struct {
 func (c *CreationDispositionKeyOption) node()      {}
 func (c *CreationDispositionKeyOption) keyOption() {}
 
+// CryptoMechanism represents an encryption mechanism (CERTIFICATE, KEY, PASSWORD, etc.)
+type CryptoMechanism struct {
+	CryptoMechanismType string           `json:"CryptoMechanismType,omitempty"` // "Certificate", "SymmetricKey", "AsymmetricKey", "Password"
+	Identifier          *Identifier      `json:"Identifier,omitempty"`
+	PasswordOrSignature ScalarExpression `json:"PasswordOrSignature,omitempty"`
+}
+
+func (c *CryptoMechanism) node() {}
+
 // CreateSymmetricKeyStatement represents a CREATE SYMMETRIC KEY statement.
 type CreateSymmetricKeyStatement struct {
-	Name *Identifier `json:"Name,omitempty"`
+	KeyOptions          []KeyOption        `json:"KeyOptions,omitempty"`
+	Provider            *Identifier        `json:"Provider,omitempty"`
+	Name                *Identifier        `json:"Name,omitempty"`
+	EncryptingMechanisms []*CryptoMechanism `json:"EncryptingMechanisms,omitempty"`
 }
 
 func (s *CreateSymmetricKeyStatement) node()      {}
 func (s *CreateSymmetricKeyStatement) statement() {}
 
+// DropSymmetricKeyStatement represents a DROP SYMMETRIC KEY statement.
+type DropSymmetricKeyStatement struct {
+	RemoveProviderKey bool        `json:"RemoveProviderKey,omitempty"`
+	Name              *Identifier `json:"Name,omitempty"`
+	IsIfExists        bool        `json:"IsIfExists"`
+}
+
+func (s *DropSymmetricKeyStatement) node()      {}
+func (s *DropSymmetricKeyStatement) statement() {}
+
 // CreateMessageTypeStatement represents a CREATE MESSAGE TYPE statement.
 type CreateMessageTypeStatement struct {
 	Name                    *Identifier       `json:"Name,omitempty"`
@@ -171,7 +227,9 @@ func (s *CreateMessageTypeStatement) statement() {}
 
 // CreateRemoteServiceBindingStatement represents a CREATE REMOTE SERVICE BINDING statement.
 type CreateRemoteServiceBindingStatement struct {
-	Name *Identifier `json:"Name,omitempty"`
+	Name    *Identifier                  `json:"Name,omitempty"`
+	Service ScalarExpression             `json:"Service,omitempty"`
+	Options []RemoteServiceBindingOption `json:"Options,omitempty"`
 }
 
 func (s *CreateRemoteServiceBindingStatement) node()      {}