ast: Add AST for ALTER TABLE ADD / DROP COLUMN (#376)

* ast: Add AST for ALTER TABLE ADD / DROP COLUMN

* Remove print statement

Author: kyleconroy

Makefile

@@ -0,0 +1,11 @@
+build:
+	go build ./...
+
+test:
+	go test --tags=exp ./...
+
+sqlc-dev:
+	go build -o ~/bin/sqlc-dev --tags=exp ./cmd/sqlc/
+
+regen:
+	cd internal/endtoend && ./regenerate.sh

internal/catalog/build.go

@@ -311,6 +311,7 @@ func Update(c *pg.Catalog, stmt nodes.Node) error {
 		} else {
 			c.Schemas[name] = pg.NewSchema()
 		}
+
 	case nodes.DropStmt:
 		for _, obj := range n.Objects.Items {
 			if n.RemoveType == nodes.OBJECT_TABLE || n.RemoveType == nodes.OBJECT_TYPE {

internal/dolphin/parse.go

@@ -13,7 +13,6 @@ import (
 
 func NewParser() *Parser {
 	return &Parser{parser.New()}
-
 }
 
 type Parser struct {
@@ -78,6 +77,13 @@ func text(nodes []pcast.Node) []string {
 	return str
 }
 
+func parseTableName(n *pcast.TableName) *ast.TableName {
+	return &ast.TableName{
+		Schema: n.Schema.String(),
+		Name:   n.Name.String(),
+	}
+}
+
 func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
 	blob, err := ioutil.ReadAll(r)
 	if err != nil {
@@ -92,12 +98,56 @@ func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
 		var stmt ast.Node
 		switch n := stmtNodes[i].(type) {
 
+		case *pcast.AlterTableStmt:
+			alt := &ast.AlterTableStmt{
+				Table: parseTableName(n.Table),
+				Cmds:  &ast.List{},
+			}
+			for _, spec := range n.Specs {
+				switch spec.Tp {
+				case pcast.AlterTableAddColumns:
+					for _, def := range spec.NewColumns {
+						name := def.Name.String()
+						alt.Cmds.Items = append(alt.Cmds.Items, &ast.AlterTableCmd{
+							Name:    &name,
+							Subtype: ast.AT_AddColumn,
+							Def: &ast.ColumnDef{
+								Colname: def.Name.String(),
+								// TODO: Use def.Tp to generate type name
+								TypeName: &ast.TypeName{Name: "text"},
+							},
+						})
+					}
+
+				case pcast.AlterTableDropColumn:
+					name := spec.OldColumnName.String()
+					alt.Cmds.Items = append(alt.Cmds.Items, &ast.AlterTableCmd{
+						Name:      &name,
+						Subtype:   ast.AT_DropColumn,
+						MissingOk: spec.IfExists,
+					})
+
+				case pcast.AlterTableChangeColumn:
+					// 	spew.Dump("change column", spec)
+
+				case pcast.AlterTableModifyColumn:
+					// 	spew.Dump("modify column", spec)
+
+				case pcast.AlterTableAlterColumn:
+					// 	spew.Dump("alter column", spec)
+
+				case pcast.AlterTableAddConstraint:
+					// 	spew.Dump("add const", spec)
+
+				default:
+					continue
+				}
+			}
+			stmt = alt
+
 		case *pcast.CreateTableStmt:
 			create := &ast.CreateTableStmt{
-				Name: &ast.TableName{
-					Schema: n.Table.Schema.String(),
-					Name:   n.Table.Name.String(),
-				},
+				Name:        parseTableName(n.Table),
 				IfNotExists: n.IfNotExists,
 			}
 			for _, def := range n.Cols {
@@ -112,10 +162,7 @@ func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
 		case *pcast.DropTableStmt:
 			drop := &ast.DropTableStmt{IfExists: n.IfExists}
 			for _, name := range n.Tables {
-				drop.Tables = append(drop.Tables, &ast.TableName{
-					Schema: name.Schema.String(),
-					Name:   name.Name.String(),
-				})
+				drop.Tables = append(drop.Tables, parseTableName(name))
 			}
 			stmt = drop
 
@@ -127,10 +174,7 @@ func (p *Parser) Parse(r io.Reader) ([]ast.Statement, error) {
 				if !ok {
 					return
 				}
-				tables = append(tables, &ast.TableName{
-					Schema: name.Schema.String(),
-					Name:   name.Name.String(),
-				})
+				tables = append(tables, parseTableName(name))
 			})
 			var cols []ast.Node
 			visit(n.Fields, func(n pcast.Node) {

internal/endtoend/testdata/experimental_dolphin/go/models.go

@@ -0,0 +1,21 @@
+CREATE TABLE foo (
+        bar text NOT NULL 
+);
+
+CREATE TABLE bar (
+        baz text NOT NULL 
+);
+
+SELECT bar FROM foo;
+
+DROP TABLE bar;
+DROP TABLE IF EXISTS bar;
+DROP TABLE IF EXISTS baz;
+
+
+CREATE TABLE baz (name text);
+ALTER TABLE baz ADD COLUMN email text;
+ALTER TABLE baz ADD COLUMN bar text;
+ALTER TABLE baz DROP COLUMN IF EXISTS foo;
+ALTER TABLE baz DROP COLUMN bar;
+ALTER TABLE baz DROP COLUMN IF EXISTS bar;

internal/endtoend/testdata/experimental_dolphin/query.sql

@@ -5,8 +5,8 @@
       "path": "go",
       "name": "querytest",
       "engine": "_dolphin",
-      "schema": "../experimental.sql",
-      "queries": "../experimental.sql"
+      "schema": "query.sql",
+      "queries": "query.sql"
     }
   ]
 }

internal/endtoend/testdata/experimental_dolphin/sqlc.json

@@ -0,0 +1,21 @@
+CREATE TABLE foo (
+        bar text NOT NULL 
+);
+
+CREATE TABLE bar (
+        baz text NOT NULL 
+);
+
+SELECT bar FROM foo;
+
+DROP TABLE bar;
+DROP TABLE IF EXISTS bar;
+DROP TABLE IF EXISTS baz;
+
+
+CREATE TABLE baz (name text);
+ALTER TABLE baz ADD COLUMN email text;
+ALTER TABLE baz ADD COLUMN bar text;
+ALTER TABLE baz DROP COLUMN IF EXISTS foo;
+ALTER TABLE baz DROP COLUMN bar;
+ALTER TABLE baz DROP COLUMN IF EXISTS bar;

internal/endtoend/testdata/experimental_elephant/go/models.go

@@ -5,8 +5,8 @@
       "path": "go",
       "name": "querytest",
       "engine": "_elephant",
-      "schema": "../experimental.sql",
-      "queries": "../experimental.sql"
+      "schema": "query.sql",
+      "queries": "query.sql"
     }
   ]
 }