Merge pull request #3199 from dolthub/angela/alter_table

Add added column to CreateConstraint scope

Author: angelamayxie

enginetest/queries/alter_table_queries.go

@@ -2107,6 +2107,28 @@ var AddColumnScripts = []ScriptTest{
 			},
 		},
 	},
+	{
+		Name: "add column with check constraint",
+		SetUpScript: []string{
+			"create table t (i int primary key, j int)",
+			"insert into t values (1, 2)",
+		},
+		Assertions: []ScriptTestAssertion{
+			{
+				Query: "alter table t add column k int check (k > 0)",
+				// TODO: this should be 1 rowsAffected https://github.com/dolthub/dolt/issues/9606
+				Expected: []sql.Row{{types.NewOkResult(0)}},
+			},
+			{
+				Query:       "alter table t add column l int check (l is not null)",
+				ExpectedErr: sql.ErrCheckConstraintViolated,
+			},
+			{
+				Query:       "alter table t add column m int default 0 check (m != 0)",
+				ExpectedErr: sql.ErrCheckConstraintViolated,
+			},
+		},
+	},
 	{
 		Name: "error cases",
 		Assertions: []ScriptTestAssertion{

sql/analyzer/fix_exec_indexes.go

@@ -159,9 +159,12 @@ type idxScope struct {
 	childScopes   []*idxScope
 	ids           []sql.ColumnId
 	columns       []string
-	children      []sql.Node
-	expressions   []sql.Expression
-	checks        sql.CheckConstraints
+	// Columns added from AddColumn are not included in the ResolvedTable yet. For columns that are added with a
+	// constraint, we need to add the new columns to the scope so CreateCheck gets the right exec index
+	addedColumns sql.Schema
+	children     []sql.Node
+	expressions  []sql.Expression
+	checks       sql.CheckConstraints
 
 	triggerScope      bool
 	insertSourceScope bool
@@ -301,6 +304,7 @@ func (s *idxScope) copy() *idxScope {
 		parentScopes:      parentCopy,
 		columns:           varsCopy,
 		ids:               idsCopy,
+		addedColumns:      s.addedColumns,
 		subqueryScope:     s.subqueryScope,
 		triggerScope:      s.triggerScope,
 		insertSourceScope: s.insertSourceScope,
@@ -399,6 +403,9 @@ func (s *idxScope) visitChildren(n sql.Node) error {
 			if err != nil {
 				return err
 			}
+			if ac, ok := c.(*plan.AddColumn); ok {
+				s.addedColumns = append(s.addedColumns, ac.Column())
+			}
 			s.childScopes = append(s.childScopes, cScope)
 			s.children = append(s.children, newC)
 		}
@@ -565,6 +572,11 @@ func (s *idxScope) visitSelf(n sql.Node) error {
 			newDef := fixExprToScope(sql.Expression(col.Default), scope)
 			n.DestSch[colIdx].Default = newDef.(*sql.ColumnDefaultValue)
 		}
+	case *plan.CreateCheck:
+		addedScope := &idxScope{}
+		addedScope.addSchema(s.addedColumns)
+		scope := append(append(s.parentScopes, s.childScopes...), addedScope)
+		s.expressions = append(s.expressions, fixExprToScope(n.Check.Expr, scope...))
 	default:
 		// Group By and Window functions already account for the new/old columns present from triggers
 		// This means that when indexing the Projections, we should not include the trigger scope(s), which are