Merge branch 'fulghum/add_column_with_constraint' into fulghum-0e77d549

Author: fulghum

enginetest/queries/alter_table_queries.go

@@ -513,6 +513,22 @@ var AlterTableScripts = []ScriptTest{
 			},
 		},
 	},
+	{
+		Name: "add column with inline check constraint definition",
+		SetUpScript: []string{
+			"create table t (pk int primary key);",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query:    "alter table t add column c int CONSTRAINT chk_c check(c > 10);",
+				Expected: []sql.Row{{types.NewOkResult(0)}},
+			},
+			{
+				Query:          "insert into t values (1, 9);",
+				ExpectedErrStr: `Check constraint "chk_c" violated`,
+			},
+		},
+	},
 	{
 		Name: "multi-alter ddl column errors",
 		SetUpScript: []string{

sql/planbuilder/ddl.go

@@ -594,7 +594,7 @@ func (b *Builder) buildAlterTableClause(inScope *scope, ddl *ast.DDL) []*scope {
 
 		if ddl.ColumnAction != "" {
 			columnActionOutscope := b.buildAlterTableColumnAction(tableScope, ddl, rt)
-			outScopes = append(outScopes, columnActionOutscope)
+			outScopes = append(outScopes, columnActionOutscope.copy())
 
 			if ddl.TableSpec != nil {
 				if len(ddl.TableSpec.Columns) != 1 {