support ddl for schema and database (#106)

postgres/parser/sem/tree/alter_default_privileges.go

@@ -35,14 +35,14 @@ var _ Statement = &AlterDefaultPrivileges{}
 
 // AlterDefaultPrivileges represents a ALTER DEFAULT PRIVILEGES statement.
 type AlterDefaultPrivileges struct {
-	ForRole     bool
-	TargetRoles []string
-	Privileges  privilege.List
-	Target      TargetList
-	Grantees    []string
-	GrantOption bool
-	Restrict    bool
-	Grant       bool
+	ForRole      bool
+	TargetRoles  []string
+	Privileges   privilege.List
+	Target       TargetList
+	Grantees     []string
+	GrantOption  bool
+	DropBehavior DropBehavior
+	Grant        bool
 }
 
 // Format implements the NodeFormatter interface.
@@ -77,10 +77,9 @@ func (node *AlterDefaultPrivileges) Format(ctx *FmtCtx) {
 		node.Privileges.Format(&ctx.Buffer)
 		ctx.WriteString(fmt.Sprintf(" ON %sS FROM ", strings.ToUpper(string(node.Target.TargetType))))
 		ctx.WriteString(strings.Join(node.Grantees, ", "))
-		if node.Restrict {
-			ctx.WriteString(" RESTRICT")
-		} else {
-			ctx.WriteString(" CASCADE")
+		if node.DropBehavior.String() != "" {
+			ctx.WriteByte(' ')
+			ctx.WriteString(node.DropBehavior.String())
 		}
 	}
 }

postgres/parser/sem/tree/create.go

@@ -50,12 +50,24 @@ import (
 
 // CreateDatabase represents a CREATE DATABASE statement.
 type CreateDatabase struct {
-	IfNotExists bool
-	Name        Name
-	Template    string
-	Encoding    string
-	Collate     string
-	CType       string
+	IfNotExists      bool
+	Name             Name
+	Owner            string
+	Template         string
+	Encoding         string
+	Strategy         string
+	Locale           string
+	Collate          string
+	CType            string
+	IcuLocale        string
+	IcuRules         string
+	LocaleProvider   string
+	CollationVersion string
+	Tablespace       string
+	AllowConnections Expr // default is true
+	ConnectionLimit  Expr // default is -1
+	IsTemplate       Expr // default is false
+	Oid              Expr
 }
 
 // Format implements the NodeFormatter interface.
@@ -65,6 +77,10 @@ func (node *CreateDatabase) Format(ctx *FmtCtx) {
 		ctx.WriteString("IF NOT EXISTS ")
 	}
 	ctx.FormatNode(&node.Name)
+	if node.Owner != "" {
+		ctx.WriteString(" OWNER = ")
+		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.Owner, ctx.flags.EncodeFlags())
+	}
 	if node.Template != "" {
 		ctx.WriteString(" TEMPLATE = ")
 		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.Template, ctx.flags.EncodeFlags())
@@ -73,6 +89,14 @@ func (node *CreateDatabase) Format(ctx *FmtCtx) {
 		ctx.WriteString(" ENCODING = ")
 		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.Encoding, ctx.flags.EncodeFlags())
 	}
+	if node.Strategy != "" {
+		ctx.WriteString(" STRATEGY = ")
+		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.Strategy, ctx.flags.EncodeFlags())
+	}
+	if node.Locale != "" {
+		ctx.WriteString(" LOCALE = ")
+		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.Locale, ctx.flags.EncodeFlags())
+	}
 	if node.Collate != "" {
 		ctx.WriteString(" LC_COLLATE = ")
 		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.Collate, ctx.flags.EncodeFlags())
@@ -81,6 +105,42 @@ func (node *CreateDatabase) Format(ctx *FmtCtx) {
 		ctx.WriteString(" LC_CTYPE = ")
 		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.CType, ctx.flags.EncodeFlags())
 	}
+	if node.IcuLocale != "" {
+		ctx.WriteString(" ICU_LOCALE = ")
+		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.IcuLocale, ctx.flags.EncodeFlags())
+	}
+	if node.IcuRules != "" {
+		ctx.WriteString(" ICU_RULES = ")
+		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.IcuRules, ctx.flags.EncodeFlags())
+	}
+	if node.LocaleProvider != "" {
+		ctx.WriteString(" LOCALE_PROVIDER = ")
+		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.LocaleProvider, ctx.flags.EncodeFlags())
+	}
+	if node.CollationVersion != "" {
+		ctx.WriteString(" COLLATION_VERSION = ")
+		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.CollationVersion, ctx.flags.EncodeFlags())
+	}
+	if node.Tablespace != "" {
+		ctx.WriteString(" TABLESPACE = ")
+		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.Tablespace, ctx.flags.EncodeFlags())
+	}
+	if node.AllowConnections != nil {
+		ctx.WriteString(" ALLOW_CONNECTIONS = ")
+		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.AllowConnections.String(), ctx.flags.EncodeFlags())
+	}
+	if node.ConnectionLimit != nil {
+		ctx.WriteString(" CONNECTION LIMIT = ")
+		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.ConnectionLimit.String(), ctx.flags.EncodeFlags())
+	}
+	if node.IsTemplate != nil {
+		ctx.WriteString(" IS_TEMPLATE = ")
+		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.IsTemplate.String(), ctx.flags.EncodeFlags())
+	}
+	if node.Oid != nil {
+		ctx.WriteString(" OID = ")
+		lex.EncodeSQLStringWithFlags(&ctx.Buffer, node.Oid.String(), ctx.flags.EncodeFlags())
+	}
 }
 
 // IndexElem represents a column with a direction in a CREATE INDEX statement.
@@ -1227,9 +1287,10 @@ func (node *CreateTable) HoistConstraints() {
 
 // CreateSchema represents a CREATE SCHEMA statement.
 type CreateSchema struct {
-	IfNotExists bool
-	Schema      string
-	AuthRole    string
+	IfNotExists    bool
+	Schema         string
+	AuthRole       string
+	SchemaElements []Statement
 }
 
 // Format implements the NodeFormatter interface.
@@ -1249,6 +1310,13 @@ func (node *CreateSchema) Format(ctx *FmtCtx) {
 		ctx.WriteString(" AUTHORIZATION ")
 		ctx.WriteString(node.AuthRole)
 	}
+
+	if node.SchemaElements != nil {
+		for _, se := range node.SchemaElements {
+			ctx.WriteByte(' ')
+			ctx.FormatNode(se)
+		}
+	}
 }
 
 // CreateSequence represents a CREATE SEQUENCE statement.

postgres/parser/sem/tree/drop.go

@@ -55,9 +55,9 @@ func (d DropBehavior) String() string {
 
 // DropDatabase represents a DROP DATABASE statement.
 type DropDatabase struct {
-	Name         Name
-	IfExists     bool
-	DropBehavior DropBehavior
+	Name     Name
+	IfExists bool
+	Force    bool
 }
 
 // Format implements the NodeFormatter interface.
@@ -67,9 +67,8 @@ func (node *DropDatabase) Format(ctx *FmtCtx) {
 		ctx.WriteString("IF EXISTS ")
 	}
 	ctx.FormatNode(&node.Name)
-	if node.DropBehavior != DropDefault {
-		ctx.WriteByte(' ')
-		ctx.WriteString(node.DropBehavior.String())
+	if node.Force {
+		ctx.WriteString(" WITH ( FORCE )")
 	}
 }
 

postgres/parser/sem/tree/revoke.go

@@ -47,7 +47,7 @@ type Revoke struct {
 	Grantees       []string
 	GrantOptionFor bool
 	GrantedBy      string
-	Restrict       bool
+	DropBehavior   DropBehavior
 
 	// only used for table target with column names defined
 	PrivsWithCols []PrivForCols
@@ -80,20 +80,19 @@ func (node *Revoke) Format(ctx *FmtCtx) {
 		ctx.WriteString(" GRANTED BY ")
 		ctx.WriteString(node.GrantedBy)
 	}
-	if node.Restrict {
-		ctx.WriteString(" RESTRICT")
-	} else {
-		ctx.WriteString(" CASCADE")
+	if node.DropBehavior.String() != "" {
+		ctx.WriteByte(' ')
+		ctx.WriteString(node.DropBehavior.String())
 	}
 }
 
 // RevokeRole represents a REVOKE <role> statement.
 type RevokeRole struct {
-	Roles     NameList
-	Members   []string
-	Option    string
-	GrantedBy string
-	Restrict  bool
+	Roles        NameList
+	Members      []string
+	Option       string
+	GrantedBy    string
+	DropBehavior DropBehavior
 }
 
 // Format implements the NodeFormatter interface.
@@ -110,9 +109,8 @@ func (node *RevokeRole) Format(ctx *FmtCtx) {
 		ctx.WriteString(" GRANTED BY ")
 		ctx.WriteString(node.GrantedBy)
 	}
-	if node.Restrict {
-		ctx.WriteString(" RESTRICT")
-	} else {
-		ctx.WriteString(" CASCADE")
+	if node.DropBehavior.String() != "" {
+		ctx.WriteByte(' ')
+		ctx.WriteString(node.DropBehavior.String())
 	}
 }

server/ast/create_database.go

@@ -24,18 +24,59 @@ import (
 
 // nodeCreateDatabase handles *tree.CreateDatabase nodes.
 func nodeCreateDatabase(node *tree.CreateDatabase) (*vitess.DBDDL, error) {
+	if len(node.Owner) > 0 {
+		return nil, fmt.Errorf("OWNER clause is not yet supported")
+	}
 	if len(node.Template) > 0 {
-		return nil, fmt.Errorf("templates are not yet supported")
+		return nil, fmt.Errorf("TEMPLATE clause is not yet supported")
 	}
 	if len(node.Encoding) > 0 {
-		return nil, fmt.Errorf("encodings are not yet supported")
+		return nil, fmt.Errorf("ENCODING clause is not yet supported")
+	}
+	if len(node.Strategy) > 0 {
+		return nil, fmt.Errorf("STRATEGY clause is not yet supported")
+	}
+	if len(node.Locale) > 0 {
+		return nil, fmt.Errorf("LOCALE clause is not yet supported")
 	}
 	if len(node.Collate) > 0 {
-		return nil, fmt.Errorf("collations are not yet supported")
+		return nil, fmt.Errorf("LC_COLLATE clause is not yet supported")
 	}
 	if len(node.CType) > 0 {
-		return nil, fmt.Errorf("ctypes are not yet supported")
+		return nil, fmt.Errorf("LC_CTYPE clause is not yet supported")
+	}
+	if len(node.IcuLocale) > 0 {
+		return nil, fmt.Errorf("ICU_LOCALE clause is not yet supported")
+	}
+	if len(node.IcuRules) > 0 {
+		return nil, fmt.Errorf("TEMPLATE clause is not yet supported")
+	}
+	if len(node.LocaleProvider) > 0 {
+		return nil, fmt.Errorf("LOCALE_PROVIDER clause is not yet supported")
+	}
+	if len(node.CollationVersion) > 0 {
+		return nil, fmt.Errorf("COLLATION_VERSION clause is not yet supported")
 	}
+	if len(node.Tablespace) > 0 {
+		return nil, fmt.Errorf("TABLESPACE clause is not yet supported")
+	}
+	// TODO: some clauses have default values in case of not being defined.
+	// ALLOW_CONNECTIONS defaults to TRUE
+	if node.AllowConnections != nil {
+		return nil, fmt.Errorf("ALLOW_CONNECTIONS clause is not yet supported")
+	}
+	// CONNECTION LIMIT defaults to -1
+	if node.ConnectionLimit != nil {
+		return nil, fmt.Errorf("CONNECTION LIMIT clause is not yet supported")
+	}
+	// IS_TEMPLATE defaults to FALSE
+	if node.IsTemplate != nil {
+		return nil, fmt.Errorf("IS_TEMPLATE clause is not yet supported")
+	}
+	if node.Oid != nil {
+		return nil, fmt.Errorf("OID clause is not yet supported")
+	}
+
 	return &vitess.DBDDL{
 		Action:      vitess.CreateStr,
 		DBName:      node.Name.String(),

server/ast/drop_database.go

@@ -27,13 +27,8 @@ func nodeDropDatabase(node *tree.DropDatabase) (*vitess.DBDDL, error) {
 	if node == nil {
 		return nil, nil
 	}
-	switch node.DropBehavior {
-	case tree.DropDefault:
-		// Default behavior, nothing to do
-	case tree.DropRestrict:
-		return nil, fmt.Errorf("RESTRICT is not yet supported")
-	case tree.DropCascade:
-		return nil, fmt.Errorf("CASCADE is not yet supported")
+	if node.Force {
+		return nil, fmt.Errorf("WITH ( FORCE ) is not yet supported")
 	}
 	return &vitess.DBDDL{
 		Action:   vitess.DropStr,